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

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

@@ -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;
}