Merge remote-tracking branch 'origin/3.2'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/remotelinux/remotelinuxdebugsupport.cpp
	src/plugins/texteditor/basetexteditor.cpp

Change-Id: I0da7c1cf2506b12d0563795aa8177fc45e97050f

1 files changed, 4 insertions, 8 deletions

diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
index e7bbf29f68b..f8c5f0a973c 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
@@ -1712,17 +1712,13 @@ void QmakeProFileNode::setupReader()
 
 QmakeProFileNode::EvalResult QmakeProFileNode::evaluate()
 {
-    EvalResult evalResult = EvalOk;
     if (ProFile *pro = m_readerExact->parsedProFile(m_projectFilePath)) {
-        if (!m_readerExact->accept(pro, QMakeEvaluator::LoadAll))
-            evalResult = EvalPartial;
-        if (!m_readerCumulative->accept(pro, QMakeEvaluator::LoadPreFiles))
-            evalResult = EvalFail;
+        bool exactOk = m_readerExact->accept(pro, QMakeEvaluator::LoadAll);
+        bool cumulOk = m_readerCumulative->accept(pro, QMakeEvaluator::LoadPreFiles);
         pro->deref();
-    } else {
-        evalResult = EvalFail;
+        return exactOk ? EvalOk : cumulOk ? EvalPartial : EvalFail;
     }
-    return evalResult;
+    return EvalFail;
 }
 
 void QmakeProFileNode::asyncEvaluate(QFutureInterface<EvalResult> &fi)