diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-04-27 12:09:43 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-04-30 14:38:21 (GMT) |
| commit | eda04e91503fe8573bfaa4384f979596c72a8ae6 (patch) | |
| tree | b0b1ab75aaa41fcb5a2960dcf236e70f9adef247 /qmake | |
| parent | 7cc7b3f53ae8e0105909d81950752ec75f338d83 (diff) | |
| download | Qt-eda04e91503fe8573bfaa4384f979596c72a8ae6.zip Qt-eda04e91503fe8573bfaa4384f979596c72a8ae6.tar.gz Qt-eda04e91503fe8573bfaa4384f979596c72a8ae6.tar.bz2 | |
make QMakeProject::isEmpty() consider legacy mappings
Reviewed-by: joerg
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/project.cpp | 6 | ||||
| -rw-r--r-- | qmake/project.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 942d54b..ee6e7df 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -3161,4 +3161,10 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList return place[var]; } +bool QMakeProject::isEmpty(const QString &v) +{ + QMap<QString, QStringList>::ConstIterator it = vars.constFind(varMap(v)); + return it == vars.constEnd() || it->isEmpty(); +} + QT_END_NAMESPACE diff --git a/qmake/project.h b/qmake/project.h index 976236c..0c542db 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -179,9 +179,6 @@ inline QString QMakeProject::configFile() inline QStringList &QMakeProject::values(const QString &v) { return values(v, vars); } -inline bool QMakeProject::isEmpty(const QString &v) -{ return !isSet(v) || values(v).isEmpty(); } - inline bool QMakeProject::isSet(const QString &v) { return vars.contains(v); } |