Skip to content
Snippets Groups Projects
Commit a446491a authored by dt's avatar dt
Browse files

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
parent d585fa0f
No related branches found
No related tags found
No related merge requests found
...@@ -578,14 +578,13 @@ void Qt4RunConfiguration::updateTarget() ...@@ -578,14 +578,13 @@ void Qt4RunConfiguration::updateTarget()
} else { } else {
//qDebug()<<"reader didn't contain DESTDIR, setting to "<<baseDir; //qDebug()<<"reader didn't contain DESTDIR, setting to "<<baseDir;
m_workingDir = baseDir; m_workingDir = baseDir;
if (reader->values("CONFIG").contains("debug_and_release")) {
#if defined(Q_OS_WIN) QString qmakeBuildConfig = "release";
QString qmakeBuildConfig = "release"; if (projectBuildConfiguration & QtVersion::DebugBuild)
if (projectBuildConfiguration & QtVersion::DebugBuild) qmakeBuildConfig = "debug";
qmakeBuildConfig = "debug"; if (!reader->contains("DESTDIR"))
if (!reader->contains("DESTDIR")) m_workingDir += QLatin1Char('/') + qmakeBuildConfig;
m_workingDir += QLatin1Char('/') + qmakeBuildConfig; }
#endif
} }
#if defined (Q_OS_MAC) #if defined (Q_OS_MAC)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment