use real qmakespec as basis for finding features

doesn't make much of a difference on unix (as the default specs are just
symlinks).
on windows, it makes the gross hack used for finding spec-specific wince
default_post.prfs unnecessary.

Change-Id: Id403dce5be487e1ae22c1f54b8095a6afdd98bc8
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/mkspecs/features/win32/default_post.prf b/mkspecs/features/win32/default_post.prf
deleted file mode 100644 (file)
index a1d8b52..0000000
--- a/mkspecs/features/win32/default_post.prf
+++ /dev/null
@@ -1,11 +0,0 @@
-!isEmpty(CE_ARCH) {
-    QMAKESPEC_DIR = $$QMAKESPEC
-    exists($$QMAKESPEC_DIR/default_post.prf) {
-        isEmpty(QMAKESPEC_DIR):QMAKESPEC_DIR = $$QMAKESPEC_ORIGINAL
-        !isEmpty(QMAKESPEC_DIR):load($$QMAKESPEC_DIR/default_post.prf)
-    }
-}
-
-# Now load the global default_post
-load(default_post)
-

diff --git a/qmake/project.cpp b/qmake/project.cpp
index a909c04..c781cd2 100644 (file)
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -587,13 +587,12 @@ QStringList QMakeProject::qmakeFeaturePaths()
     foreach (const QString &path, qmakepath)
         foreach (const QString &cat, concat)
             feature_roots << (path + mkspecs_concat + cat);
-    QString *specp = host_build ? &Option::mkfile::qmakespec : &Option::mkfile::xqmakespec;
-    if (!specp->isEmpty()) {
+    if (!real_spec.isEmpty()) {
         // The spec is already platform-dependent, so no subdirs here.
-        feature_roots << *specp + base_concat;
+        feature_roots << real_spec + base_concat;
 
         // Also check directly under the root directory of the mkspecs collection
-        QFileInfo specfi(*specp);
+        QFileInfo specfi(real_spec);
         QDir specrootdir(specfi.absolutePath());
         while (!specrootdir.isRoot()) {
             const QString specrootpath = specrootdir.path();