From a39d7e8d12757e278c684b340156acca5fe99f0a Mon Sep 17 00:00:00 2001
From: Michael Karcher <gitorious@mkarcher.dialup.fu-berlin.de>
Date: Tue, 30 Jun 2009 14:56:26 +0200
Subject: [PATCH] Fix test for debug_and_release_target
This is a fix for a446491ae8155b76e1b4c359236a2c8937728d28.
The option debug_and_release determines whether the debug/ and release/
subdirectories are used to put *object* files there. The option
debug_and_release_target is used to put the final taget into debug/
and release/ directories.
Merge-request: 745
Reviewed-by: dt <qtc-committer@nokia.com>
---
src/plugins/qt4projectmanager/qt4runconfiguration.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index a43f54b6273..8d07707e7f8 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -592,7 +592,7 @@ void Qt4RunConfiguration::updateTarget()
} else {
//qDebug()<<"reader didn't contain DESTDIR, setting to "<<baseDir;
m_workingDir = baseDir;
- if (reader->values("CONFIG").contains("debug_and_release")) {
+ if (reader->values("CONFIG").contains("debug_and_release_target")) {
QString qmakeBuildConfig = "release";
if (projectBuildConfiguration & QtVersion::DebugBuild)
qmakeBuildConfig = "debug";
--
GitLab