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

set $$_DATE_ only on project startup

Browse Source 
this changes the semantics a bit - it will be the datetime of qmake
startup rather than the time a particular file is processed. i'd argue
that this is insignificant.

Change-Id: I75918967bef25038ce54aa81ab03c027384c0268
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-04-23 14:47:34 +02:00
parent b2b72eea04
commit 5ef3c155db
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/project.cpp
View File

@ -1645,6 +1645,7 @@ QMakeProject::loadDefaults()
vars["DIR_SEPARATOR"] << Option::dir_sep; vars["DIR_SEPARATOR"] << Option::dir_sep;
vars["DIRLIST_SEPARATOR"] << Option::dirlist_sep; vars["DIRLIST_SEPARATOR"] << Option::dirlist_sep;
vars["QMAKE_QMAKE"] << Option::qmake_abslocation; vars["QMAKE_QMAKE"] << Option::qmake_abslocation;
vars["_DATE_"] << QDateTime::currentDateTime().toString();
#if defined(Q_OS_WIN32) #if defined(Q_OS_WIN32)
vars["QMAKE_HOST.os"] << QString::fromLatin1("Windows"); vars["QMAKE_HOST.os"] << QString::fromLatin1("Windows");
@ -3767,9 +3768,6 @@ QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringLis
} else if(var == QLatin1String("_FILE_")) { //parser file } else if(var == QLatin1String("_FILE_")) { //parser file
var = ".BUILTIN." + var; var = ".BUILTIN." + var;
place[var] = QStringList(parser.file); place[var] = QStringList(parser.file);
} else if(var == QLatin1String("_DATE_")) { //current date/time
var = ".BUILTIN." + var;
place[var] = QStringList(QDateTime::currentDateTime().toString());
} }
//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];