forked from qt-creator/qt-creator
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.
This commit is contained in:
@@ -306,14 +306,10 @@ QString Qt4RunConfiguration::qmakeBuildConfigFromBuildConfiguration(const QStrin
|
||||
QVariant qmakeBuildConfiguration = qs->value(buildConfigurationName, "buildConfiguration");
|
||||
if (qmakeBuildConfiguration.isValid()) {
|
||||
QtVersion::QmakeBuildConfig projectBuildConfiguration = QtVersion::QmakeBuildConfig(qmakeBuildConfiguration.toInt());
|
||||
if (projectBuildConfiguration & QtVersion::BuildAll) {
|
||||
if (projectBuildConfiguration & QtVersion::DebugBuild)
|
||||
return "debug";
|
||||
else
|
||||
return "release";
|
||||
} else {
|
||||
return "";
|
||||
}
|
||||
if (projectBuildConfiguration & QtVersion::DebugBuild)
|
||||
return "debug";
|
||||
else
|
||||
return "release";
|
||||
} else {
|
||||
// Old sytle always CONFIG+=debug_and_release
|
||||
if (qobject_cast<Qt4Project *>(project())->qtVersion(buildConfigurationName)->defaultBuildConfig() & QtVersion::DebugBuild)
|
||||
|
||||
Reference in New Issue
Block a user