diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-18 12:26:25 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 09:39:50 +0200 |
| commit | 32bc46a90b7aa2506ea2e98c84ee518d80a53769 (patch) | |
| tree | df1173bc7860925e3d93fe9e2d66c6d1fb649e94 /qmake | |
| parent | 4753958db707001d1e14fa8312708dc1e891bacc (diff) | |
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>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/project.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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(); |