whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Oswald Buddenhagen 2012-04-23 17:16:56 +02:00
parent 79d6839306
commit e0f1de0788
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/project.cpp
View File

@ -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();
}

21
qmake/project.h
View File

@ -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