1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make Makefiles not depend on .qmake.super

Browse Source 
this avoids that an empty rebuild after a complete build re-runs qmake
everywhere again.

according to 1f83f0cf2a this is the behavior i originally intended,
but somehow it got lost when switching to the new interpreter.

Change-Id: Id5158d7e272fdee4f4a041fb7c828295a0a86684
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-06-14 09:50:46 +02:00 committed by The Qt Project
parent 17c38b25f4
commit d135a311a3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/library/qmakeevaluator.cpp
View File

@ -1222,7 +1222,7 @@ bool QMakeEvaluator::loadSpec()
m_qmakespec = QDir::cleanPath(qmakespec); m_qmakespec = QDir::cleanPath(qmakespec);
if (!m_superfile.isEmpty() if (!m_superfile.isEmpty()
&& evaluateFile(m_superfile, QMakeHandler::EvalConfigFile, LoadProOnly) != ReturnTrue) { && evaluateFile(m_superfile, QMakeHandler::EvalConfigFile, LoadProOnly|LoadHidden) != ReturnTrue) {
return false; return false;
} }
if (!loadSpecInternal()) if (!loadSpecInternal())
@ -1813,7 +1813,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateFile(
m_current = m_locationStack.pop(); m_current = m_locationStack.pop();
pro->deref(); pro->deref();
#ifdef PROEVALUATOR_FULL #ifdef PROEVALUATOR_FULL
if (ok == ReturnTrue) { if (ok == ReturnTrue && !(flags & LoadHidden)) {
ProStringList &iif = m_valuemapStack.first()[ProKey("QMAKE_INTERNAL_INCLUDED_FILES")]; ProStringList &iif = m_valuemapStack.first()[ProKey("QMAKE_INTERNAL_INCLUDED_FILES")];
ProString ifn(fileName); ProString ifn(fileName);
if (!iif.contains(ifn)) if (!iif.contains(ifn))

3
qmake/library/qmakeevaluator.h
View File

@ -102,7 +102,8 @@ public:
LoadPreFiles = 1, LoadPreFiles = 1,
LoadPostFiles = 2, LoadPostFiles = 2,
LoadAll = LoadPreFiles|LoadPostFiles, LoadAll = LoadPreFiles|LoadPostFiles,
LoadSilent = 0x10 LoadSilent = 0x10,
LoadHidden = 0x20
}; };
Q_DECLARE_FLAGS(LoadFlags, LoadFlag) Q_DECLARE_FLAGS(LoadFlags, LoadFlag)