From 6c14b4dfaf817716ee502711686661f7875c2fbc Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Tue, 1 Dec 2020 22:55:13 +0100
Subject: [PATCH] QtQuick Application Wizards: Set default Controls Style to
 "Material"

The Controls Style "Default" that is currently by default in the
generated qtquickcontrols2.conf is not present in Qt 6. That leads to
QML runtime errors and aborting applications with Qt 6.

Let's switch the default to "Material" which is available since Qt 5.7
and present in Qt 6.

Fixes: QTCREATORBUG-25027
Change-Id: Ic8b631b771487624d7459a276d290b80c7ad8be0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 .../wizards/projects/qtquickapplication/scroll/wizard.json      | 2 +-
 .../wizards/projects/qtquickapplication/stack/wizard.json       | 2 +-
 .../wizards/projects/qtquickapplication/swipe/wizard.json       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
index 1ad41e72302..5ebf0852168 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
@@ -160,7 +160,7 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 0,
+                        "index": 1,
                         "items":
                         [
                             {
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
index e3966ca5231..2f0d0353f54 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
@@ -178,7 +178,7 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 0,
+                        "index": 1,
                         "items":
                         [
                             {
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
index 67dd9fb711a..804916d77a8 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
@@ -178,7 +178,7 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 0,
+                        "index": 1,
                         "items":
                         [
                             {