summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qmake/project.cpp6
1 files changed, 2 insertions, 4 deletions
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