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

fetch all properties from qmake

Browse Source 
sync up implementation with lupdate & creator. no actual effect on
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)
This commit is contained in:
Oswald Buddenhagen 2012-10-31 11:13:44 +01:00 committed by The Qt Project
parent fe8dcfaef1
commit 52f28060d6
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qmake/library/qmakeglobals.cpp
View File

@ -324,7 +324,7 @@ bool QMakeGlobals::initProperties()
} }
#endif #endif
foreach (QByteArray line, data.split('\n')) foreach (QByteArray line, data.split('\n'))
if (!line.startsWith("QMAKE_")) { {
int off = line.indexOf(':'); int off = line.indexOf(':');
if (off < 0) // huh? if (off < 0) // huh?
continue; continue;
@ -350,7 +350,6 @@ bool QMakeGlobals::initProperties()
} }
} }
} }
properties.insert(ProKey("QMAKE_VERSION"), ProString("2.01a"));
return true; return true;
} }
#else #else