From b1c92a3dea51eb5b54a6ed8917ceca0b3772d7de Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 23 Apr 2012 14:14:16 +0200
Subject: move initialization of $$TARGET to setupProject()

that's what we have it for

Change-Id: Ib734b97d337a82c73b086dfeb2b263171f2a02b7
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 qmake/project.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'qmake/project.cpp')

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 80fd22841e..7f831c4cd4 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -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
-- 
cgit v1.2.3