Remove loading "default" as a fall-back for missing "default_pre"

"default" was used a very long time ago, and it's time to let it go.

Change-Id: I230573ef778789f6e1a5a7df3543e660392da39b
Reviewed-on: http://codereview.qt.nokia.com/1746
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

diff --git a/qmake/project.cpp b/qmake/project.cpp
index cb4117b..df4076b 100644 (file)
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1385,8 +1385,7 @@ QMakeProject::read(uchar cmd)
 
         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);
+            doProjectInclude("default_pre", IncludeFlagFeature, base_vars);
         }
     }