diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-10-31 11:13:44 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-06 13:59:52 +0100 |
commit | eba7efa3c65975d16d956fa8fc5bdc8ec45fb286 (patch) | |
tree | d5c90ec5310a6adc5b525e23b5ee0f8704004605 | |
parent | 77313fd980f87d6b26f989f3f3cf958e2872fc02 (diff) | |
download | qt-creator-eba7efa3c65975d16d956fa8fc5bdc8ec45fb286.tar.gz |
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>
-rw-r--r-- | src/shared/proparser/qmakeglobals.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/shared/proparser/qmakeglobals.cpp b/src/shared/proparser/qmakeglobals.cpp index 3df68e3685..be1ba77577 100644 --- a/src/shared/proparser/qmakeglobals.cpp +++ b/src/shared/proparser/qmakeglobals.cpp @@ -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 |