20 files changed, 86 insertions, 15 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
index bd0a4da7fe..7fca16190d 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
@@ -37,6 +37,7 @@
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <cpptools/abstracteditorsupport.h>
+#include <qtsupport/qtsupportconstants.h>
 
 #include <QtGui/QIcon>
 #include <QtCore/QFileInfo>
@@ -107,5 +108,10 @@ Core::GeneratedFiles
     return Core::GeneratedFiles() <<  source << profile;
 }
 
+Core::FeatureSet ConsoleAppWizard::requiredFeatures() const
+{
+    return Core::Feature(QtSupport::Constants::FEATURE_GENERIC_CPP_ENTRY_POINT);
+}
+
 } // namespace Internal
 } // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.h b/src/plugins/qt4projectmanager/wizards/consoleappwizard.h
index 64674e7856..91199489f2 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizard.h
@@ -54,6 +54,8 @@ protected:
 
     virtual Core::GeneratedFiles generateFiles(const QWizard *w,
                                                QString *errorMessage) const;
+
+    virtual Core::FeatureSet requiredFeatures() const;
 };
 
 } // namespace Internal
diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp
index d30c6aeac6..d6be96c9d4 100644
--- a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp
@@ -52,6 +52,11 @@ EmptyProjectWizard::EmptyProjectWizard()
 {
 }
 
+Core::FeatureSet EmptyProjectWizard::requiredFeatures() const
+{
+    return Core::FeatureSet();
+}
+
 QWizard *EmptyProjectWizard::createWizardDialog(QWidget *parent,
                                               const QString &defaultPath,
                                               const WizardPageList &extensionPages) const
diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.h b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.h
index 37f04d47bb..0adc2c253e 100644
--- a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.h
@@ -44,6 +44,7 @@ class EmptyProjectWizard : public QtWizard
 
 public:
     EmptyProjectWizard();
+    virtual Core::FeatureSet requiredFeatures() const;
 
 protected:
     virtual QWizard *createWizardDialog(QWidget *parent,
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
index f05fb63696..0e89c521b0 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
@@ -40,6 +40,7 @@
 #include <coreplugin/icore.h>
 #include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/invoker.h>
+#include <qtsupport/qtsupportconstants.h>
 
 #include <utils/fileutils.h>
 
@@ -95,6 +96,11 @@ GuiAppWizard::GuiAppWizard()
 {
 }
 
+Core::FeatureSet GuiAppWizard::requiredFeatures() const
+{
+    return Core::Feature(QtSupport::Constants::FEATURE_QWIDGETS);
+}
+
 GuiAppWizard::GuiAppWizard(const QString &id,
                            const QString &category,
                            const QString &displayCategory,
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.h b/src/plugins/qt4projectmanager/wizards/guiappwizard.h
index 8cd7a27b03..893df770fd 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.h
@@ -46,6 +46,7 @@ class GuiAppWizard : public QtWizard
 
 public:
     GuiAppWizard();
+    virtual Core::FeatureSet requiredFeatures() const;
 
 protected:
     GuiAppWizard(const QString &id,
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
index 7e03147194..4c218c6929 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
@@ -39,6 +39,7 @@
 #include "qt4projectmanagerconstants.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
+#include <qtsupport/qtsupportconstants.h>
 #include <limits>
 
 #include <QtCore/QCoreApplication>
@@ -93,6 +94,11 @@ Html5AppWizard::~Html5AppWizard()
     delete d;
 }
 
+Core::FeatureSet Html5AppWizard::requiredFeatures() const
+{
+    return Core::Feature(QtSupport::Constants::FEATURE_GENERIC_CPP_ENTRY_POINT);
+}
+
 Core::BaseFileWizardParameters Html5AppWizard::parameters()
 {
     Core::BaseFileWizardParameters parameters(ProjectWizard);
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.h b/src/plugins/qt4projectmanager/wizards/html5appwizard.h
index 39168644c2..577b2c14fb 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.h
@@ -45,6 +45,7 @@ class Html5AppWizard : public AbstractMobileAppWizard
 public:
     Html5AppWizard();
     virtual ~Html5AppWizard();
+    virtual Core::FeatureSet requiredFeatures() const;
 
 protected:
     QString fileToOpenPostGeneration() const;
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
index 95dcf4dfa9..6852f6677c 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
@@ -143,5 +143,10 @@ Core::GeneratedFiles LibraryWizard::generateFiles(const QWizard *w,
     return rc;
 }
 
+Core::FeatureSet LibraryWizard::requiredFeatures() const
+{
+    return Core::FeatureSet();
+}
+
 } // namespace Internal
 } // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.h b/src/plugins/qt4projectmanager/wizards/librarywizard.h
index 1c180befcd..a1183f092d 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizard.h
+++ b/src/plugins/qt4projectmanager/wizards/librarywizard.h
@@ -56,6 +56,7 @@ protected:
 
     virtual Core::GeneratedFiles generateFiles(const QWizard *w,
                                                QString *errorMessage) const;
+    virtual Core::FeatureSet requiredFeatures() const;
 };
 
 } // namespace Internal
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
index 97d2aad148..5702cfc4fd 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
@@ -40,6 +40,8 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/task.h>
 
+#include <qtsupport/qtsupportconstants.h>
+
 #include <QtCore/QCoreApplication>
 #include <QtGui/QIcon>
 
@@ -89,6 +91,12 @@ MobileAppWizard::~MobileAppWizard()
     delete d;
 }
 
+Core::FeatureSet MobileAppWizard::requiredFeatures() const
+{
+    return Core::Feature(QtSupport::Constants::FEATURE_GENERIC_CPP_ENTRY_POINT)
+            | Core::Feature(QtSupport::Constants::FEATURE_QWIDGETS);
+}
+
 Core::BaseFileWizardParameters MobileAppWizard::parameters()
 {
     Core::BaseFileWizardParameters parameters(ProjectWizard);
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizard.h b/src/plugins/qt4projectmanager/wizards/mobileappwizard.h
index bbe56ddb83..cbe4e7aecd 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizard.h
@@ -45,6 +45,7 @@ class MobileAppWizard : public AbstractMobileAppWizard
 public:
     MobileAppWizard();
     virtual ~MobileAppWizard();
+    virtual Core::FeatureSet requiredFeatures() const;
 
 protected:
     QString fileToOpenPostGeneration() const;
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);
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.h b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.h
index e35ae7b4f9..60e7c595a9 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.h
@@ -45,6 +45,7 @@ class QtQuickAppWizard : public AbstractMobileAppWizard
 public:
     QtQuickAppWizard();
     virtual ~QtQuickAppWizard();
+    virtual Core::FeatureSet requiredFeatures() const;
 
 protected:
     QString fileToOpenPostGeneration() const;
diff --git a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp
index bdd887c792..c9da43c717 100644
--- a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp
@@ -93,5 +93,10 @@ bool SubdirsProjectWizard::postGenerateFiles(const QWizard *w, const Core::Gener
     return true;
 }
 
+Core::FeatureSet SubdirsProjectWizard::requiredFeatures() const
+{
+    return Core::FeatureSet();
+}
+
 } // namespace Internal
 } // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.h b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.h
index ec8667ac8b..42695f2905 100644
--- a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.h
@@ -53,6 +53,7 @@ protected:
     virtual Core::GeneratedFiles generateFiles(const QWizard *w,
                                                QString *errorMessage) const;
     virtual bool postGenerateFiles(const QWizard *, const Core::GeneratedFiles &l, QString *errorMessage);
+    virtual Core::FeatureSet requiredFeatures() const;
 };
 
 } // namespace Internal
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
index 27a4c227f7..ba96396dfe 100644
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
@@ -103,9 +103,14 @@ void TargetSetupPage::setPreferredFeatures(const QSet<QString> &featureIds)
     m_preferredFeatures = featureIds;
 }
 
-void TargetSetupPage::setRequiredFeatures(const QSet<QString> &featureIds)
+void TargetSetupPage::setRequiredTargetFeatures(const QSet<QString> &featureIds)
 {
-    m_requiredFeatures = featureIds;
+    m_requiredTargetFeatures = featureIds;
+}
+
+void TargetSetupPage::setRequiredQtFeatures(const Core::FeatureSet &features)
+{
+    m_requiredQtFeatures = features;
 }
 
 void TargetSetupPage::setMinimumQtVersion(const QtSupport::QtVersionNumber &number)
@@ -130,10 +135,12 @@ void TargetSetupPage::setupWidgets()
     foreach (Qt4BaseTargetFactory *factory, factories) {
         QStringList ids = factory->supportedTargetIds(0);
         foreach (const QString &id, ids) {
-            if (!factory->targetFeatures(id).contains(m_requiredFeatures))
+            if (!factory->targetFeatures(id).contains(m_requiredTargetFeatures))
                 continue;
 
             QList<BuildConfigurationInfo> infos = BuildConfigurationInfo::filterBuildConfigurationInfos(m_importInfos, id);
+            infos = BuildConfigurationInfo::filterBuildConfigurationInfos(infos, m_requiredQtFeatures);
+
             Qt4TargetSetupWidget *widget =
                     factory->createTargetSetupWidget(id, m_proFilePath,
                                                      m_minimumQtVersionNumber, m_maximumQtVersionNumber,
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.h b/src/plugins/qt4projectmanager/wizards/targetsetuppage.h
index 357e29249d..1ab03441bb 100644
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.h
+++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.h
@@ -36,6 +36,7 @@
 #include "../qt4target.h"
 #include "../qt4projectmanager_global.h"
 #include <qtsupport/qtversionmanager.h>
+#include <coreplugin/featureprovider.h>
 
 #include <QtCore/QString>
 #include <QtGui/QWizard>
@@ -77,7 +78,10 @@ public:
     void setPreferredFeatures(const QSet<QString> &featureIds);
     /// Sets the features a target must support
     /// call this before \sa initializePage()
-    void setRequiredFeatures(const QSet<QString> &featureIds);
+    void setRequiredTargetFeatures(const QSet<QString> &featureIds);
+    /// Sets the features a qt version must support
+    /// call this before \sa initializePage()
+    void setRequiredQtFeatures(const Core::FeatureSet &features);
     /// Sets the minimum qt version
     /// calls this before \sa initializePage()
     void setMinimumQtVersion(const QtSupport::QtVersionNumber &number);
@@ -102,7 +106,8 @@ private:
     void deleteWidgets();
 
     QSet<QString> m_preferredFeatures;
-    QSet<QString> m_requiredFeatures;
+    QSet<QString> m_requiredTargetFeatures;
+    Core::FeatureSet m_requiredQtFeatures;
     bool m_importSearch;
     QtSupport::QtVersionNumber m_minimumQtVersionNumber;
     QtSupport::QtVersionNumber m_maximumQtVersionNumber;
diff --git a/src/plugins/qt4projectmanager/wizards/testwizard.cpp b/src/plugins/qt4projectmanager/wizards/testwizard.cpp
index 0f63048772..7c0383f18e 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/testwizard.cpp
@@ -35,6 +35,7 @@
 
 #include <cpptools/abstracteditorsupport.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <qtsupport/qtsupportconstants.h>
 
 #include <utils/qtcassert.h>
 
@@ -186,5 +187,11 @@ Core::GeneratedFiles TestWizard::generateFiles(const QWizard *w, QString *errorM
     return Core::GeneratedFiles() <<  source << profile;
 }
 
+Core::FeatureSet TestWizard::requiredFeatures() const
+{
+    return Core::Feature(QtSupport::Constants::FEATURE_GENERIC_CPP_ENTRY_POINT) |
+            Core::Feature(QtSupport::Constants::FEATURE_QT);
+}
+
 } // namespace Internal
 } // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/testwizard.h b/src/plugins/qt4projectmanager/wizards/testwizard.h
index 46a6d9c28e..f48aa43f28 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/testwizard.h
@@ -44,6 +44,7 @@ class TestWizard : public QtWizard
 
 public:
     TestWizard();
+    virtual Core::FeatureSet requiredFeatures() const;
 
 protected:
     virtual QWizard *createWizardDialog(QWidget *parent,