From 69b111b3c7839dd6a6a88f94288f66166d4c220d Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 14 Nov 2018 15:03:58 +0100 Subject: More Qt Quick wizard fixes for Qt 5.12 Task-number: QTCREATORBUG-21476 Change-Id: Icadcf12dc59786a62205cccc917a13b42f55b782 Reviewed-by: Alessandro Portale Reviewed-by: Robert Loehning --- .../projects/qtquickapplication/scroll/wizard.json | 32 +++++++++++----------- .../projects/qtquickapplication/stack/wizard.json | 32 +++++++++++----------- .../projects/qtquickapplication/swipe/wizard.json | 32 +++++++++++----------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json index a8d17c9cd4..656f5d3596 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json @@ -137,66 +137,66 @@ { "trKey": "Default", "value": - "{ + "({ 'QtQuickControlsStyle': 'Default', 'QtQuickControlsStyleTheme': '' - }" + })" }, { "trKey": "Material Light", "value": - "{ + "({ 'QtQuickControlsStyle': 'Material', 'QtQuickControlsStyleTheme': 'Light' - }" + })" }, { "trKey": "Material Dark", "value": - "{ + "({ 'QtQuickControlsStyle': 'Material', 'QtQuickControlsStyleTheme': 'Dark' - }" + })" }, { "trKey": "Universal Light", "value": - "{ + "({ 'QtQuickControlsStyle': 'Universal', 'QtQuickControlsStyleTheme': 'Light' - }" + })" }, { "trKey": "Universal Dark", "value": - "{ + "({ 'QtQuickControlsStyle': 'Universal', 'QtQuickControlsStyleTheme': 'Dark' - }" + })" }, { "trKey": "Universal System", "value": - "{ + "({ 'QtQuickControlsStyle': 'Universal', 'QtQuickControlsStyleTheme': 'System' - }" + })" }, { "trKey": "Fusion (Qt 5.10+)", "value": - "{ + "({ 'QtQuickControlsStyle': 'Fusion', 'QtQuickControlsStyleTheme': '' - }" + })" }, { "trKey": "Imagine (Qt 5.10+)", "value": - "{ + "({ 'QtQuickControlsStyle': 'Imagine', 'QtQuickControlsStyleTheme': '' - }" + })" } ] } diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json index 0221090ae1..99cf484850 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json @@ -154,66 +154,66 @@ { "trKey": "Default", "value": - "{ + "({ 'QtQuickControlsStyle': 'Default', 'QtQuickControlsStyleTheme': '' - }" + })" }, { "trKey": "Material Light", "value": - "{ + "({ 'QtQuickControlsStyle': 'Material', 'QtQuickControlsStyleTheme': 'Light' - }" + })" }, { "trKey": "Material Dark", "value": - "{ + "({ 'QtQuickControlsStyle': 'Material', 'QtQuickControlsStyleTheme': 'Dark' - }" + })" }, { "trKey": "Universal Light", "value": - "{ + "({ 'QtQuickControlsStyle': 'Universal', 'QtQuickControlsStyleTheme': 'Light' - }" + })" }, { "trKey": "Universal Dark", "value": - "{ + "({ 'QtQuickControlsStyle': 'Universal', 'QtQuickControlsStyleTheme': 'Dark' - }" + })" }, { "trKey": "Universal System", "value": - "{ + "({ 'QtQuickControlsStyle': 'Universal', 'QtQuickControlsStyleTheme': 'System' - }" + })" }, { "trKey": "Fusion (Qt 5.10+)", "value": - "{ + "({ 'QtQuickControlsStyle': 'Fusion', 'QtQuickControlsStyleTheme': '' - }" + })" }, { "trKey": "Imagine (Qt 5.10+)", "value": - "{ + "({ 'QtQuickControlsStyle': 'Imagine', 'QtQuickControlsStyleTheme': '' - }" + })" } ] } diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json index 8e4f61b88a..f5918f35e0 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json @@ -154,66 +154,66 @@ { "trKey": "Default", "value": - "{ + "({ 'QtQuickControlsStyle': 'Default', 'QtQuickControlsStyleTheme': '' - }" + })" }, { "trKey": "Material Light", "value": - "{ + "({ 'QtQuickControlsStyle': 'Material', 'QtQuickControlsStyleTheme': 'Light' - }" + })" }, { "trKey": "Material Dark", "value": - "{ + "({ 'QtQuickControlsStyle': 'Material', 'QtQuickControlsStyleTheme': 'Dark' - }" + })" }, { "trKey": "Universal Light", "value": - "{ + "({ 'QtQuickControlsStyle': 'Universal', 'QtQuickControlsStyleTheme': 'Light' - }" + })" }, { "trKey": "Universal Dark", "value": - "{ + "({ 'QtQuickControlsStyle': 'Universal', 'QtQuickControlsStyleTheme': 'Dark' - }" + })" }, { "trKey": "Universal System", "value": - "{ + "({ 'QtQuickControlsStyle': 'Universal', 'QtQuickControlsStyleTheme': 'System' - }" + })" }, { "trKey": "Fusion (Qt 5.10+)", "value": - "{ + "({ 'QtQuickControlsStyle': 'Fusion', 'QtQuickControlsStyleTheme': '' - }" + })" }, { "trKey": "Imagine (Qt 5.10+)", "value": - "{ + "({ 'QtQuickControlsStyle': 'Imagine', 'QtQuickControlsStyleTheme': '' - }" + })" } ] } -- cgit v1.2.1