From b650bf7d1fb2554c65d6467e89cd69c5114f0534 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 7 Jan 2015 16:50:44 +0100 Subject: [PATCH] Revert "don't LoadPostFiles in build_pass reader" The change broke the parsing of DESTDIR for debug_and_release configurations on Windows. This reverts commit 1304c08764af828208f7755e9f99238746d19530. Change-Id: I3ddb768658398ea914929078554c0dfbbfe505a3 Reviewed-by: Oswald Buddenhagen --- src/plugins/qmakeprojectmanager/qmakenodes.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 6e3a31f5c99..1da974b1f1a 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -1878,7 +1878,7 @@ EvalResult *QmakeProFileNode::evaluate(const EvalInput &input) EvalResult::EvalResultState evalResultBuildPass = EvalResult::EvalOk; if (ProFile *pro = readerBuildPass->parsedProFile(input.projectFilePath)) { - if (!readerBuildPass->accept(pro, QMakeEvaluator::LoadPreFiles)) + if (!readerBuildPass->accept(pro, QMakeEvaluator::LoadAll)) evalResultBuildPass = EvalResult::EvalPartial; pro->deref(); } else {