From eb711d7bd61f1d5f922cc0d14405358a29e570b5 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 4 Dec 2020 16:38:34 +0100 Subject: [PATCH] Fix qtquickcontrols2.conf in QtDS examples for Qt 6 Since the default style got renamed to 'Basic', Style=Default will cause a runtime error with Qt 6.0.0 Avoid this by not setting an explicit style. Task-number: QTCREATORBUG-24905 Change-Id: I0f35e1dfb38536412da064d9f8ba88264485ef52 Reviewed-by: Thomas Hartmann --- .../examples/Optimal3DScene/qtquickcontrols2.conf | 5 +---- doc/qtdesignstudio/examples/loginui1/qtquickcontrols2.conf | 5 +---- doc/qtdesignstudio/examples/loginui2/qtquickcontrols2.conf | 5 +---- doc/qtdesignstudio/examples/loginui3/qtquickcontrols2.conf | 5 +---- doc/qtdesignstudio/examples/loginui4/qtquickcontrols2.conf | 5 +---- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/doc/qtdesignstudio/examples/Optimal3DScene/qtquickcontrols2.conf b/doc/qtdesignstudio/examples/Optimal3DScene/qtquickcontrols2.conf index 75b2cb8fffb..7ad5144dc36 100644 --- a/doc/qtdesignstudio/examples/Optimal3DScene/qtquickcontrols2.conf +++ b/doc/qtdesignstudio/examples/Optimal3DScene/qtquickcontrols2.conf @@ -1,6 +1,3 @@ ; This file can be edited to change the style of the application ; Read "Qt Quick Controls 2 Configuration File" for details: -; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html - -[Controls] -Style=Default +; https://doc.qt.io/qt/qtquickcontrols2-configuration.html diff --git a/doc/qtdesignstudio/examples/loginui1/qtquickcontrols2.conf b/doc/qtdesignstudio/examples/loginui1/qtquickcontrols2.conf index 75b2cb8fffb..7ad5144dc36 100644 --- a/doc/qtdesignstudio/examples/loginui1/qtquickcontrols2.conf +++ b/doc/qtdesignstudio/examples/loginui1/qtquickcontrols2.conf @@ -1,6 +1,3 @@ ; This file can be edited to change the style of the application ; Read "Qt Quick Controls 2 Configuration File" for details: -; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html - -[Controls] -Style=Default +; https://doc.qt.io/qt/qtquickcontrols2-configuration.html diff --git a/doc/qtdesignstudio/examples/loginui2/qtquickcontrols2.conf b/doc/qtdesignstudio/examples/loginui2/qtquickcontrols2.conf index 75b2cb8fffb..7ad5144dc36 100644 --- a/doc/qtdesignstudio/examples/loginui2/qtquickcontrols2.conf +++ b/doc/qtdesignstudio/examples/loginui2/qtquickcontrols2.conf @@ -1,6 +1,3 @@ ; This file can be edited to change the style of the application ; Read "Qt Quick Controls 2 Configuration File" for details: -; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html - -[Controls] -Style=Default +; https://doc.qt.io/qt/qtquickcontrols2-configuration.html diff --git a/doc/qtdesignstudio/examples/loginui3/qtquickcontrols2.conf b/doc/qtdesignstudio/examples/loginui3/qtquickcontrols2.conf index 75b2cb8fffb..7ad5144dc36 100644 --- a/doc/qtdesignstudio/examples/loginui3/qtquickcontrols2.conf +++ b/doc/qtdesignstudio/examples/loginui3/qtquickcontrols2.conf @@ -1,6 +1,3 @@ ; This file can be edited to change the style of the application ; Read "Qt Quick Controls 2 Configuration File" for details: -; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html - -[Controls] -Style=Default +; https://doc.qt.io/qt/qtquickcontrols2-configuration.html diff --git a/doc/qtdesignstudio/examples/loginui4/qtquickcontrols2.conf b/doc/qtdesignstudio/examples/loginui4/qtquickcontrols2.conf index 75b2cb8fffb..7ad5144dc36 100644 --- a/doc/qtdesignstudio/examples/loginui4/qtquickcontrols2.conf +++ b/doc/qtdesignstudio/examples/loginui4/qtquickcontrols2.conf @@ -1,6 +1,3 @@ ; This file can be edited to change the style of the application ; Read "Qt Quick Controls 2 Configuration File" for details: -; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html - -[Controls] -Style=Default +; https://doc.qt.io/qt/qtquickcontrols2-configuration.html