From 289d5aed37886c9dcc96d41bf65d23121b0b1bee Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Sat, 16 Jul 2011 12:04:47 +0000 Subject: 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 Reviewed-by: Oswald Buddenhagen --- qmake/project.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'qmake') 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()); -- cgit v1.2.3