diff options
| -rw-r--r-- | dist/changes-5.0.0 | 2 | ||||
| -rw-r--r-- | qmake/project.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index 47994aa774..9644df40a4 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -203,6 +203,8 @@ information about a particular change. - qmake * Projects which explicitly set an empty TARGET are considered broken now. * The makespec and .qmake.cache do not see build pass specific variables any more. + * load()/include() with a target namespace and infile()/$$fromfile() now start with + an entirely pristine context. * Configure's -sysroot and -hostprefix are now handled slightly differently. The QT_INSTALL_... properties are now automatically prefixed with the sysroot; the raw values are available as QT_RAW_INSTALL_... and the sysroot as QT_SYSROOT. diff --git a/qmake/project.cpp b/qmake/project.cpp index 397b4aee18..ecd31d5234 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1633,7 +1633,7 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QHash<QString, QString if(flags & (IncludeFlagNewProject|IncludeFlagNewParser)) { // The "project's variables" are used in other places (eg. export()) so it's not // possible to use "place" everywhere. Instead just set variables and grab them later - QMakeProject proj(this, &place); + QMakeProject proj(prop); if(flags & IncludeFlagNewParser) { parsed = proj.read(file, proj.variables()); // parse just that file (fromfile, infile) } else { |