diff options
author | Eike Ziller <[email protected]> | 2019-11-01 15:31:19 +0100 |
---|---|---|
committer | Eike Ziller <[email protected]> | 2019-11-01 15:31:19 +0100 |
commit | 04bd6e39c8991fcb89ab15728f622a5a3ae8f0b2 (patch) | |
tree | 0517ecde8091d1680651853a4a9d209c0636cffd /src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | |
parent | c92c255d1043f11478a61c1caae4069e7ef47114 (diff) | |
parent | a1d22fd2f79afab8b2379f6d93bcb417b9c8e7d5 (diff) |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp
Change-Id: I8ea57eba526ab830608fd928c28771c5441749f8
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp')
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index c1d5f04142c..ae1e20972ff 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(); } |