diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2012-09-24 16:53:12 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2012-09-25 16:04:11 +0200 |
| commit | 766b9a92f1980830f0dfbea38ac8b8ca283744e6 (patch) | |
| tree | a60304476410d62ea9d04f48397a4d0f9d835263 /src/plugins/qtsupport | |
| parent | 98b230c9340bad06113b9c47bb2def7947d93c62 (diff) | |
| download | qt-creator-766b9a92f1980830f0dfbea38ac8b8ca283744e6.tar.gz | |
Use default mkspec when supported by the tool chain
Change-Id: Icd47ae8cd7871389d9080091c429baa65d868e42
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/qtsupport')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 4199da9a30..091b7a1d47 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -793,16 +793,19 @@ Utils::FileName BaseQtVersion::mkspec() const Utils::FileName BaseQtVersion::mkspecFor(ProjectExplorer::ToolChain *tc) const { + Utils::FileName versionSpec = mkspec(); if (!tc) - return mkspec(); + return versionSpec; const QList<Utils::FileName> tcSpecList = tc->suggestedMkspecList(); + if (tcSpecList.contains(versionSpec)) + return versionSpec; foreach (const Utils::FileName &tcSpec, tcSpecList) { if (hasMkspec(tcSpec)) return tcSpec; } - return mkspec(); + return versionSpec; } Utils::FileName BaseQtVersion::mkspecPath() const |