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>
(cherry picked from commit 2bf9333e4c8a80c4ed98df59bb6cb119d7efdd8b)

5 files changed, 50 insertions, 50 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..83a1d3cc72 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
@@ -86,56 +86,56 @@
                             {
                                 "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 ed6f876923..6eb62de325 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
@@ -89,29 +89,29 @@
                             {
                                 "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 dec5441fa9..cc32217210 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
@@ -88,47 +88,47 @@
                             {
                                 "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 1867cf3757..8a1e355ef0 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
@@ -88,47 +88,47 @@
                             {
                                 "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 9b748cf3d7..bb9a2980e1 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
@@ -46,56 +46,56 @@
                             {
                                 "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'
-                                }"
+                                })"
                             }
                         ]
                     }