Merge "Merge remote branch 'gerrit/master' into refactor" into refactor

1 files changed, 5 insertions, 6 deletions

diff --git a/qmake/project.cpp b/qmake/project.cpp
index cb4117bef4..bbfd9005c6 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1382,16 +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());
-            if(doProjectInclude("default_pre", IncludeFlagFeature, base_vars) == IncludeNoExist)
-                doProjectInclude("default", 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());