From 2bf9333e4c8a80c4ed98df59bb6cb119d7efdd8b Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 14 Nov 2018 12:40:53 +0100 Subject: [PATCH] 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 Reviewed-by: Alessandro Portale --- .../qtquickapplication/empty/wizard.json | 28 +++++++++---------- .../qtquickapplication/scroll/wizard.json | 16 +++++------ .../qtquickapplication/stack/wizard.json | 24 ++++++++-------- .../qtquickapplication/swipe/wizard.json | 24 ++++++++-------- .../projects/qtquickuiprototype/wizard.json | 28 +++++++++---------- 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 90c1133ebc1..4ced9e026ba 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 ab8115d3fca..a8d17c9cd45 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 aad751bc51b..0221090ae16 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 4df5b3cf4d9..8e4f61b88aa 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 41ac39342b7..89dbe871d69 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' - }" + })" } ] }