feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "Fix import of existing builds"

Browse Source 
This reverts commit 8cd3b54949.

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>
This commit is contained in:
dt_
2011-05-24 19:08:31 +02:00
committed by Daniel Teske
parent cf88d6a812
commit 0d2313c555
3 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/qt4projectmanager/qmakestep.cpp
View File

@@ -530,12 +530,8 @@ void QMakeStepConfigWidget::qmakeBuildConfigChanged()
{ {
Qt4BuildConfiguration *bc = m_step->qt4BuildConfiguration(); Qt4BuildConfiguration *bc = m_step->qt4BuildConfiguration();
bool debug = bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild; bool debug = bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild;
int index = debug ? 0 : 1;
if (bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::BuildAll)
index = 2;
m_ignoreChange = true; m_ignoreChange = true;
m_ui.buildConfigurationComboBox->setCurrentIndex(index); m_ui.buildConfigurationComboBox->setCurrentIndex(debug? 0 : 1);
m_ignoreChange = false; m_ignoreChange = false;
updateSummaryLabel(); updateSummaryLabel();
updateEffectiveQMakeCall(); updateEffectiveQMakeCall();
@@ -577,18 +573,11 @@ void QMakeStepConfigWidget::buildConfigurationSelected()
return; return;
Qt4BuildConfiguration *bc = m_step->qt4BuildConfiguration(); Qt4BuildConfiguration *bc = m_step->qt4BuildConfiguration();
QtSupport::BaseQtVersion::QmakeBuildConfigs buildConfiguration = bc->qmakeBuildConfiguration(); QtSupport::BaseQtVersion::QmakeBuildConfigs buildConfiguration = bc->qmakeBuildConfiguration();
switch (m_ui.buildConfigurationComboBox->currentIndex()) { if (m_ui.buildConfigurationComboBox->currentIndex() == 0) { // debug
case 0: buildConfiguration = buildConfiguration | QtSupport::BaseQtVersion::DebugBuild;
buildConfiguration = QtSupport::BaseQtVersion::DebugBuild; } else {
break; buildConfiguration = buildConfiguration & ~QtSupport::BaseQtVersion::DebugBuild;
case 1:
buildConfiguration = 0;
break;
case 2:
buildConfiguration = QtSupport::BaseQtVersion::BuildAll;
break;
} }
m_ignoreChange = true; m_ignoreChange = true;
bc->setQMakeBuildConfiguration(buildConfiguration); bc->setQMakeBuildConfiguration(buildConfiguration);
m_ignoreChange = false; m_ignoreChange = false;

5
src/plugins/qt4projectmanager/qmakestep.ui
View File

@@ -48,11 +48,6 @@
<string>Release</string> <string>Release</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Debug and release</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item> <item>

10
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
View File

@@ -413,20 +413,16 @@ void Qt4BuildConfiguration::emitS60CreatesSmartInstallerChanged()
QStringList Qt4BuildConfiguration::configCommandLineArguments() const QStringList Qt4BuildConfiguration::configCommandLineArguments() const
{ {
QStringList result; 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; QtSupport::BaseQtVersion::QmakeBuildConfigs userBuildConfiguration = m_qmakeBuildConfiguration;
if ((defaultBuildConfiguration & QtSupport::BaseQtVersion::BuildAll) && !(userBuildConfiguration & QtSupport::BaseQtVersion::BuildAll)) if ((defaultBuildConfiguration & QtSupport::BaseQtVersion::BuildAll) && !(userBuildConfiguration & QtSupport::BaseQtVersion::BuildAll))
result << "CONFIG-=debug_and_release"; result << "CONFIG-=debug_and_release";
if (!(defaultBuildConfiguration & QtSupport::BaseQtVersion::BuildAll) && (userBuildConfiguration & QtSupport::BaseQtVersion::BuildAll)) if (!(defaultBuildConfiguration & QtSupport::BaseQtVersion::BuildAll) && (userBuildConfiguration & QtSupport::BaseQtVersion::BuildAll))
result << "CONFIG+=debug_and_release"; result << "CONFIG+=debug_and_release";
if ((defaultBuildConfiguration & QtSupport::BaseQtVersion::DebugBuild) if ((defaultBuildConfiguration & QtSupport::BaseQtVersion::DebugBuild) && !(userBuildConfiguration & QtSupport::BaseQtVersion::DebugBuild))
&& !(userBuildConfiguration & QtSupport::BaseQtVersion::DebugBuild)
&& !(userBuildConfiguration & QtSupport::BaseQtVersion::BuildAll))
result << "CONFIG+=release"; result << "CONFIG+=release";
if (!(defaultBuildConfiguration & QtSupport::BaseQtVersion::DebugBuild) if (!(defaultBuildConfiguration & QtSupport::BaseQtVersion::DebugBuild) && (userBuildConfiguration & QtSupport::BaseQtVersion::DebugBuild))
&& (userBuildConfiguration & QtSupport::BaseQtVersion::DebugBuild)
&& !(userBuildConfiguration & QtSupport::BaseQtVersion::BuildAll))
result << "CONFIG+=debug"; result << "CONFIG+=debug";
return result; return result;
} }