From 9cb5176c0b70d367b975d8aeea70b5cae43b4df5 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Wed, 8 Feb 2012 16:04:39 +0100
Subject: [PATCH] Features: adding features for Qt Quick versions (1 1.1 and 2)
This allows wizards to distinguish between different Qt Quick versions.
Change-Id: Ieead5ba771da896a6a3ce0d60b563827878902a5
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
---
src/plugins/qtsupport/baseqtversion.cpp | 10 +++++++++-
src/plugins/qtsupport/qtsupportconstants.h | 3 +++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index de449dc8df4..5c894f14a98 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -261,8 +261,16 @@ Core::FeatureSet BaseQtVersion::availableFeatures() const
| Core::FeatureSet(QtSupport::Constants::FEATURE_QT_WEBKIT)
| Core::FeatureSet(QtSupport::Constants::FEATURE_QT_CONSOLE);
- if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 0))
+ if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 0)) {
features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK);
+ features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_1);
+ }
+ if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 1)) {
+ features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_1_1);
+ }
+ if (qtVersion() >= QtSupport::QtVersionNumber(5, 0, 0)) {
+ features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_2);
+ }
return features;
}
diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h
index bc2debe058e..0db8ce8e461 100644
--- a/src/plugins/qtsupport/qtsupportconstants.h
+++ b/src/plugins/qtsupport/qtsupportconstants.h
@@ -51,6 +51,9 @@ const char WINCEQT[] = "Qt4ProjectManager.QtVersion.WinCE";
const char FEATURE_QT[] = "QtSupport.Wizards.FeatureQt";
const char FEATURE_QWIDGETS[] = "QtSupport.Wizards.FeatureQWidgets";
const char FEATURE_QT_QUICK[] = "QtSupport.Wizards.FeatureQtQuick";
+const char FEATURE_QT_QUICK_1[] = "QtSupport.Wizards.FeatureQtQuick.1";
+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";
--
GitLab