From 777fa561ab3af83ac78dbe55a22ae28097f0dfbd Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 17 Apr 2012 12:21:11 +0200 Subject: 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 --- qmake/project.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'qmake') 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()) { -- cgit v1.2.3