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

Revert "don't LoadPostFiles in build_pass reader"

Browse Source 
The change broke the parsing of DESTDIR for debug_and_release configurations on Windows.

This reverts commit 1304c08764.

Change-Id: I3ddb768658398ea914929078554c0dfbbfe505a3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Kai Koehne
2015-01-07 16:50:44 +01:00
parent d698a47887
commit b650bf7d1f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -1878,7 +1878,7 @@ EvalResult *QmakeProFileNode::evaluate(const EvalInput &input)
EvalResult::EvalResultState evalResultBuildPass = EvalResult::EvalOk; EvalResult::EvalResultState evalResultBuildPass = EvalResult::EvalOk;
if (ProFile *pro = readerBuildPass->parsedProFile(input.projectFilePath)) { if (ProFile *pro = readerBuildPass->parsedProFile(input.projectFilePath)) {
if (!readerBuildPass->accept(pro, QMakeEvaluator::LoadPreFiles)) if (!readerBuildPass->accept(pro, QMakeEvaluator::LoadAll))
evalResultBuildPass = EvalResult::EvalPartial; evalResultBuildPass = EvalResult::EvalPartial;
pro->deref(); pro->deref();
} else { } else {