From 7a0fbf2c2347ca270a5502b0f0e2946ea3f189e6 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Thu, 16 Nov 2017 23:59:11 -0800 Subject: [PATCH] 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 Reviewed-by: Christian Kandeler --- src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h b/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h index cc6bcd8ed3e..8bc262710c0 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";