aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@nokia.com>2012-01-18 13:50:14 +0100
committerThomas Hartmann <Thomas.Hartmann@nokia.com>2012-01-18 15:13:52 +0100
commit17a7bd17d08489453d6a679aab711a946e023ff3 (patch)
tree8191d6931163d2630408d6f9087a2261836e0478 /src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
parent31d5ec9cab213fb65b970bfa7c8cb16128d282c8 (diff)
Wizards: allows filtering of wizards based on Qt version
Every wizard now implements requiredFeatures() to define a feature set. If the feature set is not satisfied by the available Qt Versions, the wizard is not shown in the create file/project dialog. Every Qt version can define the provided feature set in availableFeatures() defined in BaseQtVersion. Change-Id: Ie9e2c210d19187b2296451948c36d274f2096623 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp')
-rw-r--r--src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index 8cf8bca90a..f2648a96ab 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -39,6 +39,7 @@
#include "qt4projectmanagerconstants.h"
#include <qtsupport/qtsupportconstants.h>
+#include <coreplugin/dialogs/iwizard.h>
#include <QtCore/QCoreApplication>
#include <QtGui/QIcon>
@@ -87,19 +88,12 @@ bool QtQuickAppWizardDialog::validateCurrentPage()
setIgnoreGenericOptionsPage(false);
if (m_componentOptionsPage->componentSet() == QtQuickApp::Symbian11Components) {
setIgnoreGenericOptionsPage(true);
- targetsPage()->setMinimumQtVersion(QtSupport::QtVersionNumber(4, 7, 4));
- QSet<QString> requiredFeatures;
- requiredFeatures << QLatin1String(Constants::QTQUICKCOMPONENTS_SYMBIAN_TARGETFEATURE_ID);
- targetsPage()->setRequiredFeatures(requiredFeatures);
+ targetsPage()->setRequiredQtFeatures(Core::FeatureSet(QtSupport::Constants::FEATURE_QTQUICK_COMPONENTS_MEEGO));
} else if (m_componentOptionsPage->componentSet() == QtQuickApp::Meego10Components) {
- targetsPage()->setMinimumQtVersion(QtSupport::QtVersionNumber(4, 7, 4));
- QSet<QString> requiredFeatures;
- requiredFeatures << QLatin1String(Constants::QTQUICKCOMPONENTS_MEEGO_TARGETFEATURE_ID);
- targetsPage()->setRequiredFeatures(requiredFeatures);
+ targetsPage()->setRequiredQtFeatures(Core::FeatureSet(QtSupport::Constants::FEATURE_QTQUICK_COMPONENTS_MEEGO));
} else {
targetsPage()->setMinimumQtVersion(QtSupport::QtVersionNumber(4, 7, 0));
- QSet<QString> requiredFeatures;
- targetsPage()->setRequiredFeatures(requiredFeatures);
+ targetsPage()->setRequiredQtFeatures(Core::FeatureSet());
}
}
return AbstractMobileAppWizardDialog::validateCurrentPage();
@@ -126,6 +120,13 @@ QtQuickAppWizard::~QtQuickAppWizard()
delete d;
}
+Core::FeatureSet QtQuickAppWizard::requiredFeatures() const
+{
+ return Core::Feature(QtSupport::Constants::FEATURE_GENERIC_CPP_ENTRY_POINT) |
+ Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK);
+
+}
+
Core::BaseFileWizardParameters QtQuickAppWizard::parameters()
{
Core::BaseFileWizardParameters parameters(ProjectWizard);