feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

de-duplicate code a bit

Browse Source 
Change-Id: I0be34a47d77e63f6298c77aba468df0413635afa
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-06-18 11:48:01 +02:00
parent d4900ceddc
commit be47cd2e96
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -1242,11 +1242,7 @@ QStringList QMakeEvaluator::qmakeMkspecPaths() const
QStringList QMakeEvaluator::qmakeFeaturePaths() const QStringList QMakeEvaluator::qmakeFeaturePaths() const
{ {
QString mkspecs_concat = QLatin1String("/mkspecs"); QString mkspecs_concat = QLatin1String("/mkspecs");
QString features_concat = QLatin1String("/features"); QString features_concat = QLatin1String("/features/");
QStringList concat;
foreach (const ProString &sfx, values(ProString("QMAKE_PLATFORM")))
concat << features_concat + QLatin1Char('/') + sfx;
concat << features_concat;
QStringList feature_roots; QStringList feature_roots;
@@ -1256,17 +1252,18 @@ QStringList QMakeEvaluator::qmakeFeaturePaths() const
feature_roots += propertyValue(QLatin1String("QMAKEFEATURES"), false).split( feature_roots += propertyValue(QLatin1String("QMAKEFEATURES"), false).split(
m_option->dirlist_sep, QString::SkipEmptyParts); m_option->dirlist_sep, QString::SkipEmptyParts);
QStringList feature_bases;
if (!m_cachefile.isEmpty()) { if (!m_cachefile.isEmpty()) {
QString path = m_cachefile.left(m_cachefile.lastIndexOf((ushort)'/')); QString path = m_cachefile.left(m_cachefile.lastIndexOf((ushort)'/'));
foreach (const QString &concat_it, concat) feature_bases << path;
feature_roots << (path + concat_it);
} }
foreach (const QString &item, m_option->getPathListEnv(QLatin1String("QMAKEPATH"))) foreach (const QString &item, m_option->getPathListEnv(QLatin1String("QMAKEPATH")))
foreach (const QString &concat_it, concat) feature_bases << (item + mkspecs_concat);
feature_roots << (item + mkspecs_concat + concat_it);
if (!m_qmakespec.isEmpty()) { if (!m_qmakespec.isEmpty()) {
// The spec is already platform-dependent, so no subdirs here.
feature_roots << (m_qmakespec + features_concat); feature_roots << (m_qmakespec + features_concat);
// Also check directly under the root directory of the mkspecs collection // Also check directly under the root directory of the mkspecs collection
@@ -1275,16 +1272,19 @@ QStringList QMakeEvaluator::qmakeFeaturePaths() const
const QString specpath = specdir.path(); const QString specpath = specdir.path();
if (specpath.endsWith(mkspecs_concat)) { if (specpath.endsWith(mkspecs_concat)) {
if (IoUtils::exists(specpath + features_concat)) if (IoUtils::exists(specpath + features_concat))
foreach (const QString &concat_it, concat) feature_bases << specpath;
feature_roots << (specdir.path() + concat_it);
break; break;
} }
} }
} }
foreach (const QString &concat_it, concat) feature_bases << (propertyValue(QLatin1String("QT_INSTALL_DATA"), false) + mkspecs_concat);
feature_roots << (propertyValue(QLatin1String("QT_INSTALL_DATA"), false) +
mkspecs_concat + concat_it); foreach (const QString &fb, feature_bases) {
foreach (const ProString &sfx, values(ProString("QMAKE_PLATFORM")))
feature_roots << (fb + features_concat + sfx + QLatin1Char('/'));
feature_roots << (fb + features_concat);
}
for (int i = 0; i < feature_roots.count(); ++i) for (int i = 0; i < feature_roots.count(); ++i)
if (!feature_roots.at(i).endsWith((ushort)'/')) if (!feature_roots.at(i).endsWith((ushort)'/'))