feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Wizards: removing feature GENERIC_CPP_ENTRY_POINT

Browse Source 
We want finer grained features

Change-Id: Id65d58409a6960aa9d132cb29592b921ee6bcfdf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
This commit is contained in:
Thomas Hartmann
2012-02-14 13:50:38 +01:00
parent f916d38dce
commit cc76f6eadd
13 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml
View File

@@ -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>;

2
share/qtcreator/templates/wizards/plaincapp/wizard.xml
View File

@@ -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>;

2
share/qtcreator/templates/wizards/plaincppapp-cmake/wizard.xml
View File

@@ -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>;

2
share/qtcreator/templates/wizards/plaincppapp/wizard.xml
View File

@@ -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>;

2
share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml
View File

@@ -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>;

2
src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
View File

@@ -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

2
src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
View File

@@ -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()

3
src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
View File

@@ -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);
}

4
src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
View File

@@ -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()

2
src/plugins/qt4projectmanager/wizards/testwizard.cpp
View File

@@ -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);
}

3
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -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);

1
src/plugins/qtsupport/qtsupportconstants.h
View File

@@ -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";

3
src/plugins/qtsupport/qtversionmanager.cpp
View File

@@ -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;
}