diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 0d90bb65da0..7e395c4e37a 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -298,7 +298,7 @@ void AndroidSettingsWidget::check(AndroidSettingsWidget::Mode mode) toolchainsForAbi.insert(ati.abi); QSet qtVersionsForAbi; - foreach (QtSupport::BaseQtVersion *qtVersion, QtSupport::QtVersionManager::versions()) { + foreach (QtSupport::BaseQtVersion *qtVersion, QtSupport::QtVersionManager::unsortedVersions()) { if (qtVersion->type() != QLatin1String(Constants::ANDROIDQT) || qtVersion->qtAbis().isEmpty()) continue; qtVersionsForAbi.insert(qtVersion->qtAbis().first()); diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 9bf56c2a6ee..31da93fd426 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -144,7 +144,7 @@ static QHash findToolChains(const QList &p static QHash> iosQtVersions() { QHash> versions; - foreach (BaseQtVersion *qtVersion, QtVersionManager::versions()) { + foreach (BaseQtVersion *qtVersion, QtVersionManager::unsortedVersions()) { if (!qtVersion->isValid() || qtVersion->type() != QLatin1String(Constants::IOSQT)) continue; foreach (const Abi &abi, qtVersion->qtAbis()) diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp index 017c2e444d9..c4d2aaebe3f 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp @@ -108,7 +108,7 @@ QList QmakeProjectImporter::import(const FileName &importPath, bool qCDebug(logs) << " QMake:" << canonicalQmakeBinary; BaseQtVersion *version - = Utils::findOrDefault(QtVersionManager::versions(), + = Utils::findOrDefault(QtVersionManager::unsortedVersions(), [&canonicalQmakeBinary](BaseQtVersion *v) -> bool { QFileInfo vfi = v->qmakeCommand().toFileInfo(); FileName current = FileName::fromString(vfi.canonicalFilePath()); diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index 3a44f6861db..2be77a98a68 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -503,7 +503,7 @@ static void updateDocumentation() void QtVersionManager::updateDumpFor(const FileName &qmakeCommand) { - foreach (BaseQtVersion *v, versions()) { + foreach (BaseQtVersion *v, unsortedVersions()) { if (v->qmakeCommand() == qmakeCommand) v->recheckDumper(); } @@ -631,7 +631,7 @@ void QtVersionManager::setNewQtVersions(QList newVersions) BaseQtVersion *QtVersionManager::qtVersionForQMakeBinary(const FileName &qmakePath) { - return Utils::findOrDefault(versions(), Utils::equal(&BaseQtVersion::qmakeCommand, qmakePath)); + return Utils::findOrDefault(unsortedVersions(), Utils::equal(&BaseQtVersion::qmakeCommand, qmakePath)); } } // namespace QtVersion