Wizards: removing feature GENERIC_CPP_ENTRY_POINT

We want finer grained features

Change-Id: Id65d58409a6960aa9d132cb29592b921ee6bcfdf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

13 files changed, 12 insertions, 18 deletions

diff --git a/share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml b/share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml
index e84b03d3e0..bd33e5a7ae 100644
--- a/share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml
+++ b/share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml
@@ -37,7 +37,7 @@ the project file goes last.
 The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and
 leave room for the Qt 4 target page.
 -->
-<wizard version="1" kind="project" firstpage="10" id="S.Plain C (CMake)" category="I.Projects" featuresRequired="QtSupport.Wizards.FeatureGenericCppEntryPoint" platformIndependent="true">
+<wizard version="1" kind="project" firstpage="10" id="S.Plain C (CMake)" category="I.Projects" platformIndependent="true">
     <icon>console.png</icon>
     <description>Creates a plain C project using CMake, not using the Qt library.</description>
     <displayname>Plain C Project (CMake Build)</displayname>;
diff --git a/share/qtcreator/templates/wizards/plaincapp/wizard.xml b/share/qtcreator/templates/wizards/plaincapp/wizard.xml
index 3dc4fe94b7..685742b418 100644
--- a/share/qtcreator/templates/wizards/plaincapp/wizard.xml
+++ b/share/qtcreator/templates/wizards/plaincapp/wizard.xml
@@ -40,7 +40,7 @@ leave room for the Qt 4 target page.
 <wizard version="1" kind="project"
         class="qt4project" firstpage="10"
         id="R.Plain C" category="H.QtProjects"
-        featuresRequired="QtSupport.Wizards.FeatureGenericCppEntryPoint">
+        featuresRequired="QtSupport.Wizards.FeatureQt">
     <icon>console.png</icon>
     <description>Creates a plain C project using qmake, not using the Qt library.</description>
     <displayname>Plain C Project</displayname>;
diff --git a/share/qtcreator/templates/wizards/plaincppapp-cmake/wizard.xml b/share/qtcreator/templates/wizards/plaincppapp-cmake/wizard.xml
index b5c96e09a6..9995c58281 100644
--- a/share/qtcreator/templates/wizards/plaincppapp-cmake/wizard.xml
+++ b/share/qtcreator/templates/wizards/plaincppapp-cmake/wizard.xml
@@ -37,7 +37,7 @@ the project file goes last.
 The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and
 leave room for the Qt 4 target page.
 -->
-<wizard version="1" kind="project" firstpage="10" id="S.Plain C++ (CMake)" category="I.Projects" featuresRequired="QtSupport.Wizards.FeatureGenericCppEntryPoint" platformIndependent="true">
+<wizard version="1" kind="project" firstpage="10" id="S.Plain C++ (CMake)" category="I.Projects" platformIndependent="true">
     <icon>console.png</icon>
     <description>Creates a plain C++ project using CMake, not using the Qt library.</description>
     <displayname>Plain C++ Project (CMake Build)</displayname>;
diff --git a/share/qtcreator/templates/wizards/plaincppapp/wizard.xml b/share/qtcreator/templates/wizards/plaincppapp/wizard.xml
index 89a1b6d09a..dbb5f92971 100644
--- a/share/qtcreator/templates/wizards/plaincppapp/wizard.xml
+++ b/share/qtcreator/templates/wizards/plaincppapp/wizard.xml
@@ -40,7 +40,7 @@ leave room for the Qt 4 target page.
 <wizard version="1" kind="project"
         class="qt4project" firstpage="10"
         id="R.Plain C++" category="H.QtProjects"
-        featuresRequired="QtSupport.Wizards.FeatureGenericCppEntryPoint">
+        featuresRequired="QtSupport.Wizards.FeatureQt">
     <icon>console.png</icon>
     <description>Creates a plain C++ project using qmake, not using the Qt library.</description>
     <displayname>Plain C++ Project</displayname>;
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml
index 880a302440..c2175cb2c3 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml
@@ -40,7 +40,7 @@ leave room for the Qt 4 target page.
 <wizard version="1" kind="project"
         class="qt4project" firstpage="10"
         id="R.QtCreatorPlugin" category="G.Libraries"
-        featuresRequired="QtSupport.Wizards.FeatureGenericCppEntryPoint,QtSupport.Wizards.FeatureQt,QtSupport.Wizards.FeatureDesktop">
+        featuresRequired="QtSupport.Wizards.FeatureQt,QtSupport.Wizards.FeatureDesktop">
     <icon>qtcreator_logo_24.png</icon>
     <description>Creates a custom Qt Creator plugin.</description>
     <displayname>Qt Creator Plugin</displayname>;
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
index e9f304d482..58bb0e1880 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
@@ -109,7 +109,7 @@ Core::GeneratedFiles
 
 Core::FeatureSet ConsoleAppWizard::requiredFeatures() const
 {
-    return Core::Feature(QtSupport::Constants::FEATURE_GENERIC_CPP_ENTRY_POINT);
+    return Core::Feature(QtSupport::Constants::FEATURE_QT_CONSOLE);
 }
 
 } // namespace Internal
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
index e96e2ad28f..096ac39367 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
@@ -98,7 +98,7 @@ Html5AppWizard::~Html5AppWizard()
 
 Core::FeatureSet Html5AppWizard::requiredFeatures() const
 {
-    return Core::Feature(QtSupport::Constants::FEATURE_GENERIC_CPP_ENTRY_POINT);
+    return Core::Feature(QtSupport::Constants::FEATURE_QT_WEBKIT);
 }
 
 Core::BaseFileWizardParameters Html5AppWizard::parameters()
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
index e57aba7df5..f70fdaa812 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
@@ -95,8 +95,7 @@ MobileAppWizard::~MobileAppWizard()
 
 Core::FeatureSet MobileAppWizard::requiredFeatures() const
 {
-    return Core::Feature(QtSupport::Constants::FEATURE_GENERIC_CPP_ENTRY_POINT)
-            | Core::FeatureSet(QtSupport::Constants::FEATURE_MOBILE)
+    return Core::FeatureSet(QtSupport::Constants::FEATURE_MOBILE)
             | Core::Feature(QtSupport::Constants::FEATURE_QWIDGETS);
 }
 
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index 0ca40b7a8b..def78d1112 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -126,9 +126,7 @@ QtQuickAppWizard::~QtQuickAppWizard()
 
 Core::FeatureSet QtQuickAppWizard::requiredFeatures() const
 {
-    return Core::Feature(QtSupport::Constants::FEATURE_GENERIC_CPP_ENTRY_POINT) |
-            Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK);
-
+    return Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK);
 }
 
 Core::BaseFileWizardParameters QtQuickAppWizard::parameters()
diff --git a/src/plugins/qt4projectmanager/wizards/testwizard.cpp b/src/plugins/qt4projectmanager/wizards/testwizard.cpp
index a2ca0a1b55..93c45f7bf6 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/testwizard.cpp
@@ -188,7 +188,7 @@ Core::GeneratedFiles TestWizard::generateFiles(const QWizard *w, QString *errorM
 
 Core::FeatureSet TestWizard::requiredFeatures() const
 {
-    return Core::Feature(QtSupport::Constants::FEATURE_GENERIC_CPP_ENTRY_POINT) |
+    return Core::Feature(QtSupport::Constants::FEATURE_QT_CONSOLE) |
             Core::Feature(QtSupport::Constants::FEATURE_QT);
 }
 
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 3285e1789d..fb2f013489 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -255,8 +255,7 @@ QString BaseQtVersion::defaultDisplayName(const QString &versionString, const Ut
 
 Core::FeatureSet BaseQtVersion::availableFeatures() const
 {
-    Core::FeatureSet features = Core::FeatureSet(QtSupport::Constants::FEATURE_GENERIC_CPP_ENTRY_POINT) |
-            Core::FeatureSet(QtSupport::Constants::FEATURE_QWIDGETS)
+    Core::FeatureSet features = Core::FeatureSet(QtSupport::Constants::FEATURE_QWIDGETS)
             | Core::FeatureSet(QtSupport::Constants::FEATURE_QT)
             | Core::FeatureSet(QtSupport::Constants::FEATURE_QT_WEBKIT)
             | Core::FeatureSet(QtSupport::Constants::FEATURE_QT_CONSOLE);
diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h
index 6808a8814d..a89a453e2d 100644
--- a/src/plugins/qtsupport/qtsupportconstants.h
+++ b/src/plugins/qtsupport/qtsupportconstants.h
@@ -56,7 +56,6 @@ const char FEATURE_QT_QUICK_1_1[] = "QtSupport.Wizards.FeatureQtQuick.1.1";
 const char FEATURE_QT_QUICK_2[] = "QtSupport.Wizards.FeatureQtQuick.2";
 const char FEATURE_QT_WEBKIT[] = "QtSupport.Wizards.FeatureQtWebkit";
 const char FEATURE_QT_CONSOLE[] = "QtSupport.Wizards.FeatureQtConsole";
-const char FEATURE_GENERIC_CPP_ENTRY_POINT[] ="QtSupport.Wizards.FeatureGenericCppEntryPoint";
 const char FEATURE_QTQUICK_COMPONENTS_SYMBIAN[] = "QtSupport.Wizards.FeatureQtQuickComponentsSymbian";
 const char FEATURE_QTQUICK_COMPONENTS_MEEGO[] = "QtSupport.Wizards.FeatureQtQuickComponentsMeego";
 const char FEATURE_MOBILE[] = "QtSupport.Wizards.FeatureMobile";
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index 9bb49a9627..dd1c75d531 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -569,8 +569,7 @@ Core::FeatureSet QtVersionManager::availableFeatures(const QString &platformName
         if (qtVersion->isValid() && ((qtVersion->platformName() == platformName) || platformName.isEmpty()))
             features |= qtVersion->availableFeatures();
     }
-    if (validVersions().empty())
-        features |= Constants::FEATURE_GENERIC_CPP_ENTRY_POINT;
+
     return features;
 }