diff options
author | Eike Ziller <eike.ziller@qt.io> | 2018-11-14 12:40:53 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2018-11-14 13:09:07 +0000 |
commit | 2bf9333e4c8a80c4ed98df59bb6cb119d7efdd8b (patch) | |
tree | ff7c0818c420c9bde2dfc267fbb8d9c17fd69caa /share/qtcreator | |
parent | 18e73a738be659bbc33306d800324a89c34b8f17 (diff) | |
download | qt-creator-2bf9333e4c8a80c4ed98df59bb6cb119d7efdd8b.tar.gz |
Fix Qt Quick wizards with Qt 5.12 / ECMAScript 7
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>
Diffstat (limited to 'share/qtcreator')
5 files changed, 60 insertions, 60 deletions
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json index 90c1133ebc..4ced9e026b 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json @@ -86,65 +86,65 @@ { "trKey": "Qt 5.12", "value": - "{ + "({ 'QtQuickVersion': '2.12', 'QtQuickWindowVersion': '2.12', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' - }" + })" }, { "trKey": "Qt 5.11", "value": - "{ + "({ 'QtQuickVersion': '2.11', 'QtQuickWindowVersion': '2.11', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' - }" + })" }, { "trKey": "Qt 5.10", "value": - "{ + "({ 'QtQuickVersion': '2.10', 'QtQuickWindowVersion': '2.10', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' - }" + })" }, { "trKey": "Qt 5.9", "value": - "{ + "({ 'QtQuickVersion': '2.9', 'QtQuickWindowVersion': '2.2', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2' - }" + })" }, { "trKey": "Qt 5.8", "value": - "{ + "({ 'QtQuickVersion': '2.8', 'QtQuickWindowVersion': '2.2', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1' - }" + })" }, { "trKey": "Qt 5.7", "value": - "{ + "({ 'QtQuickVersion': '2.7', 'QtQuickWindowVersion': '2.2', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1' - }" + })" }, { "trKey": "Qt 5.6", "value": - "{ + "({ 'QtQuickVersion': '2.6', 'QtQuickWindowVersion': '2.2', 'QtQuickVirtualKeyboardImport': 'QtQuick.Enterprise.VirtualKeyboard 2.0' - }" + })" } ] } diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json index ab8115d3fc..a8d17c9cd4 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json @@ -89,38 +89,38 @@ { "trKey": "Qt 5.12", "value": - "{ + "({ 'QtQuickVersion': '2.12', 'QtQuickControlsVersion': '2.5', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' - }" + })" }, { "trKey": "Qt 5.11", "value": - "{ + "({ 'QtQuickVersion': '2.11', 'QtQuickControlsVersion': '2.4', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' - }" + })" }, { "trKey": "Qt 5.10", "value": - "{ + "({ 'QtQuickVersion': '2.10', 'QtQuickControlsVersion': '2.3', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' - }" + })" }, { "trKey": "Qt 5.9", "value": - "{ + "({ 'QtQuickVersion': '2.9', 'QtQuickControlsVersion': '2.2', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2' - }" + })" } ] } diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json index aad751bc51..0221090ae1 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json @@ -88,56 +88,56 @@ { "trKey": "Qt 5.12", "value": - "{ + "({ 'QtQuickVersion': '2.12', 'QtQuickControlsVersion': '2.5', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' - }" + })" }, { "trKey": "Qt 5.11", "value": - "{ + "({ 'QtQuickVersion': '2.11', 'QtQuickControlsVersion': '2.4', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' - }" + })" }, { "trKey": "Qt 5.10", "value": - "{ + "({ 'QtQuickVersion': '2.10', 'QtQuickControlsVersion': '2.3', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' - }" + })" }, { "trKey": "Qt 5.9", "value": - "{ + "({ 'QtQuickVersion': '2.9', 'QtQuickControlsVersion': '2.2', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2' - }" + })" }, { "trKey": "Qt 5.8", "value": - "{ + "({ 'QtQuickVersion': '2.8', 'QtQuickControlsVersion': '2.1', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1' - }" + })" }, { "trKey": "Qt 5.7", "value": - "{ + "({ 'QtQuickVersion': '2.7', 'QtQuickControlsVersion': '2.0', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1' - }" + })" } ] } diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json index 4df5b3cf4d..8e4f61b88a 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json @@ -88,56 +88,56 @@ { "trKey": "Qt 5.12", "value": - "{ + "({ 'QtQuickVersion': '2.12', 'QtQuickControlsVersion': '2.5', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' - }" + })" }, { "trKey": "Qt 5.11", "value": - "{ + "({ 'QtQuickVersion': '2.11', 'QtQuickControlsVersion': '2.4', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' - }" + })" }, { "trKey": "Qt 5.10", "value": - "{ + "({ 'QtQuickVersion': '2.10', 'QtQuickControlsVersion': '2.3', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' - }" + })" }, { "trKey": "Qt 5.9", "value": - "{ + "({ 'QtQuickVersion': '2.9', 'QtQuickControlsVersion': '2.2', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2' - }" + })" }, { "trKey": "Qt 5.8", "value": - "{ + "({ 'QtQuickVersion': '2.8', 'QtQuickControlsVersion': '2.1', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1' - }" + })" }, { "trKey": "Qt 5.7", "value": - "{ + "({ 'QtQuickVersion': '2.7', 'QtQuickControlsVersion': '2.0', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1' - }" + })" } ] } diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json index 41ac39342b..89dbe871d6 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json @@ -46,65 +46,65 @@ { "trKey": "Qt 5.12", "value": - "{ + "({ 'QtQuickVersion': '2.12', 'QtQuickWindowVersion': '2.12', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' - }" + })" }, { "trKey": "Qt 5.11", "value": - "{ + "({ 'QtQuickVersion': '2.11', 'QtQuickWindowVersion': '2.11', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' - }" + })" }, { "trKey": "Qt 5.10", "value": - "{ + "({ 'QtQuickVersion': '2.10', 'QtQuickWindowVersion': '2.10', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' - }" + })" }, { "trKey": "Qt 5.9", "value": - "{ + "({ 'QtQuickVersion': '2.9', 'QtQuickWindowVersion': '2.3', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2' - }" + })" }, { "trKey": "Qt 5.8", "value": - "{ + "({ 'QtQuickVersion': '2.8', 'QtQuickWindowVersion': '2.2', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1' - }" + })" }, { "trKey": "Qt 5.7", "value": - "{ + "({ 'QtQuickVersion': '2.7', 'QtQuickWindowVersion': '2.2', 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1' - }" + })" }, { "trKey": "Qt 5.6", "value": - "{ + "({ 'QtQuickVersion': '2.6', 'QtQuickWindowVersion': '2.2', 'QtQuickVirtualKeyboardImport': 'QtQuick.Enterprise.VirtualKeyboard 2.0' - }" + })" } ] } |