From 71eb2bd23604d9c809f143496f781c1d5c065473 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 28 Jan 2011 17:46:30 +0100
Subject: move multiple inclusion check for feature files to correct location

previously, features specified with an absolute path would not be
covered by the multiple inclusion guard, unlike the one specified just
by a name.
this is of theoretical value only, as nobody specifies features via
absolute path anyway ...

Reviewed-by: mariusSO
---
 qmake/project.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 8d8d9e0..4e2d743 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1681,10 +1681,10 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QMap<QString, QStringL
             }
             if(format == UnknownFormat)
                 return IncludeNoExist;
-            if(place["QMAKE_INTERNAL_INCLUDED_FEATURES"].indexOf(file) != -1)
-                return IncludeFeatureAlreadyLoaded;
-            place["QMAKE_INTERNAL_INCLUDED_FEATURES"].append(file);
         }
+        if(place["QMAKE_INTERNAL_INCLUDED_FEATURES"].indexOf(file) != -1)
+            return IncludeFeatureAlreadyLoaded;
+        place["QMAKE_INTERNAL_INCLUDED_FEATURES"].append(file);
     }
     if(QDir::isRelativePath(file)) {
         QStringList include_roots;
-- 
cgit v0.12