diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-23 12:06:59 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 14:35:26 +0200 |
| commit | 602ef59e855ac86ea975aa40c533c51685c36bb0 (patch) | |
| tree | 443c714d51317f13746e1b9d5b8d00b696cadbdd /qmake/project.h | |
| parent | 95e710640084ab5880736ba903d31818878beaa3 (diff) | |
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>
Diffstat (limited to 'qmake/project.h')
| -rw-r--r-- | qmake/project.h | 3 |
1 files changed, 2 insertions, 1 deletions
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(); |