feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixes identifing the right WD for .pro chaning debug_and_release

Browse Source 
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
This commit is contained in:
dt
2009-06-16 14:14:21 +02:00
parent d585fa0fdf
commit a446491ae8
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qt4projectmanager/qt4runconfiguration.cpp
View File

@@ -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)