diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-03 18:03:24 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-05 14:46:12 +0100 |
| commit | deb3c134b5b718e429a71ed0cff8f1f711b30e62 (patch) | |
| tree | e4c5c5019c6d5783c0b1b06d6cb9eb31ddcad517 /qmake/project.cpp | |
| parent | d94165ab326f24a725720a705405067975b82af8 (diff) | |
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>
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 4 |
1 files changed, 0 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) |