From 165228d9be7ae7e49e1a8dd9a616fdf6d7cfc102 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 6 May 2016 13:55:33 +0200 Subject: [PATCH] QtSupport: Update feature set for Qt 5.7 Qt.labs.controls are replaced by QtQuick.Controls.2 QtQuick is bumped to 2.7 Change-Id: I317cc504171258b503455184fa6cc96c08deda5a Reviewed-by: J-P Nurmi Reviewed-by: Tobias Hunger --- src/plugins/qtsupport/baseqtversion.cpp | 7 +++++++ src/plugins/qtsupport/qtsupportconstants.h | 1 + 2 files changed, 8 insertions(+) diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index d2529d527c3..09a3531855d 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -457,6 +457,13 @@ QSet BaseQtVersion::availableFeatures() const if (qtVersion().matches(5, 6)) return features; + features.unite(versionedIds(Constants::FEATURE_QT_QUICK_PREFIX, 2, 7)); + features.unite(versionedIds(Constants::FEATURE_QT_QUICK_CONTROLS_2_PREFIX, 2, 0)); + features.subtract(versionedIds(Constants::FEATURE_QT_LABS_CONTROLS_PREFIX, 1, 0)); + + if (qtVersion().matches(5, 7)) + return features; + return features; } diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h index 421421a2640..2f48b259e14 100644 --- a/src/plugins/qtsupport/qtsupportconstants.h +++ b/src/plugins/qtsupport/qtsupportconstants.h @@ -50,6 +50,7 @@ const char FEATURE_QWIDGETS[] = "QtSupport.Wizards.FeatureQWidgets"; const char FEATURE_QT_QUICK_PREFIX[] = "QtSupport.Wizards.FeatureQtQuick"; const char FEATURE_QMLPROJECT[] = "QtSupport.Wizards.FeatureQtQuickProject"; const char FEATURE_QT_QUICK_CONTROLS_PREFIX[] = "QtSupport.Wizards.FeatureQtQuick.Controls"; +const char FEATURE_QT_QUICK_CONTROLS_2_PREFIX[] = "QtSupport.Wizards.FeatureQtQuick.Controls.2"; const char FEATURE_QT_LABS_CONTROLS_PREFIX[] = "QtSupport.Wizards.FeatureQt.labs.controls"; const char FEATURE_QT_QUICK_UI_FILES[] = "QtSupport.Wizards.FeatureQtQuick.UiFiles"; const char FEATURE_QT_WEBKIT[] = "QtSupport.Wizards.FeatureQtWebkit";