Commit a446491a authored by dt's avatar dt

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
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment