From f06a5f12dfcedcafcb18aea42152042f3cc078eb Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Thu, 9 Feb 2012 19:23:31 +0100
Subject: [PATCH] Features: We have no component support on the desktop
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>
---
.../qt4projectmanager/qt-desktop/desktopqtversion.cpp | 3 ---
.../qt-desktop/simulatorqtversion.cpp | 10 ++++++++++
.../qt4projectmanager/qt-desktop/simulatorqtversion.h | 1 +
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
index 5e34cf3b444..b1d4a90708c 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 b76530449f4..141a9101456 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 87cba50d570..06c9d3a1664 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;
};
--
GitLab