aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qtsupport/qtversionmanager.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@theqtcompany.com>2015-11-23 15:34:09 +0100
committerEike Ziller <eike.ziller@theqtcompany.com>2015-11-23 14:48:55 +0000
commit79c27ec6f1c337916ee196908050896f21704905 (patch)
tree6c575c673cbfe925b71235dce0c171451d0d384e /src/plugins/qtsupport/qtversionmanager.cpp
parent609bc2a38916931514241f5fbba9b4ad3c6ea0fd (diff)
Avoid running qmake by using unsortedVersions
Use unsortedVersions() instead of versions() where possible, since versions() sorts by version numbers, and therefore needs "qmake -query" to have run. Change-Id: I76a05f1647d2baacbd33829c6b3bf719a1c8dcbb Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/qtsupport/qtversionmanager.cpp')
-rw-r--r--src/plugins/qtsupport/qtversionmanager.cpp4
1 files changed, 2 insertions, 2 deletions
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<BaseQtVersion *> 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