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

Features: We have no component support on the desktop

Browse Source 
Symbian and Meego components are only supported on the devices and
for the simulator.

Change-Id: I21db10d32a80eac9ea04b678efd0e7dd65bccaff
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
This commit is contained in:
Alessandro Portale
2012-02-09 19:23:31 +01:00
parent e75a9010b0
commit f06a5f12df
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
View File

@@ -103,9 +103,6 @@ QString DesktopQtVersion::description() const
Core::FeatureSet DesktopQtVersion::availableFeatures() const Core::FeatureSet DesktopQtVersion::availableFeatures() const
{ {
Core::FeatureSet features = QtSupport::BaseQtVersion::availableFeatures(); Core::FeatureSet features = QtSupport::BaseQtVersion::availableFeatures();
if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 4)) //no reliable test for components, yet.
features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QTQUICK_COMPONENTS_MEEGO)
| Core::FeatureSet(QtSupport::Constants::FEATURE_QTQUICK_COMPONENTS_SYMBIAN);
features |= Core::FeatureSet(QtSupport::Constants::FEATURE_DESKTOP); features |= Core::FeatureSet(QtSupport::Constants::FEATURE_DESKTOP);
return features; return features;
} }

10
src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
View File

@@ -100,6 +100,16 @@ QString SimulatorQtVersion::description() const
return QCoreApplication::translate("QtVersion", "Qt Simulator", "Qt Version is meant for Qt Simulator"); return QCoreApplication::translate("QtVersion", "Qt Simulator", "Qt Version is meant for Qt Simulator");
} }
Core::FeatureSet SimulatorQtVersion::availableFeatures() const
{
Core::FeatureSet features = QtSupport::BaseQtVersion::availableFeatures();
if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 4)) //no reliable test for components, yet.
features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QTQUICK_COMPONENTS_MEEGO)
| Core::FeatureSet(QtSupport::Constants::FEATURE_QTQUICK_COMPONENTS_SYMBIAN);
return features;
}
bool SimulatorQtVersion::supportsPlatform(const QString &platformName) const bool SimulatorQtVersion::supportsPlatform(const QString &platformName) const
{ {
return (platformName == QtSupport::Constants::SYMBIAN_PLATFORM return (platformName == QtSupport::Constants::SYMBIAN_PLATFORM

1
src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h
View File

@@ -58,6 +58,7 @@ public:
QString description() const; QString description() const;
Core::FeatureSet availableFeatures() const;
bool supportsPlatform(const QString &platformName) const; bool supportsPlatform(const QString &platformName) const;
}; };