From 0d2313c5558f5a1c4dcc5407ce17bec2fdd4047e Mon Sep 17 00:00:00 2001
From: dt_ <qtc-committer@nokia.com>
Date: Tue, 24 May 2011 19:08:31 +0200
Subject: [PATCH] Revert "Fix import of existing builds"
This reverts commit 8cd3b54949bf0be5a7d1b75c4e591b0b79dab990.
Conflicts:
src/plugins/qt4projectmanager/qmakestep.cpp
src/plugins/qt4projectmanager/qmakestep.ui
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
Change-Id: I63af95b8dd7010c50318f276ef524c00a58995bb
Reviewed-on: http://codereview.qt.nokia.com/117
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
src/plugins/qt4projectmanager/qmakestep.cpp | 21 +++++--------------
src/plugins/qt4projectmanager/qmakestep.ui | 5 -----
.../qt4buildconfiguration.cpp | 10 +++------
3 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index edbe033aa2c..de216f62384 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 54d5aeeb005..154254562c0 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 4b505cc7ec6..8ecdbcac149 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;
}
--
GitLab