Commit 2dda23da authored by dt's avatar dt
Browse files

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

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.
parent df56b106
...@@ -306,14 +306,10 @@ QString Qt4RunConfiguration::qmakeBuildConfigFromBuildConfiguration(const QStrin ...@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment