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>
This commit is contained in:
parent
3688fac040
commit
e34ee31270
1
dist/changes-5.0.0
vendored
1
dist/changes-5.0.0
vendored
@ -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
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user