diff --git a/share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml b/share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml
index e84b03d3e06345a9c644d2e192fc14c4139db5ab..bd33e5a7aeede1e6f024e76e5de060a2c0dfe5f7 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 3dc4fe94b7284b85e001c874d8532e602a6b61df..685742b41859935a9080ec5059ec9c3dc8157a2c 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 b5c96e09a65d6a712a670a39291eecd1d8468e2a..9995c5828155aa73444195d8122cd16b5b041b93 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 89a1b6d09a047b511ec278fe8b961270de874533..dbb5f9297198728aa21dc641a63c5705e47055fb 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 880a302440b20497b74effb6af2deaea3f30a5a6..c2175cb2c3e02536d16360dfcfa5ad1ca1323a31 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 e9f304d482f05154b4f306c0175bd936213bb925..58bb0e1880e235f3f9f93127464af26c136a7147 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 e96e2ad28f3d8de2a70b7fdf934a79e93209ade6..096ac39367d70f63a0a1cbcff29cd6915b73bc79 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 e57aba7df54a65f73225828fd0ca1434d1286c20..f70fdaa81274ae5319ebe54b615be5dc9f135e13 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 0ca40b7a8b494f4b3ccdd5edbbe651267ea30857..def78d111270d0bd510dcbda2c6df2202b2b282e 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 a2ca0a1b5517123158eecacfc2b14bdf1e64387c..93c45f7bf6077665c0c1b779d790613a28bbf033 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 3285e1789dae890b6d040f0bbafd75582a76c2b9..fb2f013489a745db652212cc033870b8ed86f058 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 6808a8814da3781d82f881079cee6d1716ad4c29..a89a453e2d3aa280b70ec2ed0fa728a0b2e15071 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 9bb49a96272af336cdbe98b642aaa8cbc7d2dbca..dd1c75d5319a01ef875e1ee6dd031f930e1951e4 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;
 }