diff options
| author | dt <qtc-committer@nokia.com> | 2009-09-01 15:59:12 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-09-01 16:28:54 +0200 |
| commit | 5920ae02c1d471f8b2474a9e23150283584f2c23 (patch) | |
| tree | f088302381c96ae594ab9a42e6c486947f268df3 | |
| parent | 5063af5318b30f055f80c45bf0e1c3b85bee97ee (diff) | |
Fix parsing of .qmake.cache Fixes DESTDIR for debug_and_release_targets
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 f4c10deeb3cfdaa0af0a4bba951a186c6e2008ad)
| -rw-r--r-- | src/plugins/qt4projectmanager/qt4runconfiguration.cpp | 1 | ||||
| -rw-r--r-- | src/shared/proparser/profileevaluator.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp index 48965512e1..ba550ffb09 100644 --- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp @@ -584,6 +584,7 @@ void Qt4RunConfiguration::updateTarget() //qDebug()<<"reader didn't contain DESTDIR, setting to "<<baseDir; m_workingDir = baseDir; if (reader->values("CONFIG").contains("debug_and_release_target")) { + //qDebug()<<"reader has debug_and_release_target"; QString qmakeBuildConfig = "release"; if (projectBuildConfiguration & QtVersion::DebugBuild) qmakeBuildConfig = "debug"; diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index 66e0a6652e..2168921469 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -1208,7 +1208,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::visitBeginProFile(ProFile * pr &m_option->base_valuemap, &m_option->base_functions)) { errorMessage(format("Could not read qmake configuration file %1").arg(spec)); } else { - updateHash(&m_option->base_valuemap, m_option->cache_valuemap); + evaluateFileInto(qmake_cache, &m_option->base_valuemap, &m_option->base_functions); } } |