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

Qmake: Allow users to force a qmake run on every build

Browse Source 
Some people are fine with paying the extra cost for the somewhat lower
chance of an incremental build breakage.

Fixes: QTCREATORBUG-20888
Change-Id: I96409dfbbc7c747cb01dacbf1efc2b10ee38d07a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Christian Kandeler
2019-03-06 10:44:28 +01:00
parent 940e798a3a
commit a8ebc37da2
3 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -33,6 +33,7 @@
#include "qmakeparser.h"
#include "qmakeproject.h"
#include "qmakeprojectmanagerconstants.h"
#include "qmakesettings.h"
#include <projectexplorer/buildmanager.h>
#include <projectexplorer/buildsteplist.h>
@@ -213,9 +214,10 @@ bool QMakeStep::init()
}
// Check whether we need to run qmake
bool makefileOutDated = (qmakeBc->compareToImportFrom(makefile) != QmakeBuildConfiguration::MakefileMatches);
if (m_forced || makefileOutDated)
if (m_forced || QmakeSettings::alwaysRunQmake()
|| qmakeBc->compareToImportFrom(makefile) != QmakeBuildConfiguration::MakefileMatches) {
m_needToRunQMake = true;
}
m_forced = false;
ProcessParameters *pp = processParameters();