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

Fix parsing of .qmake.cache Fixes DESTDIR for debug_and_release_targets

Browse Source 
Closer again to qmake, ossi won't like it, but this is exactly what
qmake does, even it it looks a little bit strange. He can come up with
a better fix after he is back from vacation.
(cherry picked from commit f4c10deeb3)
This commit is contained in:
dt
2009-09-01 15:59:12 +02:00
committed by con
parent 5063af5318
commit 5920ae02c1
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -584,6 +584,7 @@ void Qt4RunConfiguration::updateTarget()
//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_target")) { if (reader->values("CONFIG").contains("debug_and_release_target")) {
//qDebug()<<"reader has debug_and_release_target";
QString qmakeBuildConfig = "release"; QString qmakeBuildConfig = "release";
if (projectBuildConfiguration & QtVersion::DebugBuild) if (projectBuildConfiguration & QtVersion::DebugBuild)
qmakeBuildConfig = "debug"; qmakeBuildConfig = "debug";

2
src/shared/proparser/profileevaluator.cpp
View File

@@ -1208,7 +1208,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::visitBeginProFile(ProFile * pr
&m_option->base_valuemap, &m_option->base_functions)) { &m_option->base_valuemap, &m_option->base_functions)) {
errorMessage(format("Could not read qmake configuration file %1").arg(spec)); errorMessage(format("Could not read qmake configuration file %1").arg(spec));
} else { } else {
updateHash(&m_option->base_valuemap, m_option->cache_valuemap); evaluateFileInto(qmake_cache, &m_option->base_valuemap, &m_option->base_functions);
} }
} }