diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-02 18:11:16 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-26 13:23:49 +0100 |
commit | e34ee3127043773a037bfd18a2d457d409032ee5 (patch) | |
tree | aacdcfae919b0a54ef735062c1889b54f0ded314 | |
parent | 3688fac0402d0737985b2e70dcb0b96117902d93 (diff) |
remove fallback re-initialization of TARGET after parsing project
we already initialize it before parsing a project. if a project is daft
enough to clear TARGET, it does not deserve differently than breaking.
Change-Id: I6c727bc27d72a00e84b676ae3c169024bdb2d929
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rw-r--r-- | dist/changes-5.0.0 | 1 | ||||
-rw-r--r-- | qmake/project.cpp | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index 8d928208de..5a9ce7e6c7 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -199,6 +199,7 @@ information about a particular change. You might need to adjust your code if it used a QIconEngine. - qmake + * Projects which explicitly set an empty TARGET are considered broken now. * several functions and built-in variables were modified to return normalized paths. - QTextCodecPlugin has been removed since it is no longer used. All text codecs diff --git a/qmake/project.cpp b/qmake/project.cpp index a8620334d8..3546ac9877 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1444,9 +1444,6 @@ QMakeProject::read(uchar cmd) parse("CONFIG += " + Option::after_user_configs.join(" "), vars); } - if(pfile != "-" && vars["TARGET"].isEmpty()) - vars["TARGET"].append(QFileInfo(pfile).baseName()); - if(cmd & ReadFeatures) { debug_msg(1, "Processing default_post: %s", vars["CONFIG"].join("::").toLatin1().constData()); doProjectInclude("default_post", IncludeFlagFeature, vars); |