diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp index 5e34cf3b444b0e8e5dd2cb7cd947cac8a2f29056..b1d4a90708cdfcbaf4ded29b264e2c54415a6124 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp @@ -103,9 +103,6 @@ QString DesktopQtVersion::description() const Core::FeatureSet DesktopQtVersion::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); features |= Core::FeatureSet(QtSupport::Constants::FEATURE_DESKTOP); return features; } diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp index b76530449f4bf8b198220e45eade4b283be8c4c3..141a910145698934830f55a1739f864f6534307f 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp @@ -100,6 +100,16 @@ QString SimulatorQtVersion::description() const 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 { return (platformName == QtSupport::Constants::SYMBIAN_PLATFORM diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h index 87cba50d570bf82ed502822f14d27cff5753ea4a..06c9d3a166417237e8998b38a09a2570f85e176c 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h +++ b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h @@ -58,6 +58,7 @@ public: QString description() const; + Core::FeatureSet availableFeatures() const; bool supportsPlatform(const QString &platformName) const; };