forked from qt-creator/qt-creator
make Makefiles not depend on .qmake.super
sync with qmake. this is a no-op in qtc. Change-Id: Id5158d7e272fdee4f4a041fb7c828295a0a86684 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/d135a311a34e693d761a3607663b0879be9bbf65)
This commit is contained in:
@@ -1212,7 +1212,7 @@ bool QMakeEvaluator::loadSpec()
|
||||
m_qmakespec = QDir::cleanPath(qmakespec);
|
||||
|
||||
if (!m_superfile.isEmpty()
|
||||
&& evaluateFile(m_superfile, QMakeHandler::EvalConfigFile, LoadProOnly) != ReturnTrue) {
|
||||
&& evaluateFile(m_superfile, QMakeHandler::EvalConfigFile, LoadProOnly|LoadHidden) != ReturnTrue) {
|
||||
return false;
|
||||
}
|
||||
if (!loadSpecInternal())
|
||||
@@ -1803,7 +1803,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateFile(
|
||||
m_current = m_locationStack.pop();
|
||||
pro->deref();
|
||||
#ifdef PROEVALUATOR_FULL
|
||||
if (ok == ReturnTrue) {
|
||||
if (ok == ReturnTrue && !(flags & LoadHidden)) {
|
||||
ProStringList &iif = m_valuemapStack.first()[ProKey("QMAKE_INTERNAL_INCLUDED_FILES")];
|
||||
ProString ifn(fileName);
|
||||
if (!iif.contains(ifn))
|
||||
|
@@ -108,7 +108,8 @@ public:
|
||||
LoadPreFiles = 1,
|
||||
LoadPostFiles = 2,
|
||||
LoadAll = LoadPreFiles|LoadPostFiles,
|
||||
LoadSilent = 0x10
|
||||
LoadSilent = 0x10,
|
||||
LoadHidden = 0x20
|
||||
};
|
||||
Q_DECLARE_FLAGS(LoadFlags, LoadFlag)
|
||||
|
||||
|
Reference in New Issue
Block a user