move initialization of $$TARGET to setupProject()

that's what we have it for

Change-Id: Ib734b97d337a82c73b086dfeb2b263171f2a02b7
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-04-23 14:14:16 +02:00
parent 075d4a6d5d
commit b1c92a3dea

View File

@ -1535,10 +1535,6 @@ QMakeProject::read(uchar cmd)
doProjectInclude("default_pre", IncludeFlagFeature, vars);
}
//get a default
if(pfile != "-" && vars["TARGET"].isEmpty())
vars["TARGET"].append(QFileInfo(pfile).baseName());
//before commandline
if (cmd & ReadSetup) {
parser.file = "(internal)";
@ -1631,6 +1627,8 @@ void
QMakeProject::setupProject()
{
setTemplate(vars["TEMPLATE"]);
if (pfile != "-")
vars["TARGET"] << QFileInfo(pfile).baseName();
}
void