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

Fix add buildconfiguration not respecting default qmake build

Browse Source 
Change-Id: Ic20b2842b10bf97c721df6d90b2306a813c9ba2a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Daniel Teske
2012-04-17 17:10:56 +02:00
parent 898137797c
commit 6630857deb
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -752,25 +752,30 @@ BuildConfiguration *Qt4BuildConfigurationFactory::create(ProjectExplorer::Target
return 0; return 0;
//: Debug build configuration. We recommend not translating it. //: Debug build configuration. We recommend not translating it.
QString defaultDebugName = tr("%1 Debug").arg(version->displayName()); QString defaultFirstName = tr("%1 Debug").arg(version->displayName());
QString customDebugName; QString customFirstName;
if (buildConfigurationName != version->displayName()) if (buildConfigurationName != version->displayName())
customDebugName = tr("%1 Debug").arg(buildConfigurationName); customFirstName = tr("%1 Debug").arg(buildConfigurationName);
BuildConfiguration *bc = qt4Target->addQt4BuildConfiguration(defaultDebugName, customDebugName,
version,
(version->defaultBuildConfig() | QtSupport::BaseQtVersion::DebugBuild),
QString(), QString(), false);
//: Release build configuration. We recommend not translating it. //: Release build configuration. We recommend not translating it.
QString defaultReleaseName = tr("%1 Release").arg(version->displayName()); QString defaultSecondName = tr("%1 Release").arg(version->displayName());
QString customReleaseName; QString customSecondName;
if (buildConfigurationName != version->displayName()) if (buildConfigurationName != version->displayName())
customReleaseName = tr("%1 Release").arg(buildConfigurationName); customSecondName = tr("%1 Release").arg(buildConfigurationName);
bc = qt4Target->addQt4BuildConfiguration(defaultReleaseName, customReleaseName, if (!(version->defaultBuildConfig() & QtSupport::BaseQtVersion::DebugBuild)) {
qSwap(defaultFirstName, defaultSecondName);
qSwap(customFirstName, customSecondName);
}
BuildConfiguration *bc = qt4Target->addQt4BuildConfiguration(defaultFirstName, customFirstName,
version, version,
(version->defaultBuildConfig() & ~QtSupport::BaseQtVersion::DebugBuild), version->defaultBuildConfig(),
QString(), QString(), false);
qt4Target->addQt4BuildConfiguration(defaultSecondName, customSecondName,
version,
(version->defaultBuildConfig() ^ QtSupport::BaseQtVersion::DebugBuild),
QString(), QString(), false); QString(), QString(), false);
return bc; return bc;
} }