From a446491ae8155b76e1b4c359236a2c8937728d28 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Tue, 16 Jun 2009 14:14:21 +0200
Subject: [PATCH] Fixes identifing the right WD for .pro chaning
debug_and_release
CONFIG+=debug_and_release not working on linux and
CONFIG-=debug_and_release not working on windows.
The logic should be now correct. That is the profile reader reads the
values that are set for the qt build, gets qmake arguments which we
might pass on the command line and reads the .pro files, and in the end
we are interested what CONFIG contains. Patch from Michael Karcher
Task-number: 254925
---
.../qt4projectmanager/qt4runconfiguration.cpp | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index 92f4287db53..9bd18305c3a 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -578,14 +578,13 @@ void Qt4RunConfiguration::updateTarget()
} else {
//qDebug()<<"reader didn't contain DESTDIR, setting to "<<baseDir;
m_workingDir = baseDir;
-
-#if defined(Q_OS_WIN)
- QString qmakeBuildConfig = "release";
- if (projectBuildConfiguration & QtVersion::DebugBuild)
- qmakeBuildConfig = "debug";
- if (!reader->contains("DESTDIR"))
- m_workingDir += QLatin1Char('/') + qmakeBuildConfig;
-#endif
+ if (reader->values("CONFIG").contains("debug_and_release")) {
+ QString qmakeBuildConfig = "release";
+ if (projectBuildConfiguration & QtVersion::DebugBuild)
+ qmakeBuildConfig = "debug";
+ if (!reader->contains("DESTDIR"))
+ m_workingDir += QLatin1Char('/') + qmakeBuildConfig;
+ }
}
#if defined (Q_OS_MAC)
--
GitLab