Qml tooling: Support Qt 5.14

QtQuick 2.14
QtQuick.Controls 2.14
QtQuick.Window 2.14
QtQuick.VirtualKeyboard 2.14

Change-Id: Ide447cf8f5beae481495e6c7220dfc075d6e859f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Alessandro Portale
2019-09-30 19:06:31 +02:00
parent 9afc5305d6
commit dea46dd04e
6 changed files with 56 additions and 5 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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