diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-11-16 23:59:11 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-11-17 22:56:52 +0000 |
| commit | 7a0fbf2c2347ca270a5502b0f0e2946ea3f189e6 (patch) | |
| tree | 8b0e8eba9b094bcef3afda2ef69daf160b06135c /src | |
| parent | b289a3f87a5286b9e2e4fc0c3a1da0852bdac2c5 (diff) | |
Use qbs.defaultBuildVariant to inform Qbs of the default build variant
Qt Creator always put its value for qbs.buildVariant in the config when
building Qbs projects. That overwrote values applied by the multiplexing
mechanism or by the project files, which is undesired. Instead, Qt
Creator will now use the qbs.defaultBuildVariant property, which is
provided for this reason.
Task-number: QTCREATORBUG-19316
Change-Id: I923dfb6e083135b7c3ae6346af3ac639a4f02dbc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h b/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h index cc6bcd8ed3..8bc262710c 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h @@ -63,7 +63,7 @@ const char QBS_INSTALLSTEP_ID[] = "Qbs.InstallStep"; const char QBS_VARIANT_DEBUG[] = "debug"; const char QBS_VARIANT_RELEASE[] = "release"; -const char QBS_CONFIG_VARIANT_KEY[] = "qbs.buildVariant"; +const char QBS_CONFIG_VARIANT_KEY[] = "qbs.defaultBuildVariant"; const char QBS_CONFIG_PROFILE_KEY[] = "qbs.profile"; const char QBS_INSTALL_ROOT_KEY[] = "qbs.installRoot"; const char QBS_CONFIG_DECLARATIVE_DEBUG_KEY[] = "Qt.declarative.qmlDebugging"; |