diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2016-07-12 16:27:45 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2016-07-14 15:34:06 +0000 |
| commit | cb14fb0d715f22b32fb9880fd26e20715fcdc5a7 (patch) | |
| tree | 9abb67bb500505de5c813aba8d6b92a6793a4847 /src/plugins/qmakeprojectmanager/qmakekitinformation.cpp | |
| parent | ce9ca1f0ef4af4695e6c57983fc89a8bbc49976d (diff) | |
| download | qt-creator-cb14fb0d715f22b32fb9880fd26e20715fcdc5a7.tar.gz | |
Kits: Save several ToolChains per kit
BREAKS BACKWARD COMPATIBILITY OF TOOLCHAIN SETTINGS!
* Convert old ToolChainKitInformation to new version
* Store several toolchains in one kit (one per language)
Change-Id: Ia59a2ad067c57971ec34ce9b2e43758344443755
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakekitinformation.cpp')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakekitinformation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp index d241c25514..79fb578658 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp @@ -76,7 +76,7 @@ void QmakeKitInformation::setup(Kit *k) if (spec.isEmpty()) spec = version->mkspec(); - ToolChain *tc = ToolChainKitInformation::toolChain(k); + ToolChain *tc = ToolChainKitInformation::toolChain(k, ToolChain::Language::Cxx); if (!tc || (!tc->suggestedMkspecList().empty() && !tc->suggestedMkspecList().contains(spec))) { ToolChain *possibleTc = 0; @@ -142,7 +142,7 @@ FileName QmakeKitInformation::defaultMkspec(const Kit *k) if (!version) // No version, so no qmake return FileName(); - return version->mkspecFor(ToolChainKitInformation::toolChain(k)); + return version->mkspecFor(ToolChainKitInformation::toolChain(k, ToolChain::Language::Cxx)); } } // namespace QmakeProjectManager |