Skip to content
Snippets Groups Projects
Commit eba7efa3 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

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: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qttools/0037bef09ca77c5ae4d20bd09294ba1d57537e09)
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 77313fd9
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment