diff options
author | hjk <hjk@qt.io> | 2019-12-06 17:32:07 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-12-10 11:43:33 +0000 |
commit | b1a29dedfca0be2795970bb2df13e2b892664762 (patch) | |
tree | 14ec186c273ab86f893b4715984c0cfd68ecc862 /src/plugins/qmakeprojectmanager | |
parent | 2ab33d1dc994bff60efbd809c71d9a40122e2b88 (diff) | |
download | qt-creator-b1a29dedfca0be2795970bb2df13e2b892664762.tar.gz |
ProjectExplorer: Pass parameters to BuildConfiguration initialization
... directly again, mostly undoing the temporary hack from fb631cb2585.
Change-Id: I4485dcb23765d99b4b5869973f004457ebd7aa7d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/qmakeprojectmanager')
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index de5f1cd1f3..fbc228205b 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -109,18 +109,18 @@ QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Core::Id id) setConfigWidgetHasFrame(true); m_buildSystem = new QmakeBuildSystem(this); - setInitializer([this, target] { + setInitializer([this, target](const BuildInfo &info) { auto qmakeStep = new QMakeStep(buildSteps()); buildSteps()->appendStep(qmakeStep); buildSteps()->appendStep(Constants::MAKESTEP_BS_ID); cleanSteps()->appendStep(Constants::MAKESTEP_BS_ID); - const QmakeExtraBuildInfo qmakeExtra = extraInfo().value<QmakeExtraBuildInfo>(); + const QmakeExtraBuildInfo qmakeExtra = info.extraInfo.value<QmakeExtraBuildInfo>(); BaseQtVersion *version = QtKitAspect::qtVersion(target->kit()); BaseQtVersion::QmakeBuildConfigs config = version->defaultBuildConfig(); - if (initialBuildType() == BuildConfiguration::Debug) + if (info.buildType == BuildConfiguration::Debug) config |= BaseQtVersion::DebugBuild; else config &= ~BaseQtVersion::DebugBuild; @@ -135,11 +135,11 @@ QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Core::Id id) setQMakeBuildConfiguration(config); - FilePath directory = initialBuildDirectory(); + FilePath directory = info.buildDirectory; if (directory.isEmpty()) { directory = shadowBuildDirectory(target->project()->projectFilePath(), - target->kit(), initialDisplayName(), - initialBuildType()); + target->kit(), info.displayName, + info.buildType); } setBuildDirectory(directory); |