From 0037bef09ca77c5ae4d20bd09294ba1d57537e09 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 31 Oct 2012 11:13:44 +0100 Subject: [PATCH] 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 --- src/linguist/shared/qmakeglobals.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/linguist/shared/qmakeglobals.cpp b/src/linguist/shared/qmakeglobals.cpp index c7f0d5c..e1a256e 100644 --- a/src/linguist/shared/qmakeglobals.cpp +++ b/src/linguist/shared/qmakeglobals.cpp @@ -326,7 +326,7 @@ bool QMakeGlobals::initProperties() } #endif foreach (QByteArray line, data.split('\n')) - if (!line.startsWith("QMAKE_")) { + { int off = line.indexOf(':'); if (off < 0) // huh? continue; @@ -352,7 +352,6 @@ bool QMakeGlobals::initProperties() } } } - properties.insert(ProKey("QMAKE_VERSION"), ProString("2.01a")); return true; } #else -- 2.7.4