From 602ef59e855ac86ea975aa40c533c51685c36bb0 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 23 Apr 2012 12:06:59 +0200
Subject: make a bunch of invariant variables non-magic

instead of resolving them on-demand, just initialize the value hash
with them. less magic and faster.

Change-Id: I28cb6c21ae6ae60a33734f62acdef0794420ba8f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 qmake/project.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'qmake/project.h')

diff --git a/qmake/project.h b/qmake/project.h
index 8314c39321..11d0eb4a27 100644
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -91,7 +91,7 @@ class QMakeProject
     QMakeProperty *prop;
     void reset();
     QStringList extra_configs;
-    QHash<QString, QStringList> vars, base_vars, extra_vars;
+    QHash<QString, QStringList> vars, init_vars, base_vars, extra_vars;
     bool parse(const QString &text, QHash<QString, QStringList> &place, int line_count=1);
 
     enum IncludeStatus {
@@ -114,6 +114,7 @@ class QMakeProject
     QStringList doVariableReplaceExpand(const QString &str, QHash<QString, QStringList> &place, bool *ok=0);
     void init(QMakeProperty *);
     void cleanup();
+    void loadDefaults();
     QStringList &values(const QString &v, QHash<QString, QStringList> &place);
     QStringList qmakeFeaturePaths();
 
-- 
cgit v1.2.3