summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2011-07-16 12:04:47 +0000
committerQt by Nokia <qt-info@nokia.com>2011-07-21 20:40:51 +0200
commit289d5aed37886c9dcc96d41bf65d23121b0b1bee (patch)
treeeaeb4f852138f191282fd959bc1e279e06f27df3
parent5e4d13e55c8401b89e8837f81e31b39c87e76e9d (diff)
Make qmake load default_pre.prf for each project, like default_post.prf
If you ran qmake with 'qmake -r', default_pre.prf would only be run once while default_post.prf would run for every sub-project. This makes it more symmetrical and correct. Change-Id: I1d096c38dffb16f1d256c511ed9e2912cfaefe66 Reviewed-on: http://codereview.qt.nokia.com/1716 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r--qmake/project.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp
index df4076bd3c..bbfd9005c6 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1382,15 +1382,15 @@ QMakeProject::read(uchar cmd)
read(Option::mkfile::cachefile, base_vars);
}
}
-
- if(cmd & ReadFeatures) {
- debug_msg(1, "Processing default_pre: %s", vars["CONFIG"].join("::").toLatin1().constData());
- doProjectInclude("default_pre", IncludeFlagFeature, base_vars);
- }
}
vars = base_vars; // start with the base
+ if(cmd & ReadFeatures) {
+ debug_msg(1, "Processing default_pre: %s", vars["CONFIG"].join("::").toLatin1().constData());
+ doProjectInclude("default_pre", IncludeFlagFeature, vars);
+ }
+
//get a default
if(pfile != "-" && vars["TARGET"].isEmpty())
vars["TARGET"].append(QFileInfo(pfile).baseName());