remove injection of default_pre in infile()/$$fromfile()

this is a hack from the times when these functions were (ab)used to
inspect proper project files, but the inclusion was done with a clean
project, so that the included files did not have any functions to work
with.

Change-Id: I19925e8ead597ca38df040000c183e368b32c06d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/qmake/project.cpp b/qmake/project.cpp
index f6e2625..397b4ae 100644 (file)
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1635,10 +1635,6 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QHash<QString, QString
             // possible to use "place" everywhere. Instead just set variables and grab them later
             QMakeProject proj(this, &place);
             if(flags & IncludeFlagNewParser) {
-#if 1
-                if(proj.doProjectInclude("default_pre", IncludeFlagFeature, proj.variables()) == IncludeNoExist)
-                    proj.doProjectInclude("default", IncludeFlagFeature, proj.variables());
-#endif
                 parsed = proj.read(file, proj.variables()); // parse just that file (fromfile, infile)
             } else {
                 parsed = proj.read(file); // parse all aux files (load/include into)

diff --git a/tests/auto/tools/qmake/testdata/export_across_file_boundaries/oink.pri b/tests/auto/tools/qmake/testdata/export_across_file_boundaries/oink.pri
index cbd2d0f..ea58ef0 100644 (file)
--- a/tests/auto/tools/qmake/testdata/export_across_file_boundaries/oink.pri
+++ b/tests/auto/tools/qmake/testdata/export_across_file_boundaries/oink.pri
@@ -1 +1,2 @@
+load(default_pre)
 setVar(BAR)