diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2020-03-19 18:36:22 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2020-03-23 13:16:15 +0000 |
| commit | 10e79cebc9da9269750a993b32443b237b86c3c8 (patch) | |
| tree | 7b42083c2f633d6b2b3ab8f5697b0883ef8740ac /src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | |
| parent | 95947f280f929bbc1dd6d1f8b9d3285e887c4506 (diff) | |
BuildSystem: Add buildConfiguration() method
Add a buildConfiguration method that returns the saved
BuildConfiguration or the active BuildConfiguration if none is
set.
Change-Id: I8af25aa1037f59a0091900bac7eb84fed9e5fbb0
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index 24b5ece217..3c25382756 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -36,9 +36,9 @@ #include <coreplugin/progressmanager/progressmanager.h> #include <cpptools/cppprojectupdater.h> #include <cpptools/generatedcodemodelsupport.h> -#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> +#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/target.h> #include <qmljs/qmljsmodelmanagerinterface.h> @@ -65,7 +65,6 @@ static Q_LOGGING_CATEGORY(cmakeBuildSystemLog, "qtc.cmake.buildsystem", QtWarnin CMakeBuildSystem::CMakeBuildSystem(CMakeBuildConfiguration *bc) : BuildSystem(bc) - , m_buildConfiguration(bc) , m_buildDirManager(this) , m_cppCodeModelUpdater(new CppTools::CppProjectUpdater) { @@ -545,14 +544,9 @@ void CMakeBuildSystem::handleParsingFailed(const QString &msg) handleParsingError(); } -BuildConfiguration *CMakeBuildSystem::buildConfiguration() const -{ - return m_buildConfiguration; -} - CMakeBuildConfiguration *CMakeBuildSystem::cmakeBuildConfiguration() const { - return m_buildConfiguration; + return static_cast<CMakeBuildConfiguration *>(BuildSystem::buildConfiguration()); } static Utils::FilePaths librarySearchPaths(const CMakeBuildSystem *bs, const QString &buildKey) |