diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-10-31 16:04:19 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-11-01 09:11:06 +0000 |
| commit | 02a81b89c443b6b9e34420f1a58fd2894a95abc4 (patch) | |
| tree | 3b1ac707e343beda0560337b388bed0455d01f64 | |
| parent | 16e61cdf82317805ba5449bbb4c05f94df35e64d (diff) | |
| download | qt-creator-02a81b89c443b6b9e34420f1a58fd2894a95abc4.tar.gz | |
CMake: Simplify
Change-Id: I3e5fd3aebf8b11037d99ff367826ff8f8f436045
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index 2cc69e4c9a..4b71fa135c 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -150,7 +150,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(); @@ -164,7 +163,6 @@ void CMakeBuildSystem::handleParsingSuccess(CMakeBuildConfiguration *bc) QTC_ASSERT(m_waitingForParse, return ); m_waitingForParse = false; - m_combinedScanAndParseResult = m_combinedScanAndParseResult && true; combineScanAndParse(); } diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp index 6c29cf53fd..8d66d920cf 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp @@ -88,7 +88,7 @@ void noAutoAdditionNotify(const QStringList &filePaths, const ProjectExplorer::P "\nCopy the path to the source files to the clipboard?"), "Remember My Choice", &checkValue, QDialogButtonBox::Yes | QDialogButtonBox::No, QDialogButtonBox::Yes); - if (true == checkValue) { + if (checkValue) { if (QDialogButtonBox::Yes == reply) settings->setAfterAddFileSetting(AfterAddFileAction::COPY_FILE_PATH); else if (QDialogButtonBox::No == reply) |