From 20b118782c332871a5f5ebf8d32d04aa110d5c56 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 10 Oct 2014 11:21:47 +0200 Subject: [PATCH] Adding new QtQuick features for Qt 5.4 Change-Id: I2b23d08c9d9602b1001c96901a57cf8abfb2e9dd Reviewed-by: Alessandro Portale --- src/plugins/qtsupport/baseqtversion.cpp | 7 +++++++ src/plugins/qtsupport/qtsupportconstants.h | 3 +++ 2 files changed, 10 insertions(+) diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index d8f9920a391..fb591e0db61 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -314,6 +314,13 @@ FeatureSet BaseQtVersion::availableFeatures() const features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_3); features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS_1_2); + if (qtVersion() < QtVersionNumber(5, 4, 0)) + return features; + + features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_4); + features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS_1_3); + features |= FeatureSet(Constants::FEATURE_QT_QUICK_UI_FILES); + return features; } diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h index ca3e9912958..cf52ed998ec 100644 --- a/src/plugins/qtsupport/qtsupportconstants.h +++ b/src/plugins/qtsupport/qtsupportconstants.h @@ -63,11 +63,14 @@ const char FEATURE_QT_QUICK_2_0[] = "QtSupport.Wizards.FeatureQtQuick.2.0"; const char FEATURE_QT_QUICK_2_1[] = "QtSupport.Wizards.FeatureQtQuick.2.1"; const char FEATURE_QT_QUICK_2_2[] = "QtSupport.Wizards.FeatureQtQuick.2.2"; const char FEATURE_QT_QUICK_2_3[] = "QtSupport.Wizards.FeatureQtQuick.2.3"; +const char FEATURE_QT_QUICK_2_4[] = "QtSupport.Wizards.FeatureQtQuick.2.4"; const char FEATURE_QT_QUICK_CONTROLS[] = "QtSupport.Wizards.FeatureQtQuick.Controls"; const char FEATURE_QT_QUICK_CONTROLS_1[] = "QtSupport.Wizards.FeatureQtQuick.Controls.1"; const char FEATURE_QT_QUICK_CONTROLS_1_0[] = "QtSupport.Wizards.FeatureQtQuick.Controls.1.0"; const char FEATURE_QT_QUICK_CONTROLS_1_1[] = "QtSupport.Wizards.FeatureQtQuick.Controls.1.1"; const char FEATURE_QT_QUICK_CONTROLS_1_2[] = "QtSupport.Wizards.FeatureQtQuick.Controls.1.2"; +const char FEATURE_QT_QUICK_CONTROLS_1_3[] = "QtSupport.Wizards.FeatureQtQuick.Controls.1.3"; +const char FEATURE_QT_QUICK_UI_FILES[] = "QtSupport.Wizards.FeatureQtQuick.UiFiles"; const char FEATURE_QT_WEBKIT[] = "QtSupport.Wizards.FeatureQtWebkit"; const char FEATURE_QT_CONSOLE[] = "QtSupport.Wizards.FeatureQtConsole"; const char FEATURE_MOBILE[] = "QtSupport.Wizards.FeatureMobile";