From 9bfb5e3eef75b877223e47b60b94207d8163c696 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 10 Apr 2013 14:58:03 +0200 Subject: [PATCH] QtSupport: Adding feature for QtQuick.Controls Change-Id: Ic5ef2d7d452046cd446204b88346533f41b1a562 Reviewed-by: Kai Koehne --- src/plugins/qtsupport/baseqtversion.cpp | 2 ++ src/plugins/qtsupport/qtsupportconstants.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 2d75c02964a..3c6e54794b8 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -278,6 +278,8 @@ Core::FeatureSet BaseQtVersion::availableFeatures() const 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); + if (qtVersion() >= QtSupport::QtVersionNumber(5, 1, 0)) + features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_CONTROLS); return features; } diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h index d4a62c3ea4c..c6f7bec4b6c 100644 --- a/src/plugins/qtsupport/qtsupportconstants.h +++ b/src/plugins/qtsupport/qtsupportconstants.h @@ -51,6 +51,7 @@ const char FEATURE_QMLPROJECT[] = "QtSupport.Wizards.FeatureQtQuickProject"; 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_QUICK_CONTROLS[] = "QtSupport.Wizards.FeatureQtQuick.Controls"; const char FEATURE_QT_WEBKIT[] = "QtSupport.Wizards.FeatureQtWebkit"; const char FEATURE_QT_CONSOLE[] = "QtSupport.Wizards.FeatureQtConsole"; const char FEATURE_QTQUICK_COMPONENTS_MEEGO[] = "QtSupport.Wizards.FeatureQtQuickComponentsMeego";