1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make project-related variables non-magic

Browse Source 
$$_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>
This commit is contained in:
Oswald Buddenhagen 2012-04-23 14:15:07 +02:00
parent b1c92a3dea
commit dfbaf479c8
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qmake/project.cpp
View File

@ -1629,6 +1629,9 @@ QMakeProject::setupProject()
setTemplate(vars["TEMPLATE"]); setTemplate(vars["TEMPLATE"]);
if (pfile != "-") if (pfile != "-")
vars["TARGET"] << QFileInfo(pfile).baseName(); 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 void
@ -3753,10 +3756,7 @@ QMakeProject::doVariableReplaceExpand(const QString &str, QHash<QString, QString
QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringList> &place) QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringList> &place)
{ {
QString var = varMap(_var); QString var = varMap(_var);
if (var == QLatin1String("OUT_PWD")) { //the out going dir if (var == QLatin1String("PWD") || //current working dir (of _FILE_)
var = ".BUILTIN." + var;
place[var] = QStringList(Option::output_dir);
} else if(var == QLatin1String("PWD") || //current working dir (of _FILE_)
var == QLatin1String("IN_PWD")) { var == QLatin1String("IN_PWD")) {
var = ".BUILTIN." + var; var = ".BUILTIN." + var;
place[var] = QStringList(qmake_getpwd()); place[var] = QStringList(qmake_getpwd());
@ -3769,12 +3769,6 @@ QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringLis
} else if(var == QLatin1String("_DATE_")) { //current date/time } else if(var == QLatin1String("_DATE_")) { //current date/time
var = ".BUILTIN." + var; var = ".BUILTIN." + var;
place[var] = QStringList(QDateTime::currentDateTime().toString()); 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("::"))); //qDebug("REPLACE [%s]->[%s]", qPrintable(var), qPrintable(place[var].join("::")));
return place[var]; return place[var];