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

Fixes: Bug in the detection wheter the executable on windows is.

Browse Source 
Task:     Found on irc by ferret_svk
Details:  Even if CONFIG is debug_and_release we are interested wheter
          debug or release is the default.
This commit is contained in:
dt
2009-01-14 13:09:09 +01:00
parent df56b1069d
commit 2dda23dabe
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qt4runconfiguration.cpp
View File

@@ -306,14 +306,10 @@ QString Qt4RunConfiguration::qmakeBuildConfigFromBuildConfiguration(const QStrin
QVariant qmakeBuildConfiguration = qs->value(buildConfigurationName, "buildConfiguration"); QVariant qmakeBuildConfiguration = qs->value(buildConfigurationName, "buildConfiguration");
if (qmakeBuildConfiguration.isValid()) { if (qmakeBuildConfiguration.isValid()) {
QtVersion::QmakeBuildConfig projectBuildConfiguration = QtVersion::QmakeBuildConfig(qmakeBuildConfiguration.toInt()); QtVersion::QmakeBuildConfig projectBuildConfiguration = QtVersion::QmakeBuildConfig(qmakeBuildConfiguration.toInt());
if (projectBuildConfiguration & QtVersion::BuildAll) {
if (projectBuildConfiguration & QtVersion::DebugBuild) if (projectBuildConfiguration & QtVersion::DebugBuild)
return "debug"; return "debug";
else else
return "release"; return "release";
} else {
return "";
}
} else { } else {
// Old sytle always CONFIG+=debug_and_release // Old sytle always CONFIG+=debug_and_release
if (qobject_cast<Qt4Project *>(project())->qtVersion(buildConfigurationName)->defaultBuildConfig() & QtVersion::DebugBuild) if (qobject_cast<Qt4Project *>(project())->qtVersion(buildConfigurationName)->defaultBuildConfig() & QtVersion::DebugBuild)