From 32bc46a90b7aa2506ea2e98c84ee518d80a53769 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 18 Apr 2012 12:26:25 +0200
Subject: remove support for loading features relative to current directory

it's completely counterproductive. just include() the file instead.
i don't think anyone knew about this "feature", so just removing it.

as a side effect this removes the repeated existence check of already
found feature files, as we can use a clean else-if cascade.

Change-Id: I5d38d38d0a897f2e8857ac68d5649fd4367941c4
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 qmake/project.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'qmake/project.cpp')

diff --git a/qmake/project.cpp b/qmake/project.cpp
index a9d4042908..0024234bf4 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1698,7 +1698,7 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QHash<QString, QString
     if(flags & IncludeFlagFeature) {
         if(!file.endsWith(Option::prf_ext))
             file += Option::prf_ext;
-        if(file.indexOf(QLatin1Char('/')) == -1 || !QFile::exists(file)) {
+        {
             QStringList *&feature_roots = all_feature_roots[host_build];
             if(!feature_roots) {
                 feature_roots = new QStringList;
@@ -1736,8 +1736,7 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QHash<QString, QString
         if(place["QMAKE_INTERNAL_INCLUDED_FEATURES"].indexOf(file) != -1)
             return IncludeFeatureAlreadyLoaded;
         place["QMAKE_INTERNAL_INCLUDED_FEATURES"].append(file);
-    }
-    if(QDir::isRelativePath(file)) {
+    } else if (QDir::isRelativePath(file)) {
         QStringList include_roots;
         if(Option::output_dir != qmake_getpwd())
             include_roots << qmake_getpwd();
-- 
cgit v1.2.3