1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

read spec_pre and spec_post features

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-04-17 12:21:11 +02:00
parent 88b4ee22c9
commit 777fa561ab
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/project.cpp
View File

@ -1479,6 +1479,7 @@ QMakeProject::read(uchar cmd)
} }
// parse qmake configuration // parse qmake configuration
doProjectInclude("spec_pre", IncludeFlagFeature, vars);
while(qmakespec.endsWith(QLatin1Char('/'))) while(qmakespec.endsWith(QLatin1Char('/')))
qmakespec.truncate(qmakespec.length()-1); qmakespec.truncate(qmakespec.length()-1);
QString spec = qmakespec + QLatin1String("/qmake.conf"); 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()); fprintf(stderr, "Failure to read QMAKESPEC conf file %s.\n", spec.toLatin1().constData());
return false; return false;
} }
doProjectInclude("spec_post", IncludeFlagFeature, vars);
validateModes(); validateModes();
if (!conffile.isEmpty()) { if (!conffile.isEmpty()) {