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

QmakeProject: Use file list even in the EvalPartial case

Browse Source 
EvalPartial is if the exact parse didn't work out at all, but the
cumulative did.

Task-number: QTCREATORBUG-13871
Change-Id: I98f6389783d15b156e56dc8be7d388b2951d9bdf
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-01-22 13:39:20 +01:00
parent 4a397a5ff5
commit 955ce2169f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1946,6 +1946,9 @@ EvalResult *QmakeProFileNode::evaluate(const EvalInput &input)
if (readerBuildPass && readerBuildPass != input.readerExact) if (readerBuildPass && readerBuildPass != input.readerExact)
delete readerBuildPass; delete readerBuildPass;
}
if (result->state == EvalResult::EvalOk || result->state == EvalResult::EvalPartial) {
QList<QList<VariableAndVPathInformation>> variableAndVPathInformation; QList<QList<VariableAndVPathInformation>> variableAndVPathInformation;
{ // Collect information on VPATHS and qmake variables { // Collect information on VPATHS and qmake variables