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

Fix Qt Quick wizards with Qt 5.12 / ECMAScript 7

Browse Source 
The expression that we used either worked in ECMAScript 6, or only
accidentally worked in QJSEngine in Qt 5.11.

Fixes: QTCREATORBUG-21476
Change-Id: Id2ce0932ead24c8caef9a82b10a173dfdcf1e927
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Eike Ziller
2018-11-14 12:40:53 +01:00
parent 18e73a738b
commit 2bf9333e4c
5 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,65 +86,65 @@
{ {
"trKey": "Qt 5.12", "trKey": "Qt 5.12",
"value": "value":
"{ "({
'QtQuickVersion': '2.12', 'QtQuickVersion': '2.12',
'QtQuickWindowVersion': '2.12', 'QtQuickWindowVersion': '2.12',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4'
}" })"
}, },
{ {
"trKey": "Qt 5.11", "trKey": "Qt 5.11",
"value": "value":
"{ "({
'QtQuickVersion': '2.11', 'QtQuickVersion': '2.11',
'QtQuickWindowVersion': '2.11', 'QtQuickWindowVersion': '2.11',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
}" })"
}, },
{ {
"trKey": "Qt 5.10", "trKey": "Qt 5.10",
"value": "value":
"{ "({
'QtQuickVersion': '2.10', 'QtQuickVersion': '2.10',
'QtQuickWindowVersion': '2.10', 'QtQuickWindowVersion': '2.10',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
}" })"
}, },
{ {
"trKey": "Qt 5.9", "trKey": "Qt 5.9",
"value": "value":
"{ "({
'QtQuickVersion': '2.9', 'QtQuickVersion': '2.9',
'QtQuickWindowVersion': '2.2', 'QtQuickWindowVersion': '2.2',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2'
}" })"
}, },
{ {
"trKey": "Qt 5.8", "trKey": "Qt 5.8",
"value": "value":
"{ "({
'QtQuickVersion': '2.8', 'QtQuickVersion': '2.8',
'QtQuickWindowVersion': '2.2', 'QtQuickWindowVersion': '2.2',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1'
}" })"
}, },
{ {
"trKey": "Qt 5.7", "trKey": "Qt 5.7",
"value": "value":
"{ "({
'QtQuickVersion': '2.7', 'QtQuickVersion': '2.7',
'QtQuickWindowVersion': '2.2', 'QtQuickWindowVersion': '2.2',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1'
}" })"
}, },
{ {
"trKey": "Qt 5.6", "trKey": "Qt 5.6",
"value": "value":
"{ "({
'QtQuickVersion': '2.6', 'QtQuickVersion': '2.6',
'QtQuickWindowVersion': '2.2', 'QtQuickWindowVersion': '2.2',
'QtQuickVirtualKeyboardImport': 'QtQuick.Enterprise.VirtualKeyboard 2.0' 'QtQuickVirtualKeyboardImport': 'QtQuick.Enterprise.VirtualKeyboard 2.0'
}" })"
} }
] ]
} }

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

@@ -89,38 +89,38 @@
{ {
"trKey": "Qt 5.12", "trKey": "Qt 5.12",
"value": "value":
"{ "({
'QtQuickVersion': '2.12', 'QtQuickVersion': '2.12',
'QtQuickControlsVersion': '2.5', 'QtQuickControlsVersion': '2.5',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4'
}" })"
}, },
{ {
"trKey": "Qt 5.11", "trKey": "Qt 5.11",
"value": "value":
"{ "({
'QtQuickVersion': '2.11', 'QtQuickVersion': '2.11',
'QtQuickControlsVersion': '2.4', 'QtQuickControlsVersion': '2.4',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
}" })"
}, },
{ {
"trKey": "Qt 5.10", "trKey": "Qt 5.10",
"value": "value":
"{ "({
'QtQuickVersion': '2.10', 'QtQuickVersion': '2.10',
'QtQuickControlsVersion': '2.3', 'QtQuickControlsVersion': '2.3',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
}" })"
}, },
{ {
"trKey": "Qt 5.9", "trKey": "Qt 5.9",
"value": "value":
"{ "({
'QtQuickVersion': '2.9', 'QtQuickVersion': '2.9',
'QtQuickControlsVersion': '2.2', 'QtQuickControlsVersion': '2.2',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2'
}" })"
} }
] ]
} }

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

@@ -88,56 +88,56 @@
{ {
"trKey": "Qt 5.12", "trKey": "Qt 5.12",
"value": "value":
"{ "({
'QtQuickVersion': '2.12', 'QtQuickVersion': '2.12',
'QtQuickControlsVersion': '2.5', 'QtQuickControlsVersion': '2.5',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4'
}" })"
}, },
{ {
"trKey": "Qt 5.11", "trKey": "Qt 5.11",
"value": "value":
"{ "({
'QtQuickVersion': '2.11', 'QtQuickVersion': '2.11',
'QtQuickControlsVersion': '2.4', 'QtQuickControlsVersion': '2.4',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
}" })"
}, },
{ {
"trKey": "Qt 5.10", "trKey": "Qt 5.10",
"value": "value":
"{ "({
'QtQuickVersion': '2.10', 'QtQuickVersion': '2.10',
'QtQuickControlsVersion': '2.3', 'QtQuickControlsVersion': '2.3',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
}" })"
}, },
{ {
"trKey": "Qt 5.9", "trKey": "Qt 5.9",
"value": "value":
"{ "({
'QtQuickVersion': '2.9', 'QtQuickVersion': '2.9',
'QtQuickControlsVersion': '2.2', 'QtQuickControlsVersion': '2.2',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2'
}" })"
}, },
{ {
"trKey": "Qt 5.8", "trKey": "Qt 5.8",
"value": "value":
"{ "({
'QtQuickVersion': '2.8', 'QtQuickVersion': '2.8',
'QtQuickControlsVersion': '2.1', 'QtQuickControlsVersion': '2.1',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1'
}" })"
}, },
{ {
"trKey": "Qt 5.7", "trKey": "Qt 5.7",
"value": "value":
"{ "({
'QtQuickVersion': '2.7', 'QtQuickVersion': '2.7',
'QtQuickControlsVersion': '2.0', 'QtQuickControlsVersion': '2.0',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1'
}" })"
} }
] ]
} }

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

@@ -88,56 +88,56 @@
{ {
"trKey": "Qt 5.12", "trKey": "Qt 5.12",
"value": "value":
"{ "({
'QtQuickVersion': '2.12', 'QtQuickVersion': '2.12',
'QtQuickControlsVersion': '2.5', 'QtQuickControlsVersion': '2.5',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4'
}" })"
}, },
{ {
"trKey": "Qt 5.11", "trKey": "Qt 5.11",
"value": "value":
"{ "({
'QtQuickVersion': '2.11', 'QtQuickVersion': '2.11',
'QtQuickControlsVersion': '2.4', 'QtQuickControlsVersion': '2.4',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
}" })"
}, },
{ {
"trKey": "Qt 5.10", "trKey": "Qt 5.10",
"value": "value":
"{ "({
'QtQuickVersion': '2.10', 'QtQuickVersion': '2.10',
'QtQuickControlsVersion': '2.3', 'QtQuickControlsVersion': '2.3',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
}" })"
}, },
{ {
"trKey": "Qt 5.9", "trKey": "Qt 5.9",
"value": "value":
"{ "({
'QtQuickVersion': '2.9', 'QtQuickVersion': '2.9',
'QtQuickControlsVersion': '2.2', 'QtQuickControlsVersion': '2.2',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2'
}" })"
}, },
{ {
"trKey": "Qt 5.8", "trKey": "Qt 5.8",
"value": "value":
"{ "({
'QtQuickVersion': '2.8', 'QtQuickVersion': '2.8',
'QtQuickControlsVersion': '2.1', 'QtQuickControlsVersion': '2.1',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1'
}" })"
}, },
{ {
"trKey": "Qt 5.7", "trKey": "Qt 5.7",
"value": "value":
"{ "({
'QtQuickVersion': '2.7', 'QtQuickVersion': '2.7',
'QtQuickControlsVersion': '2.0', 'QtQuickControlsVersion': '2.0',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1'
}" })"
} }
] ]
} }

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

@@ -46,65 +46,65 @@
{ {
"trKey": "Qt 5.12", "trKey": "Qt 5.12",
"value": "value":
"{ "({
'QtQuickVersion': '2.12', 'QtQuickVersion': '2.12',
'QtQuickWindowVersion': '2.12', 'QtQuickWindowVersion': '2.12',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4'
}" })"
}, },
{ {
"trKey": "Qt 5.11", "trKey": "Qt 5.11",
"value": "value":
"{ "({
'QtQuickVersion': '2.11', 'QtQuickVersion': '2.11',
'QtQuickWindowVersion': '2.11', 'QtQuickWindowVersion': '2.11',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
}" })"
}, },
{ {
"trKey": "Qt 5.10", "trKey": "Qt 5.10",
"value": "value":
"{ "({
'QtQuickVersion': '2.10', 'QtQuickVersion': '2.10',
'QtQuickWindowVersion': '2.10', 'QtQuickWindowVersion': '2.10',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
}" })"
}, },
{ {
"trKey": "Qt 5.9", "trKey": "Qt 5.9",
"value": "value":
"{ "({
'QtQuickVersion': '2.9', 'QtQuickVersion': '2.9',
'QtQuickWindowVersion': '2.3', 'QtQuickWindowVersion': '2.3',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2'
}" })"
}, },
{ {
"trKey": "Qt 5.8", "trKey": "Qt 5.8",
"value": "value":
"{ "({
'QtQuickVersion': '2.8', 'QtQuickVersion': '2.8',
'QtQuickWindowVersion': '2.2', 'QtQuickWindowVersion': '2.2',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1'
}" })"
}, },
{ {
"trKey": "Qt 5.7", "trKey": "Qt 5.7",
"value": "value":
"{ "({
'QtQuickVersion': '2.7', 'QtQuickVersion': '2.7',
'QtQuickWindowVersion': '2.2', 'QtQuickWindowVersion': '2.2',
'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1' 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1'
}" })"
}, },
{ {
"trKey": "Qt 5.6", "trKey": "Qt 5.6",
"value": "value":
"{ "({
'QtQuickVersion': '2.6', 'QtQuickVersion': '2.6',
'QtQuickWindowVersion': '2.2', 'QtQuickWindowVersion': '2.2',
'QtQuickVirtualKeyboardImport': 'QtQuick.Enterprise.VirtualKeyboard 2.0' 'QtQuickVirtualKeyboardImport': 'QtQuick.Enterprise.VirtualKeyboard 2.0'
}" })"
} }
] ]
} }