Commit dfcf9889 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

look only for mkspec features for the current target platform

parent 6b85d482
...@@ -1088,19 +1088,34 @@ QStringList ProFileEvaluator::Private::qmakeMkspecPaths() const ...@@ -1088,19 +1088,34 @@ QStringList ProFileEvaluator::Private::qmakeMkspecPaths() const
QStringList ProFileEvaluator::Private::qmakeFeaturePaths() const QStringList ProFileEvaluator::Private::qmakeFeaturePaths() const
{ {
QString mkspecs_concat = QLatin1String("/mkspecs");
QString features_concat = QLatin1String("/features");
QStringList concat; QStringList concat;
{ switch (m_option->target_mode) {
const QString base_concat = QDir::separator() + QString(QLatin1String("features")); case Option::TARG_MACX_MODE:
concat << base_concat + QDir::separator() + QLatin1String("mac"); concat << QLatin1String("/features/mac");
concat << base_concat + QDir::separator() + QLatin1String("macx"); concat << QLatin1String("/features/macx");
concat << base_concat + QDir::separator() + QLatin1String("unix"); concat << QLatin1String("/features/unix");
concat << base_concat + QDir::separator() + QLatin1String("win32"); break;
concat << base_concat + QDir::separator() + QLatin1String("mac9"); case Option::TARG_UNIX_MODE:
concat << base_concat + QDir::separator() + QLatin1String("qnx6"); concat << QLatin1String("/features/unix");
concat << base_concat; break;
case Option::TARG_WIN_MODE:
concat << QLatin1String("/features/win32");
break;
case Option::TARG_MAC9_MODE:
concat << QLatin1String("/features/mac");
concat << QLatin1String("/features/mac9");
break;
case Option::TARG_QNX6_MODE:
concat << QLatin1String("/features/qnx6");
concat << QLatin1String("/features/unix");
break;
} }
const QString mkspecs_concat = QDir::separator() + QString(QLatin1String("mkspecs")); concat << features_concat;
QStringList feature_roots; QStringList feature_roots;
QByteArray mkspec_path = qgetenv("QMAKEFEATURES"); QByteArray mkspec_path = qgetenv("QMAKEFEATURES");
if (!mkspec_path.isNull()) if (!mkspec_path.isNull())
feature_roots += QString::fromLocal8Bit(mkspec_path).split(m_option->dirlist_sep); feature_roots += QString::fromLocal8Bit(mkspec_path).split(m_option->dirlist_sep);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment