read spec_pre and spec_post features
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 17 Apr 2012 10:21:11 +0000 (12:21 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 27 Jun 2012 07:39:50 +0000 (09:39 +0200)
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>
qmake/project.cpp

index 92c0782..e7aee48 100644 (file)
@@ -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()) {