diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-17 12:21:11 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 09:39:50 +0200 |
| commit | 777fa561ab3af83ac78dbe55a22ae28097f0dfbd (patch) | |
| tree | 1bb1007f848ad545be36308a8081e1a9bfbe2cbb /qmake/project.cpp | |
| parent | 88b4ee22c9b3bf4bc94048df259c50b90d783e8f (diff) | |
read spec_pre and spec_post features
these are read before the qmakespec and before the cache, resp.
this will allow moving some hard-wired logic out of qmake.
Change-Id: I6a63050d7798bc30a4add8c009bcd801a29a0deb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 92c07825cb..e7aee48dbe 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1479,6 +1479,7 @@ QMakeProject::read(uchar cmd) } // parse qmake configuration + doProjectInclude("spec_pre", IncludeFlagFeature, vars); while(qmakespec.endsWith(QLatin1Char('/'))) qmakespec.truncate(qmakespec.length()-1); QString spec = qmakespec + QLatin1String("/qmake.conf"); @@ -1487,6 +1488,7 @@ QMakeProject::read(uchar cmd) fprintf(stderr, "Failure to read QMAKESPEC conf file %s.\n", spec.toLatin1().constData()); return false; } + doProjectInclude("spec_post", IncludeFlagFeature, vars); validateModes(); if (!conffile.isEmpty()) { |