summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager/builddirparameters.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2022-04-25 14:20:12 +0200
committerhjk <hjk@qt.io>2022-05-02 13:10:33 +0000
commitac488e052980a7c684671e9febb58e44320b717d (patch)
tree7de3d4400a2c89fc2d9b06dde577cc0b78786747 /src/plugins/cmakeprojectmanager/builddirparameters.cpp
parent778ed83149c2f36df0af62ab7ce2cd677df27116 (diff)
downloadqt-creator-ac488e052980a7c684671e9febb58e44320b717d.tar.gz
CMake: Pass BuildSystem instead of BuildConfig to BuildDirParams
Less indirections. Change-Id: I33ae36aa32aa8fab7223822fd9ec80c64d6d4651 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/builddirparameters.cpp')
-rw-r--r--src/plugins/cmakeprojectmanager/builddirparameters.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.cpp b/src/plugins/cmakeprojectmanager/builddirparameters.cpp
index 048dead9d2..ad875eb03d 100644
--- a/src/plugins/cmakeprojectmanager/builddirparameters.cpp
+++ b/src/plugins/cmakeprojectmanager/builddirparameters.cpp
@@ -26,6 +26,7 @@
#include "builddirparameters.h"
#include "cmakebuildconfiguration.h"
+#include "cmakebuildsystem.h"
#include "cmakekitinformation.h"
#include "cmakeprojectconstants.h"
#include "cmakeprojectplugin.h"
@@ -47,9 +48,11 @@ namespace Internal {
BuildDirParameters::BuildDirParameters() = default;
-BuildDirParameters::BuildDirParameters(CMakeBuildConfiguration *bc)
+BuildDirParameters::BuildDirParameters(CMakeBuildSystem *buildSystem)
{
- QTC_ASSERT(bc, return );
+ QTC_ASSERT(buildSystem, return);
+ auto bc = buildSystem->cmakeBuildConfiguration();
+ QTC_ASSERT(bc, return);
const Utils::MacroExpander *expander = bc->macroExpander();