diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 495ba815c31..569b07d30c9 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1266,7 +1266,7 @@ void AndroidConfigurations::updateAutomaticKitList() QHash > qtVersionsForArch; const QList qtVersions - = QtSupport::QtVersionManager::unsortedVersions([](const QtSupport::BaseQtVersion *v) { + = QtSupport::QtVersionManager::versions([](const QtSupport::BaseQtVersion *v) { return v->type() == Constants::ANDROIDQT; }); for (const QtSupport::BaseQtVersion *qtVersion : qtVersions) { diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 8c86c2ff9ff..8a7d5d302eb 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -337,7 +337,7 @@ void AndroidSettingsWidget::check(AndroidSettingsWidget::Mode mode) } const QList androidQts - = QtSupport::QtVersionManager::unsortedVersions([](const QtSupport::BaseQtVersion *v) { + = QtSupport::QtVersionManager::versions([](const QtSupport::BaseQtVersion *v) { return v->type() == QLatin1String(Constants::ANDROIDQT) && !v->qtAbis().isEmpty(); }); QSet qtVersionsForAbi; diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 919a3d5111b..c26ef61f300 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -152,7 +152,7 @@ static QHash findToolChains(const QList &plat static QHash> iosQtVersions() { const QList iosVersions - = QtVersionManager::unsortedVersions([](const BaseQtVersion *v) { + = QtVersionManager::versions([](const BaseQtVersion *v) { return v->isValid() && v->type() == Constants::IOSQT; }); QHash> versions; diff --git a/src/plugins/qnx/qnxconfiguration.cpp b/src/plugins/qnx/qnxconfiguration.cpp index 9c5a8206f06..d48165c0c19 100644 --- a/src/plugins/qnx/qnxconfiguration.cpp +++ b/src/plugins/qnx/qnxconfiguration.cpp @@ -251,7 +251,7 @@ QnxQtVersion* QnxConfiguration::qnxQtVersion(QnxArchitecture arch) const { QnxQtVersion *qnxQt; foreach (BaseQtVersion *version, - QtVersionManager::instance()->unsortedVersions(Utils::equal(&BaseQtVersion::type, + QtVersionManager::instance()->versions(Utils::equal(&BaseQtVersion::type, QString::fromLatin1(Constants::QNX_QNX_QT)))) { qnxQt = dynamic_cast(version); if (qnxQt && qnxQt->architecture() == arch) { diff --git a/src/plugins/qtsupport/qtkitconfigwidget.cpp b/src/plugins/qtsupport/qtkitconfigwidget.cpp index 3a27c0e4860..1a6cd65145e 100644 --- a/src/plugins/qtsupport/qtkitconfigwidget.cpp +++ b/src/plugins/qtsupport/qtkitconfigwidget.cpp @@ -47,7 +47,7 @@ QtKitConfigWidget::QtKitConfigWidget(ProjectExplorer::Kit *k, const ProjectExplo m_combo = new QComboBox; m_combo->addItem(tr("None"), -1); - QList versionIds = Utils::transform(QtVersionManager::unsortedVersions(), &BaseQtVersion::uniqueId); + QList versionIds = Utils::transform(QtVersionManager::versions(), &BaseQtVersion::uniqueId); versionsChanged(versionIds, QList(), QList()); m_manageButton = new QPushButton(KitConfigWidget::msgManage()); diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index a40ff0f5ddf..77f58becea1 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -235,7 +235,7 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent) m_ui->qtdirList->setTextElideMode(Qt::ElideMiddle); m_ui->qtdirList->sortByColumn(0, Qt::AscendingOrder); - QList additions = transform(QtVersionManager::unsortedVersions(), &BaseQtVersion::uniqueId); + QList additions = transform(QtVersionManager::versions(), &BaseQtVersion::uniqueId); updateQtVersions(additions, QList(), QList()); diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index 18ec5f116c8..21d8dd81909 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -489,7 +489,7 @@ static void updateDocumentation() void QtVersionManager::updateDumpFor(const FileName &qmakeCommand) { - foreach (BaseQtVersion *v, unsortedVersions()) { + foreach (BaseQtVersion *v, versions()) { if (v->qmakeCommand() == qmakeCommand) v->recheckDumper(); } @@ -501,7 +501,7 @@ int QtVersionManager::getUniqueId() return m_idcount++; } -QList QtVersionManager::unsortedVersions(const BaseQtVersion::Predicate &predicate) +QList QtVersionManager::versions(const BaseQtVersion::Predicate &predicate) { QList versions; QTC_ASSERT(isLoaded(), return versions); @@ -523,7 +523,7 @@ QList QtVersionManager::validVersions(const BaseQtVersion::Pred QTC_ASSERT(isLoaded(), return { }); auto superPredicate = [predicate](const BaseQtVersion *v) { return v->isValid() && (!predicate || predicate(v)); }; - return unsortedVersions(superPredicate); + return versions(superPredicate); } bool QtVersionManager::isValidId(int id) diff --git a/src/plugins/qtsupport/qtversionmanager.h b/src/plugins/qtsupport/qtversionmanager.h index 66fe047fbbb..0e8e4894aaf 100644 --- a/src/plugins/qtsupport/qtversionmanager.h +++ b/src/plugins/qtsupport/qtversionmanager.h @@ -49,7 +49,7 @@ public: // Sorting is slow due to needing to potentially run qmake --query for each version static QList validVersions(const BaseQtVersion::Predicate &predicate = BaseQtVersion::Predicate()); - static QList unsortedVersions(const BaseQtVersion::Predicate &predicate = BaseQtVersion::Predicate()); + static QList versions(const BaseQtVersion::Predicate &predicate = BaseQtVersion::Predicate()); // Sorting is potentially expensive since it might require qmake --query to run for each version! static QList sortVersions(const QList &input);