diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2018-09-13 13:48:36 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2018-09-13 13:38:09 +0000 |
| commit | 70fdbedbd8a8a4e00ef4e9ad282063115921a752 (patch) | |
| tree | c2f4b5bd786dc7062e9d2a0b138fd0809c6c3dd1 | |
| parent | 4b852b4e04574e9d6780ff041163af2427c2a350 (diff) | |
| download | qt-creator-70fdbedbd8a8a4e00ef4e9ad282063115921a752.tar.gz | |
Qml tooling: Support Qt 5.12
QtQuick 2.12
QtQuick.Controls 2.5
QtQuick.Window 2.12
QtQuick.VirtualKeyboard 2.4
Change-Id: Ie4a60ac93b25ca735e28ac84447cfe60778f8d7d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
7 files changed, 57 insertions, 6 deletions
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json index c2542d5c0a..90c1133ebc 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json @@ -80,10 +80,19 @@ "type": "ComboBox", "data": { - "index": 2, + "index": 3, "items": [ { + "trKey": "Qt 5.12", + "value": + "{ + 'QtQuickVersion': '2.12', + 'QtQuickWindowVersion': '2.12', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' + }" + }, + { "trKey": "Qt 5.11", "value": "{ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json index ed6f876923..ab8115d3fc 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json @@ -83,10 +83,19 @@ "visible": false, "data": { - "index": 2, + "index": 3, "items": [ { + "trKey": "Qt 5.12", + "value": + "{ + 'QtQuickVersion': '2.12', + 'QtQuickControlsVersion': '2.5', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' + }" + }, + { "trKey": "Qt 5.11", "value": "{ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json index dec5441fa9..aad751bc51 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json @@ -82,10 +82,19 @@ "type": "ComboBox", "data": { - "index": 2, + "index": 3, "items": [ { + "trKey": "Qt 5.12", + "value": + "{ + 'QtQuickVersion': '2.12', + 'QtQuickControlsVersion': '2.5', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' + }" + }, + { "trKey": "Qt 5.11", "value": "{ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json index 1867cf3757..4df5b3cf4d 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json @@ -82,10 +82,19 @@ "type": "ComboBox", "data": { - "index": 2, + "index": 3, "items": [ { + "trKey": "Qt 5.12", + "value": + "{ + 'QtQuickVersion': '2.12', + 'QtQuickControlsVersion': '2.5', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' + }" + }, + { "trKey": "Qt 5.11", "value": "{ diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json index 9b748cf3d7..41ac39342b 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json @@ -40,10 +40,19 @@ "type": "ComboBox", "data": { - "index": 2, + "index": 3, "items": [ { + "trKey": "Qt 5.12", + "value": + "{ + 'QtQuickVersion': '2.12', + 'QtQuickWindowVersion': '2.12', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' + }" + }, + { "trKey": "Qt 5.11", "value": "{ diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index df9fbb0b94..c168eed504 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -76,7 +76,7 @@ bool isSupportedAttachedProperties(const QString &propertyName) 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.11" + "2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9", "2.10", "2.11", "2.12" }; return list; } diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 398ba3bf13..ecd59ffbe1 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -332,6 +332,12 @@ QSet<Id> BaseQtVersion::availableFeatures() const if (qtVersion().matches(5, 11)) return features; + features.unite(versionedIds(Constants::FEATURE_QT_QUICK_PREFIX, 2, 12)); + features.unite(versionedIds(Constants::FEATURE_QT_QUICK_CONTROLS_2_PREFIX, 2, 5)); + + if (qtVersion().matches(5, 12)) + return features; + return features; } |