From 52f28060d629c0fdf9c3e8350b0344a21afb4137 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Wed, 31 Oct 2012 11:13:44 +0100
Subject: fetch all properties from qmake

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)
---
 qmake/library/qmakeglobals.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'qmake/library/qmakeglobals.cpp')

diff --git a/qmake/library/qmakeglobals.cpp b/qmake/library/qmakeglobals.cpp
index 42bb85bb02..097244abc4 100644
--- a/qmake/library/qmakeglobals.cpp
+++ b/qmake/library/qmakeglobals.cpp
@@ -324,7 +324,7 @@ bool QMakeGlobals::initProperties()
     }
 #endif
     foreach (QByteArray line, data.split('\n'))
-        if (!line.startsWith("QMAKE_")) {
+        {
             int off = line.indexOf(':');
             if (off < 0) // huh?
                 continue;
@@ -350,7 +350,6 @@ bool QMakeGlobals::initProperties()
                 }
             }
         }
-    properties.insert(ProKey("QMAKE_VERSION"), ProString("2.01a"));
     return true;
 }
 #else
-- 
cgit v1.2.3