From 9dedcaedfb3e8eccb5dab463bd557a7ff92fd95e Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Mon, 27 Feb 2012 12:24:10 +0100
Subject: [PATCH] TargetSetupWidget: Handle requiredFeatures correctly
Change-Id: Ibd1df2026266c7c3d839f5579b73227366c95a5c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
---
.../qt-desktop/qt4desktoptargetfactory.cpp | 1 +
src/plugins/qt4projectmanager/qt4target.cpp | 7 +++++--
src/plugins/qt4projectmanager/qt4target.h | 2 ++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
index be5c2c97317..3fe2d186f63 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 7aa6b14c24e..c8b6e484ba8 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 956ceac9d30..d11e3899074 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;
--
GitLab