diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-23 14:15:07 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 14:35:27 +0200 |
| commit | dfbaf479c817d35d6be160fbf8939eb798753442 (patch) | |
| tree | f50a39e6082f6f3d8dc3dea5a782c9090976bf85 /qmake/project.cpp | |
| parent | b1c92a3dea51eb5b54a6ed8917ceca0b3772d7de (diff) | |
make project-related variables non-magic
$$_PRO_FILE_, $$_PRO_FILE_PWD_ and $$OUT_PWD can be cleanly initialized.
no need for magic.
Change-Id: I2e339d17bae42ecb573c2f82c716f6be15a35b98
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 7f831c4cd4..b9e5dcdb1f 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1629,6 +1629,9 @@ QMakeProject::setupProject() setTemplate(vars["TEMPLATE"]); if (pfile != "-") vars["TARGET"] << QFileInfo(pfile).baseName(); + vars["_PRO_FILE_"] << pfile; + vars["_PRO_FILE_PWD_"] << (pfile.isEmpty() ? qmake_getpwd() : QFileInfo(pfile).absolutePath()); + vars["OUT_PWD"] << Option::output_dir; } void @@ -3753,11 +3756,8 @@ QMakeProject::doVariableReplaceExpand(const QString &str, QHash<QString, QString QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringList> &place) { QString var = varMap(_var); - if (var == QLatin1String("OUT_PWD")) { //the out going dir - var = ".BUILTIN." + var; - place[var] = QStringList(Option::output_dir); - } else if(var == QLatin1String("PWD") || //current working dir (of _FILE_) - var == QLatin1String("IN_PWD")) { + if (var == QLatin1String("PWD") || //current working dir (of _FILE_) + var == QLatin1String("IN_PWD")) { var = ".BUILTIN." + var; place[var] = QStringList(qmake_getpwd()); } else if(var == QLatin1String("_LINE_")) { //parser line number @@ -3769,12 +3769,6 @@ QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringLis } else if(var == QLatin1String("_DATE_")) { //current date/time var = ".BUILTIN." + var; place[var] = QStringList(QDateTime::currentDateTime().toString()); - } else if(var == QLatin1String("_PRO_FILE_")) { - var = ".BUILTIN." + var; - place[var] = QStringList(pfile); - } else if(var == QLatin1String("_PRO_FILE_PWD_")) { - var = ".BUILTIN." + var; - place[var] = QStringList(pfile.isEmpty() ? qmake_getpwd() : QFileInfo(pfile).absolutePath()); } //qDebug("REPLACE [%s]->[%s]", qPrintable(var), qPrintable(place[var].join("::"))); return place[var]; |