|
 |
1ea1bbf |
diff --git a/plugins/qmakemanager/qmakeconfig.cpp b/plugins/qmakemanager/qmakeconfig.cpp
|
|
|
1ea1bbf |
index 98dc77b..92f221a 100644
|
|
|
1ea1bbf |
--- a/plugins/qmakemanager/qmakeconfig.cpp
|
|
|
1ea1bbf |
+++ b/plugins/qmakemanager/qmakeconfig.cpp
|
|
|
1ea1bbf |
@@ -82,15 +82,15 @@ QString QMakeConfig::qmakeExecutable(const IProject* project)
|
|
|
1ea1bbf |
}
|
|
 |
317888a |
}
|
|
|
317888a |
}
|
|
|
1ea1bbf |
- if (exe.isEmpty()) {
|
|
|
317888a |
- exe = QStandardPaths::findExecutable(QStringLiteral("qmake"));
|
|
|
317888a |
- }
|
|
|
1ea1bbf |
if (exe.isEmpty()) {
|
|
|
317888a |
exe = QStandardPaths::findExecutable(QStringLiteral("qmake-qt5"));
|
|
|
317888a |
}
|
|
|
317888a |
if (exe.isEmpty()) {
|
|
|
317888a |
exe = QStandardPaths::findExecutable(QStringLiteral("qmake-qt4"));
|
|
|
317888a |
}
|
|
|
317888a |
+ if (exe.isEmpty()) {
|
|
|
317888a |
+ exe = QStandardPaths::findExecutable(QStringLiteral("qmake"));
|
|
|
317888a |
+ }
|
|
|
317888a |
Q_ASSERT(!exe.isEmpty());
|
|
|
317888a |
return exe;
|
|
|
317888a |
}
|
|
|
1ea1bbf |
diff --git a/plugins/qthelp/qthelpqtdoc.cpp b/plugins/qthelp/qthelpqtdoc.cpp
|
|
|
1ea1bbf |
index 8f9f8e1..6770e03 100644
|
|
|
1ea1bbf |
--- a/plugins/qthelp/qthelpqtdoc.cpp
|
|
|
1ea1bbf |
+++ b/plugins/qthelp/qthelpqtdoc.cpp
|
|
|
1ea1bbf |
@@ -38,9 +38,9 @@ QString qmakeCandidate()
|
|
|
317888a |
{
|
|
|
317888a |
// return the first qmake executable we can find
|
|
|
1ea1bbf |
const QStringList candidates {
|
|
|
1ea1bbf |
- QStringLiteral("qmake"),
|
|
|
1ea1bbf |
+ QStringLiteral("qmake-qt5"),
|
|
|
1ea1bbf |
QStringLiteral("qmake-qt4"),
|
|
|
1ea1bbf |
- QStringLiteral("qmake-qt5")
|
|
|
1ea1bbf |
+ QStringLiteral("qmake")
|
|
|
1ea1bbf |
};
|
|
|
317888a |
auto it = std::find_if(candidates.constBegin(), candidates.constEnd(), [](const QString& candidate) {
|
|
|
317888a |
return !QStandardPaths::findExecutable(candidate).isEmpty();
|