QtVersionManager: Remove QtVersionManager::versions(...)

This call used to return a sorted list of BaseQtVersion *, which is
expensive as sorting might imply running qmake for all Qt versions.

This also makes BaseQtVersion::validVersions(...) return an unsorted list,
so go over all usages of validVersions(...) and use
QtVersionManager::sortVersions(...) where that is necessary.

Change-Id: I8f5dda20fc0819134c64f6a1ca32512500f71710
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

1 files changed, 1 insertions, 10 deletions

diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index 0da7d448c7..18ec5f116c 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -511,15 +511,6 @@ QList<BaseQtVersion *> QtVersionManager::unsortedVersions(const BaseQtVersion::P
         return m_versions.values();
 }
 
-QList<BaseQtVersion *> QtVersionManager::versions(const BaseQtVersion::Predicate &predicate)
-{
-    QList<BaseQtVersion *> versions;
-    QTC_ASSERT(isLoaded(), return versions);
-    versions = unsortedVersions(predicate);
-    Utils::sort(versions, qtVersionNumberCompare);
-    return versions;
-}
-
 QList<BaseQtVersion *> QtVersionManager::sortVersions(const QList<BaseQtVersion *> &input)
 {
     QList<BaseQtVersion *> result = input;
@@ -532,7 +523,7 @@ QList<BaseQtVersion *> QtVersionManager::validVersions(const BaseQtVersion::Pred
     QTC_ASSERT(isLoaded(), return { });
     auto superPredicate
             = [predicate](const BaseQtVersion *v) { return v->isValid() && (!predicate || predicate(v)); };
-    return versions(superPredicate);
+    return unsortedVersions(superPredicate);
 }
 
 bool QtVersionManager::isValidId(int id)