feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Avoid running qmake by using unsortedVersions

Browse Source 
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>
This commit is contained in:
Eike Ziller
2015-11-23 15:34:09 +01:00
parent 609bc2a389
commit 79c27ec6f1
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidsettingswidget.cpp
View File

@@ -298,7 +298,7 @@ void AndroidSettingsWidget::check(AndroidSettingsWidget::Mode mode)
toolchainsForAbi.insert(ati.abi); toolchainsForAbi.insert(ati.abi);
QSet<ProjectExplorer::Abi> qtVersionsForAbi; QSet<ProjectExplorer::Abi> qtVersionsForAbi;
foreach (QtSupport::BaseQtVersion *qtVersion, QtSupport::QtVersionManager::versions()) { foreach (QtSupport::BaseQtVersion *qtVersion, QtSupport::QtVersionManager::unsortedVersions()) {
if (qtVersion->type() != QLatin1String(Constants::ANDROIDQT) || qtVersion->qtAbis().isEmpty()) if (qtVersion->type() != QLatin1String(Constants::ANDROIDQT) || qtVersion->qtAbis().isEmpty())
continue; continue;
qtVersionsForAbi.insert(qtVersion->qtAbis().first()); qtVersionsForAbi.insert(qtVersion->qtAbis().first());

2
src/plugins/ios/iosconfigurations.cpp
View File

@@ -144,7 +144,7 @@ static QHash<Platform, ClangToolChain *> findToolChains(const QList<Platform> &p
static QHash<Abi::Architecture, QSet<BaseQtVersion *>> iosQtVersions() static QHash<Abi::Architecture, QSet<BaseQtVersion *>> iosQtVersions()
{ {
QHash<Abi::Architecture, QSet<BaseQtVersion *>> versions; QHash<Abi::Architecture, QSet<BaseQtVersion *>> versions;
foreach (BaseQtVersion *qtVersion, QtVersionManager::versions()) { foreach (BaseQtVersion *qtVersion, QtVersionManager::unsortedVersions()) {
if (!qtVersion->isValid() || qtVersion->type() != QLatin1String(Constants::IOSQT)) if (!qtVersion->isValid() || qtVersion->type() != QLatin1String(Constants::IOSQT))
continue; continue;
foreach (const Abi &abi, qtVersion->qtAbis()) foreach (const Abi &abi, qtVersion->qtAbis())

2
src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
View File

@@ -108,7 +108,7 @@ QList<BuildInfo *> QmakeProjectImporter::import(const FileName &importPath, bool
qCDebug(logs) << " QMake:" << canonicalQmakeBinary; qCDebug(logs) << " QMake:" << canonicalQmakeBinary;
BaseQtVersion *version BaseQtVersion *version
= Utils::findOrDefault(QtVersionManager::versions(), = Utils::findOrDefault(QtVersionManager::unsortedVersions(),
[&canonicalQmakeBinary](BaseQtVersion *v) -> bool { [&canonicalQmakeBinary](BaseQtVersion *v) -> bool {
QFileInfo vfi = v->qmakeCommand().toFileInfo(); QFileInfo vfi = v->qmakeCommand().toFileInfo();
FileName current = FileName::fromString(vfi.canonicalFilePath()); FileName current = FileName::fromString(vfi.canonicalFilePath());

4
src/plugins/qtsupport/qtversionmanager.cpp
View File

@@ -503,7 +503,7 @@ static void updateDocumentation()
void QtVersionManager::updateDumpFor(const FileName &qmakeCommand) void QtVersionManager::updateDumpFor(const FileName &qmakeCommand)
{ {
foreach (BaseQtVersion *v, versions()) { foreach (BaseQtVersion *v, unsortedVersions()) {
if (v->qmakeCommand() == qmakeCommand) if (v->qmakeCommand() == qmakeCommand)
v->recheckDumper(); v->recheckDumper();
} }
@@ -631,7 +631,7 @@ void QtVersionManager::setNewQtVersions(QList<BaseQtVersion *> newVersions)
BaseQtVersion *QtVersionManager::qtVersionForQMakeBinary(const FileName &qmakePath) 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 } // namespace QtVersion