summaryrefslogtreecommitdiff
path: root/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-01-28 17:46:30 +0100
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-02-03 14:30:02 +0100
commit71eb2bd23604d9c809f143496f781c1d5c065473 (patch)
tree4c6f2a5d30c86f15b3dd7a9ce67b3418d8426747 /qmake
parent147df10403ba280b3f04c1e3d6c4b1cf386abe5d (diff)
downloadqt4-tools-71eb2bd23604d9c809f143496f781c1d5c065473.tar.gz
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
Diffstat (limited to 'qmake')
-rw-r--r--qmake/project.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 8d8d9e0558..4e2d743383 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;