diff options
| -rw-r--r-- | qmake/project.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/tools/qmake/testdata/export_across_file_boundaries/oink.pri | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index f6e26254c5..397b4aee18 100644 --- 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 cbd2d0f7d0..ea58ef076e 100644 --- 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) |