From 2dda23dabe6a590e8fe9b4deb6dac9734d48feae Mon Sep 17 00:00:00 2001 From: dt Date: Wed, 14 Jan 2009 13:09:09 +0100 Subject: [PATCH] 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. --- .../qt4projectmanager/qt4runconfiguration.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp index 99c19e3a7e9..64961844996 100644 --- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp @@ -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(project())->qtVersion(buildConfigurationName)->defaultBuildConfig() & QtVersion::DebugBuild)