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

CMake: Make sure to run cmake when that is requested

Browse Source 
Pass on the request to run cmake on to the builddirreaders.

Task-number: QTCREATORBUG-19704
Change-Id: Iafeba61f46d6bb6783fc62d0504bb07dde2c4612
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tobias Hunger
2019-06-06 15:07:17 +02:00
parent 0981a0af25
commit 202506ce16
6 changed files with 63 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/tealeafreader.cpp
View File

@@ -170,7 +170,7 @@ static QString findCbpFile(const QDir &directory)
return file;
}
void TeaLeafReader::parse(bool forceConfiguration)
void TeaLeafReader::parse(bool forceCMakeRun, bool forceConfiguration)
{
emit configurationStarted();
@@ -182,7 +182,7 @@ void TeaLeafReader::parse(bool forceConfiguration)
return;
}
const bool mustUpdate = m_cmakeFiles.isEmpty()
const bool mustUpdate = forceCMakeRun || m_cmakeFiles.isEmpty()
|| anyOf(m_cmakeFiles, [&cbpFileFi](const FilePath &f) {
return f.toFileInfo().lastModified() > cbpFileFi.lastModified();
});