diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp index be5c2c9731727297239371a600f6912b4e32c726..3fe2d186f63962c6fa598c837448b5b7233b78cc 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp @@ -138,6 +138,7 @@ Qt4TargetSetupWidget *Qt4DesktopTargetFactory::createTargetSetupWidget(const QSt return 0; Qt4DefaultTargetSetupWidget *widget = new Qt4DefaultTargetSetupWidget(this, id, proFilePath, infos, minimumQtVersion, maximumQtVersion, + requiredFeatures, importEnabled, importInfos, Qt4DefaultTargetSetupWidget::USER); widget->setBuildConfiguraionComboBoxVisible(true); diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp index 7aa6b14c24e7fb8e5a122f5bf988c3fb50cd5cd3..c8b6e484ba8f2e8fc48e1162fe879eab1c2cf540 100644 --- a/src/plugins/qt4projectmanager/qt4target.cpp +++ b/src/plugins/qt4projectmanager/qt4target.cpp @@ -107,7 +107,8 @@ Qt4TargetSetupWidget *Qt4BaseTargetFactory::createTargetSetupWidget(const QStrin const bool supportsShadowBuilds = targetFeatures(id).contains(QLatin1String(Constants::SHADOWBUILD_TARGETFEATURE_ID)); Qt4DefaultTargetSetupWidget *widget - = new Qt4DefaultTargetSetupWidget(this, id, proFilePath, infos, minimumQtVersion, maximumQtVersion, + = new Qt4DefaultTargetSetupWidget(this, id, proFilePath, infos, + minimumQtVersion, maximumQtVersion, requiredFeatures, importEnabled && supportsShadowBuilds, importInfos, (supportsShadowBuilds ? Qt4DefaultTargetSetupWidget::ENABLE @@ -490,6 +491,7 @@ Qt4DefaultTargetSetupWidget::Qt4DefaultTargetSetupWidget(Qt4BaseTargetFactory *f const QList<BuildConfigurationInfo> &infos, const QtSupport::QtVersionNumber &minimumQtVersion, const QtSupport::QtVersionNumber &maximumQtVersion, + const Core::FeatureSet &requiredFeatures, bool importEnabled, const QList<BuildConfigurationInfo> &importInfos, ShadowBuildOption shadowBuild) @@ -499,6 +501,7 @@ Qt4DefaultTargetSetupWidget::Qt4DefaultTargetSetupWidget(Qt4BaseTargetFactory *f m_proFilePath(proFilePath), m_minimumQtVersion(minimumQtVersion), m_maximumQtVersion(maximumQtVersion), + m_requiredFeatures(requiredFeatures), m_importInfos(importInfos), m_directoriesEnabled(true), m_hasInSourceBuild(false), @@ -726,7 +729,7 @@ void Qt4DefaultTargetSetupWidget::setProFilePath(const QString &proFilePath) proFilePath, m_minimumQtVersion, m_maximumQtVersion, - Core::FeatureSet()), + m_requiredFeatures), false); } diff --git a/src/plugins/qt4projectmanager/qt4target.h b/src/plugins/qt4projectmanager/qt4target.h index 956ceac9d307a74e77328369a736d40402377599..d11e38990743a36464305544cd3f95a523998be9 100644 --- a/src/plugins/qt4projectmanager/qt4target.h +++ b/src/plugins/qt4projectmanager/qt4target.h @@ -122,6 +122,7 @@ public: const QList<BuildConfigurationInfo> &info, const QtSupport::QtVersionNumber &minimumQtVersion, const QtSupport::QtVersionNumber &maximumQtVersion, + const Core::FeatureSet &requiredFeatures, bool importEnabled, const QList<BuildConfigurationInfo> &importInfos, ShadowBuildOption shadowBuild); @@ -165,6 +166,7 @@ private: QString m_proFilePath; QtSupport::QtVersionNumber m_minimumQtVersion; QtSupport::QtVersionNumber m_maximumQtVersion; + Core::FeatureSet m_requiredFeatures; Utils::DetailsWidget *m_detailsWidget; QGridLayout *m_importLayout; QGridLayout *m_newBuildsLayout;