feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtSupport: Update feature set for Qt 5.7

Browse Source 
Qt.labs.controls are replaced by QtQuick.Controls.2
QtQuick is bumped to 2.7

Change-Id: I317cc504171258b503455184fa6cc96c08deda5a
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Alessandro Portale
2016-05-06 13:55:33 +02:00
parent d342623bb7
commit 165228d9be
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -457,6 +457,13 @@ QSet<Id> BaseQtVersion::availableFeatures() const
if (qtVersion().matches(5, 6)) if (qtVersion().matches(5, 6))
return features; 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; return features;
} }

1
src/plugins/qtsupport/qtsupportconstants.h
View File

@@ -50,6 +50,7 @@ const char FEATURE_QWIDGETS[] = "QtSupport.Wizards.FeatureQWidgets";
const char FEATURE_QT_QUICK_PREFIX[] = "QtSupport.Wizards.FeatureQtQuick"; const char FEATURE_QT_QUICK_PREFIX[] = "QtSupport.Wizards.FeatureQtQuick";
const char FEATURE_QMLPROJECT[] = "QtSupport.Wizards.FeatureQtQuickProject"; const char FEATURE_QMLPROJECT[] = "QtSupport.Wizards.FeatureQtQuickProject";
const char FEATURE_QT_QUICK_CONTROLS_PREFIX[] = "QtSupport.Wizards.FeatureQtQuick.Controls"; 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_LABS_CONTROLS_PREFIX[] = "QtSupport.Wizards.FeatureQt.labs.controls";
const char FEATURE_QT_QUICK_UI_FILES[] = "QtSupport.Wizards.FeatureQtQuick.UiFiles"; const char FEATURE_QT_QUICK_UI_FILES[] = "QtSupport.Wizards.FeatureQtQuick.UiFiles";
const char FEATURE_QT_WEBKIT[] = "QtSupport.Wizards.FeatureQtWebkit"; const char FEATURE_QT_WEBKIT[] = "QtSupport.Wizards.FeatureQtWebkit";