Merge remote-tracking branch 'origin/4.11'

 Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp

Change-Id: I8ea57eba526ab830608fd928c28771c5441749f8

1 files changed, 0 insertions, 2 deletions

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index c1d5f04142..ae1e20972f 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -151,7 +151,6 @@ void CMakeBuildSystem::handleTreeScanningFinished()
     qDeleteAll(m_allFiles);
     m_allFiles = Utils::transform(m_treeScanner.release(), [](const FileNode *fn) { return fn; });
 
-    m_combinedScanAndParseResult = m_combinedScanAndParseResult && true;
     m_waitingForScan = false;
 
     combineScanAndParse();
@@ -165,7 +164,6 @@ void CMakeBuildSystem::handleParsingSuccess(CMakeBuildConfiguration *bc)
     QTC_ASSERT(m_waitingForParse, return );
 
     m_waitingForParse = false;
-    m_combinedScanAndParseResult = m_combinedScanAndParseResult && true;
 
     combineScanAndParse();
 }