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>

diff --git a/qmake/project.cpp b/qmake/project.cpp
index df4076b..bbfd900 100644 (file)
--- 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());