diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-01-28 16:46:30 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-02-03 13:30:02 (GMT) |
| commit | 71eb2bd23604d9c809f143496f781c1d5c065473 (patch) | |
| tree | 4c6f2a5d30c86f15b3dd7a9ce67b3418d8426747 /qmake | |
| parent | 147df10403ba280b3f04c1e3d6c4b1cf386abe5d (diff) | |
| download | Qt-71eb2bd23604d9c809f143496f781c1d5c065473.zip Qt-71eb2bd23604d9c809f143496f781c1d5c065473.tar.gz Qt-71eb2bd23604d9c809f143496f781c1d5c065473.tar.bz2 | |
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.cpp | 6 |
1 files 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; |