Simplify code, use QStandardPaths::findExecutable

Change-Id: I9f02c81114c913fd9c1056cede12ec8a344683f7
Reviewed-by: Continuous Integration (KDAB) <build@kdab.com>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>

tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp

@@ -42,22 +42,18 @@
 #include <QtTest/QtTest>
 #include <QMetaType>
 #include <QProcess>
+#include <QStandardPaths>
 
 namespace {
 
-QString findExecutable(const QString &executableName, const QStringList &pathHints)
+QString findExecutable(const QString &executableName, const QStringList &paths)
 {
-    foreach (const auto &pathHint, pathHints) {
-#ifdef Q_OS_WIN
-        const QString executablePath = pathHint + executableName + ".exe";
-#else
-        const QString executablePath = pathHint + executableName;
-#endif
-        if (QFileInfo::exists(executablePath))
-            return executablePath;
+    const auto path = QStandardPaths::findExecutable(executableName, paths);
+    if (!path.isEmpty()) {
+        return path;
     }
 
-    qWarning() << "Could not find executable:" << executableName << "in any of" << pathHints;
+    qWarning() << "Could not find executable:" << executableName << "in any of" << paths;
     return QString();
 }
 

tests/auto/repc/signature/signatureTests/tst_signature.cpp

@@ -42,22 +42,18 @@
 #include <QtTest/QtTest>
 #include <QMetaType>
 #include <QProcess>
+#include <QStandardPaths>
 
 namespace {
 
-QString findExecutable(const QString &executableName, const QStringList &pathHints)
+QString findExecutable(const QString &executableName, const QStringList &paths)
 {
-    foreach (const auto &pathHint, pathHints) {
-#ifdef Q_OS_WIN
-        const QString executablePath = pathHint + executableName + ".exe";
-#else
-        const QString executablePath = pathHint + executableName;
-#endif
-        if (QFileInfo::exists(executablePath))
-            return executablePath;
+    const auto path = QStandardPaths::findExecutable(executableName, paths);
+    if (!path.isEmpty()) {
+        return path;
     }
 
-    qWarning() << "Could not find executable:" << executableName << "in any of" << pathHints;
+    qWarning() << "Could not find executable:" << executableName << "in any of" << paths;
     return QString();
 }