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

Qml tooling: Support Qt 5.15

Browse Source 
...and keep the default at 5.12

Change-Id: I15439c2d71a0610971dc39246e8b98e9653b8f04
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Thomas Hartmann
2020-02-13 13:04:50 +01:00
parent bc25c7b3fe
commit 34f417a2e4
7 changed files with 57 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,9 +83,18 @@
"persistenceKey": "QtQuick.minimumQtVersion", "persistenceKey": "QtQuick.minimumQtVersion",
"data": "data":
{ {
"index": 2, "index": 3,
"items": "items":
[ [
{
"trKey": "Qt 5.15",
"value":
{
"QtQuickVersion": "2.15",
"QtQuickWindowVersion": "2.15",
"QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15"
}
},
{ {
"trKey": "Qt 5.14", "trKey": "Qt 5.14",
"value": "value":

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

@@ -85,9 +85,18 @@
"persistenceKey": "QtQuick.minimumQtVersion", "persistenceKey": "QtQuick.minimumQtVersion",
"data": "data":
{ {
"index": 2, "index": 3,
"items": "items":
[ [
{
"trKey": "Qt 5.15",
"value":
{
"QtQuickVersion": "2.15",
"QtQuickControlsVersion": "2.15",
"QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15"
}
},
{ {
"trKey": "Qt 5.14", "trKey": "Qt 5.14",
"value": "value":

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

@@ -85,9 +85,18 @@
"persistenceKey": "QtQuick.minimumQtVersion", "persistenceKey": "QtQuick.minimumQtVersion",
"data": "data":
{ {
"index": 2, "index": 3,
"items": "items":
[ [
{
"trKey": "Qt 5.15",
"value":
{
"QtQuickVersion": "2.15",
"QtQuickControlsVersion": "2.15",
"QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15"
}
},
{ {
"trKey": "Qt 5.14", "trKey": "Qt 5.14",
"value": "value":

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

@@ -85,9 +85,18 @@
"persistenceKey": "QtQuick.minimumQtVersion", "persistenceKey": "QtQuick.minimumQtVersion",
"data": "data":
{ {
"index": 2, "index": 3,
"items": "items":
[ [
{
"trKey": "Qt 5.15",
"value":
{
"QtQuickVersion": "2.15",
"QtQuickControlsVersion": "2.15",
"QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15"
}
},
{ {
"trKey": "Qt 5.14", "trKey": "Qt 5.14",
"value": "value":

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

@@ -40,9 +40,18 @@
"type": "ComboBox", "type": "ComboBox",
"data": "data":
{ {
"index": 2, "index": 3,
"items": "items":
[ [
{
"trKey": "Qt 5.15",
"value":
{
"QtQuickVersion": "2.15",
"QtQuickWindowVersion": "2.15",
"QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15"
}
},
{ {
"trKey": "Qt 5.14", "trKey": "Qt 5.14",
"value": "value":

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

@@ -80,7 +80,7 @@ QStringList supportedVersionsList()
{ {
static const QStringList list = { 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.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", "2.13", "2.14" "2.10", "2.11", "2.12", "2.13", "2.14", "2.15"
}; };
return list; return list;
} }

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

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