feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

move initialization of $$TARGET to setupProject()

Browse Source 
follow suit with qmake ...

Change-Id: I307a55cb264aa79f39ffd5fef07ee9f010d98f56
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-06-12 21:39:05 +02:00
parent 6507337b47
commit 53351d7d87
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -96,12 +96,8 @@ void QMakeEvaluator::initStatics()
initFunctionStatics();
static const char * const names[] = {
"DIRLIST_SEPARATOR", "DIR_SEPARATOR",
"OUT_PWD", "PWD",
"_PRO_FILE_", "_PRO_FILE_PWD_",
"QMAKE_HOST.arch", "QMAKE_HOST.name", "QMAKE_HOST.os",
"QMAKE_HOST.version", "QMAKE_HOST.version_string",
"_DATE_", "_QMAKE_CACHE_"
"_PRO_FILE_", "_PRO_FILE_PWD_"
};
for (unsigned i = 0; i < sizeof(names)/sizeof(names[0]); ++i)
statics.varList.insert(ProString(names[i]), i);
@@ -1006,6 +1002,8 @@ bool QMakeEvaluator::loadSpec()
void QMakeEvaluator::setupProject()
{
setTemplate();
ProValueMap &vars = m_valuemapStack.top();
vars[ProString("TARGET")] << ProString(QFileInfo(currentFileName()).baseName(), NoHash);
}
void QMakeEvaluator::visitCmdLine(const QString &cmds)
@@ -1075,10 +1073,6 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile(
evaluateFeatureFile(QLatin1String("default_pre.prf"));
ProStringList &tgt = m_valuemapStack.top()[ProString("TARGET")];
if (tgt.isEmpty())
tgt.append(ProString(QFileInfo(pro->fileName()).baseName(), NoHash));
visitCmdLine(m_option->precmds);
}