diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index edbe033aa2c5b613a66f1d2e4a45e513ee0350a4..de216f62384263711d56fc9b45c22ab6bf69b75d 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -530,12 +530,8 @@ void QMakeStepConfigWidget::qmakeBuildConfigChanged()
 {
     Qt4BuildConfiguration *bc = m_step->qt4BuildConfiguration();
     bool debug = bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild;
-    int index = debug ? 0 : 1;
-    if (bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::BuildAll)
-        index = 2;
     m_ignoreChange = true;
-    m_ui.buildConfigurationComboBox->setCurrentIndex(index);
-
+    m_ui.buildConfigurationComboBox->setCurrentIndex(debug? 0 : 1);
     m_ignoreChange = false;
     updateSummaryLabel();
     updateEffectiveQMakeCall();
@@ -577,18 +573,11 @@ void QMakeStepConfigWidget::buildConfigurationSelected()
         return;
     Qt4BuildConfiguration *bc = m_step->qt4BuildConfiguration();
     QtSupport::BaseQtVersion::QmakeBuildConfigs buildConfiguration = bc->qmakeBuildConfiguration();
-    switch (m_ui.buildConfigurationComboBox->currentIndex()) {
-    case 0:
-        buildConfiguration = QtSupport::BaseQtVersion::DebugBuild;
-        break;
-    case 1:
-        buildConfiguration = 0;
-        break;
-    case 2:
-        buildConfiguration = QtSupport::BaseQtVersion::BuildAll;
-        break;
+    if (m_ui.buildConfigurationComboBox->currentIndex() == 0) { // debug
+        buildConfiguration = buildConfiguration | QtSupport::BaseQtVersion::DebugBuild;
+    } else {
+        buildConfiguration = buildConfiguration & ~QtSupport::BaseQtVersion::DebugBuild;
     }
-
     m_ignoreChange = true;
     bc->setQMakeBuildConfiguration(buildConfiguration);
     m_ignoreChange = false;
diff --git a/src/plugins/qt4projectmanager/qmakestep.ui b/src/plugins/qt4projectmanager/qmakestep.ui
index 54d5aeeb005f99972ce74de40b8bb6b0fc4a9877..154254562c0be3c5ad073f8fda9d54a0d74803ef 100644
--- a/src/plugins/qt4projectmanager/qmakestep.ui
+++ b/src/plugins/qt4projectmanager/qmakestep.ui
@@ -48,11 +48,6 @@
           <string>Release</string>
          </property>
         </item>
-        <item>
-         <property name="text">
-          <string>Debug and release</string>
-         </property>
-        </item>
        </widget>
       </item>
       <item>
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 4b505cc7ec67936bfd2282f5c74a937415cc8600..8ecdbcac14986a0d94b9a3bb4c1572dbb02b6157 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -413,20 +413,16 @@ void Qt4BuildConfiguration::emitS60CreatesSmartInstallerChanged()
 QStringList Qt4BuildConfiguration::configCommandLineArguments() const
 {
     QStringList result;
-    QtSupport::BaseQtVersion::QmakeBuildConfigs defaultBuildConfiguration = qtVersion() ? qtVersion()->defaultBuildConfig() : (QtSupport::BaseQtVersion::DebugBuild | QtSupport::BaseQtVersion::BuildAll);
+    QtSupport::BaseQtVersion::QmakeBuildConfigs defaultBuildConfiguration =  qtVersion() ? qtVersion()->defaultBuildConfig() : (QtSupport::BaseQtVersion::DebugBuild | QtSupport::BaseQtVersion::BuildAll);
     QtSupport::BaseQtVersion::QmakeBuildConfigs userBuildConfiguration = m_qmakeBuildConfiguration;
     if ((defaultBuildConfiguration & QtSupport::BaseQtVersion::BuildAll) && !(userBuildConfiguration & QtSupport::BaseQtVersion::BuildAll))
         result << "CONFIG-=debug_and_release";
 
     if (!(defaultBuildConfiguration & QtSupport::BaseQtVersion::BuildAll) && (userBuildConfiguration & QtSupport::BaseQtVersion::BuildAll))
         result << "CONFIG+=debug_and_release";
-    if ((defaultBuildConfiguration & QtSupport::BaseQtVersion::DebugBuild)
-            && !(userBuildConfiguration & QtSupport::BaseQtVersion::DebugBuild)
-            && !(userBuildConfiguration & QtSupport::BaseQtVersion::BuildAll))
+    if ((defaultBuildConfiguration & QtSupport::BaseQtVersion::DebugBuild) && !(userBuildConfiguration & QtSupport::BaseQtVersion::DebugBuild))
         result << "CONFIG+=release";
-    if (!(defaultBuildConfiguration & QtSupport::BaseQtVersion::DebugBuild)
-            && (userBuildConfiguration & QtSupport::BaseQtVersion::DebugBuild)
-            && !(userBuildConfiguration & QtSupport::BaseQtVersion::BuildAll))
+    if (!(defaultBuildConfiguration & QtSupport::BaseQtVersion::DebugBuild) && (userBuildConfiguration & QtSupport::BaseQtVersion::DebugBuild))
         result << "CONFIG+=debug";
     return result;
 }