diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-23 17:16:56 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 14:35:28 +0200 |
| commit | e0f1de0788954ff78f796a1f732800e762075cb0 (patch) | |
| tree | b1392db7864670401fd321a8f5256e3ce5c28046 | |
| parent | 79d6839306632d81b44e4ab01280f5220717b965 (diff) | |
don't use backwards compat mapping for generator accesses
we can rely on only user code needing variable mapping, so apply it only
in the evaluator.
Change-Id: I6fc58e7bcf24cf0fa8783d5341ab1e7b9f001c88
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | qmake/project.cpp | 2 | ||||
| -rw-r--r-- | qmake/project.h | 21 |
2 files changed, 7 insertions, 16 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index a5ed2bebaf..30b2cd2b33 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -3780,7 +3780,7 @@ QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringLis bool QMakeProject::isEmpty(const QString &v) { - QHash<QString, QStringList>::ConstIterator it = vars.constFind(varMap(v)); + QHash<QString, QStringList>::ConstIterator it = vars.constFind(v); return it == vars.constEnd() || it->isEmpty(); } diff --git a/qmake/project.h b/qmake/project.h index 8dc863a2f8..34ca8ec194 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -164,12 +164,12 @@ public: bool isActiveConfig(const QString &x, bool regex=false, QHash<QString, QStringList> *place=NULL); - bool isSet(const QString &v); // No compat mapping, no magic variables - bool isEmpty(const QString &v); // With compat mapping, but no magic variables - QStringList &values(const QString &v); // With compat mapping and magic variables - QString first(const QString &v); // ditto - int intValue(const QString &v, int defaultValue = 0); // ditto - QHash<QString, QStringList> &variables(); // No compat mapping and magic, obviously + bool isSet(const QString &v) { return vars.contains(v); } + bool isEmpty(const QString &v); + QStringList &values(const QString &v) { return vars[v]; } + QString first(const QString &v); + int intValue(const QString &v, int defaultValue = 0); + QHash<QString, QStringList> &variables() { return vars; } bool isRecursive() const { return recursive; } bool isHostBuild() const { return host_build; } @@ -189,12 +189,6 @@ inline QString QMakeProject::projectFile() return pfile; } -inline QStringList &QMakeProject::values(const QString &v) -{ return values(v, vars); } - -inline bool QMakeProject::isSet(const QString &v) -{ return vars.contains(v); } - inline QString QMakeProject::first(const QString &v) { const QStringList vals = values(v); @@ -215,9 +209,6 @@ inline int QMakeProject::intValue(const QString &v, int defaultValue) return defaultValue; } -inline QHash<QString, QStringList> &QMakeProject::variables() -{ return vars; } - QT_END_NAMESPACE #endif // PROJECT_H |