diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-23 14:14:16 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 14:35:26 +0200 |
| commit | b1c92a3dea51eb5b54a6ed8917ceca0b3772d7de (patch) | |
| tree | b95f2c7991efa49e7f66cf57af28b5a4f26eed87 /qmake/project.cpp | |
| parent | 075d4a6d5d2dffd27d8a822d78e923798984d903 (diff) | |
move initialization of $$TARGET to setupProject()
that's what we have it for
Change-Id: Ib734b97d337a82c73b086dfeb2b263171f2a02b7
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 6 |
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 |