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

Qml tooling: Support Qt 5.11

Browse Source 
QtQuick 2.11
QtQuick.Controls 2.4
QtQuick.Window 2.11

Change-Id: I78df0cf414e6c2ce72830b88d29a8777ac30c757
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Alessandro Portale
2018-04-11 18:53:09 +02:00
parent 63a4654a8e
commit b3d291d230
8 changed files with 67 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json
View File

@@ -80,9 +80,18 @@
"type": "ComboBox",
"data":
{
"index": 1,
"index": 2,
"items":
[
{
"trKey": "Qt 5.11",
"value":
"{
'QtQuickVersion': '2.11',
'QtQuickWindowVersion': '2.11',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
}"
},
{
"trKey": "Qt 5.10",
"value":

11
share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
View File

@@ -80,9 +80,18 @@
"type": "ComboBox",
"data":
{
"index": 1,
"index": 2,
"items":
[
{
"trKey": "Qt 5.11",
"value":
"{
'QtQuickVersion': '2.11',
'QtQuickWindowVersion': '2.11',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
}"
},
{
"trKey": "Qt 5.10",
"value":

11
share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
View File

@@ -83,9 +83,18 @@
"visible": false,
"data":
{
"index": 1,
"index": 2,
"items":
[
{
"trKey": "Qt 5.11",
"value":
"{
'QtQuickVersion': '2.11',
'QtQuickControlsVersion': '2.4',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
}"
},
{
"trKey": "Qt 5.10",
"value":

11
share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
View File

@@ -82,9 +82,18 @@
"type": "ComboBox",
"data":
{
"index": 1,
"index": 2,
"items":
[
{
"trKey": "Qt 5.11",
"value":
"{
'QtQuickVersion': '2.11',
'QtQuickControlsVersion': '2.4',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
}"
},
{
"trKey": "Qt 5.10",
"value":

11
share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
View File

@@ -82,9 +82,18 @@
"type": "ComboBox",
"data":
{
"index": 1,
"index": 2,
"items":
[
{
"trKey": "Qt 5.11",
"value":
"{
'QtQuickVersion': '2.11',
'QtQuickControlsVersion': '2.4',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
}"
},
{
"trKey": "Qt 5.10",
"value":

11
share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
View File

@@ -40,9 +40,18 @@
"type": "ComboBox",
"data":
{
"index": 1,
"index": 2,
"items":
[
{
"trKey": "Qt 5.11",
"value":
"{
'QtQuickVersion': '2.11',
'QtQuickWindowVersion': '2.11',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
}"
},
{
"trKey": "Qt 5.10",
"value":

2
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -74,7 +74,7 @@ static inline bool isSupportedAttachedProperties(const QString &propertyName)
static inline QStringList supportedVersionsList()
{
static const QStringList list = {
"2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9", "2.10"
"2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9", "2.10", "2.11"
};
return list;
}

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

@@ -413,6 +413,12 @@ QSet<Id> BaseQtVersion::availableFeatures() const
if (qtVersion().matches(5, 10))
return features;
features.unite(versionedIds(Constants::FEATURE_QT_QUICK_PREFIX, 2, 11));
features.unite(versionedIds(Constants::FEATURE_QT_QUICK_CONTROLS_2_PREFIX, 2, 4));
if (qtVersion().matches(5, 11))
return features;
return features;
}