generic: fix regressions since f1cfe7bdba5ec3b71cd3205369e7b78f2c71e88a

do not use hardcoded date executable path while at it

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp
index 4026637..1c766cb 100644 (file)
--- a/kdm/kfrontend/kdmshutdown.cpp
+++ b/kdm/kfrontend/kdmshutdown.cpp
@@ -339,7 +339,8 @@ getDate(const char *str)
 {
     QProcess prc;
     prc.setReadChannel(QProcess::StandardOutput);
-    if (prc.execute("/bin/date", QStringList() << "+%s" << "-d" << str))
+    prc.start("date", QStringList() << "+%s" << "-d" << str);
+    if (!prc.waitForFinished() || prc.exitCode() != 0)
         return -1;
     return prc.readAll().simplified().toInt();
 }

diff --git a/keditfiletype/mimetypewriter.cpp b/keditfiletype/mimetypewriter.cpp
index 2e25dc7..e018d33 100644 (file)
--- a/keditfiletype/mimetypewriter.cpp
+++ b/keditfiletype/mimetypewriter.cpp
@@ -128,7 +128,8 @@ void MimeTypeWriter::runUpdateMimeDatabase()
     const QString localPackageDir = KStandardDirs::locateLocal("xdgdata-mime", QString());
     Q_ASSERT(!localPackageDir.isEmpty());
     QProcess proc;
-    if (!proc.execute("update-mime-database", QStringList() << localPackageDir)) {
+    proc.start("update-mime-database", QStringList() << localPackageDir);
+    if (!proc.waitForFinished() || proc.exitCode() != 0) {
         kWarning() << "update-mime-database exited with error code" << proc.exitCode();
     }
 }

diff --git a/keditfiletype/tests/filetypestest.cpp b/keditfiletype/tests/filetypestest.cpp
index 310e5e6..d4670f9 100644 (file)
--- a/keditfiletype/tests/filetypestest.cpp
+++ b/keditfiletype/tests/filetypestest.cpp
@@ -360,7 +360,8 @@ private: // helper methods
         QObject::connect(KSycoca::self(), SIGNAL(databaseChanged(QStringList)), &loop, SLOT(quit()));
         QProcess proc;
         proc.setProcessChannelMode(QProcess::MergedChannels); // silence kbuildsycoca output
-        proc.execute(KStandardDirs::findExe(KBUILDSYCOCA_EXENAME));
+        proc.start(KStandardDirs::findExe(KBUILDSYCOCA_EXENAME));
+        proc.waitForFinished();
         loop.exec();
     }