Merge branch '1.1' into 'master'.

Change-Id: Ia6cb10047d02ebe2752984f57e8b729be9d6552e

3 files changed, 13 insertions, 2 deletions

diff --git a/src/app/config-ui/config-ui.pro b/src/app/config-ui/config-ui.pro
index 0d69b7ea9..3581ef42a 100644
--- a/src/app/config-ui/config-ui.pro
+++ b/src/app/config-ui/config-ui.pro
@@ -1,5 +1,6 @@
 include(../app.pri)
 
+CONFIG -= console
 QT += gui
 greaterThan(QT_MAJOR_VERSION, 4):QT += widgets
 
diff --git a/src/app/config-ui/config-ui.qbs b/src/app/config-ui/config-ui.qbs
index b37ae7865..b8856d795 100644
--- a/src/app/config-ui/config-ui.qbs
+++ b/src/app/config-ui/config-ui.qbs
@@ -4,6 +4,7 @@ import "../apptemplate.qbs" as QbsApp
 QbsApp {
     Depends { name: "Qt.widgets" }
     name: "qbs-config-ui"
+    consoleApplication: false
     files: [
         "main.cpp",
         "mainwindow.cpp",
diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp
index bc9b9762e..001754615 100644
--- a/src/app/qbs/commandlinefrontend.cpp
+++ b/src/app/qbs/commandlinefrontend.cpp
@@ -130,8 +130,17 @@ void CommandLineFrontend::start()
         if (!m_parser.buildBeforeInstalling())
             params.setRestoreBehavior(SetupProjectParameters::RestoreOnly);
         foreach (const QVariantMap &buildConfig, m_parser.buildConfigurations()) {
-            params.setOverriddenValues(buildConfig);
-            params.setBuildConfiguration(buildConfig);
+            QVariantMap baseConfig;
+            QVariantMap userConfig = buildConfig;
+            QString buildVariantKey = QLatin1String("qbs.buildVariant");
+            baseConfig.insert(buildVariantKey, userConfig.take(buildVariantKey));
+            const QVariantMap::Iterator it = userConfig.find(QLatin1String("qbs.profile"));
+            if (it != userConfig.end()) {
+                baseConfig.insert(it.key(), it.value());
+                userConfig.erase(it);
+            }
+            params.setBuildConfiguration(baseConfig);
+            params.setOverriddenValues(userConfig);
             const ErrorInfo err = params.expandBuildConfiguration(m_settings);
             if (err.hasError())
                 throw err;