diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-07-18 05:50:20 -0500 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-21 20:40:51 +0200 |
| commit | 5e4d13e55c8401b89e8837f81e31b39c87e76e9d (patch) | |
| tree | 4de574a5a274877d66876a1e5ff79308b31dc9ad | |
| parent | f74296ef7c9d58d042d7e7e10b65e32b1ff6d60e (diff) | |
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>
| -rw-r--r-- | qmake/project.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index cb4117bef4..df4076bd3c 100644 --- 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); } } |