From 257b4a0325c0e7f60afaaaf107f7f88e8564af66 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
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 <alessandro.portale@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
(cherry picked from commit 69b111b3c7839dd6a6a88f94288f66166d4c220d)
---
 .../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 6eb62de325..7ca61136a3 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
@@ -128,66 +128,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 cc32217210..4eb7faa8c2 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
@@ -145,66 +145,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 8a1e355ef0..bf25fc4af3 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
@@ -145,66 +145,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.3