diff options
| author | hjk <hjk@qt.io> | 2020-02-18 18:25:26 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-02-19 15:59:12 +0000 |
| commit | 3f68292dbe56eedb5614012df44ffce82cf65b5a (patch) | |
| tree | 9a787c553db1f6e8d675f3cb89c5f8c9bb4abf41 /src/plugins/qtsupport | |
| parent | 57662de841636e447eadc698f8d51b14e90c08d7 (diff) | |
ProjectExplorer: Introduce ToolChainKitAspect::{c,cxx}ToolChain
Special accessors to the repeatedly used C and C++ cases to denoise
and slim down user code. Plus some code cosmetics nearby.
Change-Id: Iba4662bd4731d8c4256e658529f39d5c995691ce
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/qtsupport')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/qtsupport/qtkitinformation.cpp | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 5526402dcd..6b2ecd8868 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -504,8 +504,7 @@ Tasks BaseQtVersion::validateKit(const Kit *k) if (!tdt.isEmpty() && !tdt.contains(dt)) result << BuildSystemTask(Task::Warning, tr("Device type is not supported by Qt version.")); - ToolChain *tc = ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); - if (tc) { + if (ToolChain *tc = ToolChainKitAspect::cxxToolChain(k)) { Abi targetAbi = tc->targetAbi(); bool fuzzyMatch = false; bool fullMatch = false; @@ -532,7 +531,7 @@ Tasks BaseQtVersion::validateKit(const Kit *k) version->displayName(), qtAbiString); result << BuildSystemTask(fuzzyMatch ? Task::Warning : Task::Error, message); } - } else if (ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::C_LANGUAGE_ID)) { + } else if (ToolChainKitAspect::cToolChain(k)) { const QString message = tr("The kit has a Qt version, but no C++ compiler."); result << BuildSystemTask(Task::Warning, message); } diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index 1e4037c447..6412bba0d2 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -219,8 +219,9 @@ void QtKitAspect::fix(ProjectExplorer::Kit *k) } // Set a matching toolchain if we don't have one. - if (ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID)) + if (ToolChainKitAspect::cxxToolChain(k)) return; + const QString spec = version->mkspec(); const QList<ToolChain *> possibleTcs = ToolChainManager::toolChains( [version](const ToolChain *t) { |