Blob Blame History Raw
diff -up kdevelop-5.2.3/plugins/qmakemanager/qmakeconfig.cpp.me kdevelop-5.2.3/plugins/qmakemanager/qmakeconfig.cpp
--- kdevelop-5.2.3/plugins/qmakemanager/qmakeconfig.cpp.me	2018-08-16 16:38:38.934730806 +0200
+++ kdevelop-5.2.3/plugins/qmakemanager/qmakeconfig.cpp	2018-08-16 16:39:39.222043168 +0200
@@ -83,14 +83,14 @@ QString QMakeConfig::qmakeExecutable(con
         }
     }
     if (exe.isEmpty()) {
-        exe = QStandardPaths::findExecutable(QStringLiteral("qmake"));
-    }
-    if (exe.isEmpty()) {
         exe = QStandardPaths::findExecutable(QStringLiteral("qmake-qt5"));
     }
     if (exe.isEmpty()) {
         exe = QStandardPaths::findExecutable(QStringLiteral("qmake-qt4"));
     }
+    if (exe.isEmpty()) {
+        exe = QStandardPaths::findExecutable(QStringLiteral("qmake"));
+    }
     Q_ASSERT(!exe.isEmpty());
     return exe;
 }
diff -up kdevelop-5.2.3/plugins/qthelp/qthelpqtdoc.cpp.me kdevelop-5.2.3/plugins/qthelp/qthelpqtdoc.cpp
--- kdevelop-5.2.3/plugins/qthelp/qthelpqtdoc.cpp.me	2018-08-16 16:37:36.662408159 +0200
+++ kdevelop-5.2.3/plugins/qthelp/qthelpqtdoc.cpp	2018-08-16 16:40:02.990166316 +0200
@@ -37,7 +37,7 @@ namespace {
 QString qmakeCandidate()
 {
     // return the first qmake executable we can find
-    const QStringList candidates = {"qmake", "qmake-qt4", "qmake-qt5"};
+    const QStringList candidates = {"qmake-qt5", "qmake-qt4", "qmake"};
     auto it = std::find_if(candidates.constBegin(), candidates.constEnd(), [](const QString& candidate) {
         return !QStandardPaths::findExecutable(candidate).isEmpty();
     });