forked from qt-creator/qt-creator
fetch all properties from qmake
don't filter out ^QMAKE_.*: - QMAKE_MKSPECS is not printed any more, so needs no filtering - QMAKE_VERSION can be simply used now, as we are now rather close to the real qmake - QMAKE_SPEC and QMAKE_XSPEC need to be fetched - this fixes the default spec resolution Change-Id: Ifcfa8b5b9e2bbf5d995940e1bb7f55e7d67aed3e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qttools/0037bef09ca77c5ae4d20bd09294ba1d57537e09) Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
@@ -221,7 +221,7 @@ bool QMakeGlobals::initProperties()
|
||||
}
|
||||
#endif
|
||||
foreach (QByteArray line, data.split('\n'))
|
||||
if (!line.startsWith("QMAKE_")) {
|
||||
{
|
||||
int off = line.indexOf(':');
|
||||
if (off < 0) // huh?
|
||||
continue;
|
||||
@@ -247,7 +247,6 @@ bool QMakeGlobals::initProperties()
|
||||
}
|
||||
}
|
||||
}
|
||||
properties.insert(ProKey("QMAKE_VERSION"), ProString("2.01a"));
|
||||
return true;
|
||||
}
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user