From caa22630510fb625f9c2ed18660cb56eb585137c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 20 Apr 2012 17:07:52 +0200 Subject: 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 --- qmake/project.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'qmake/project.cpp') diff --git a/qmake/project.cpp b/qmake/project.cpp index a909c04a9a..c781cd2a28 100644 --- 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(); -- cgit v1.2.3