feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix qtquickcontrols2.conf in QtDS examples for Qt 6

Browse Source 
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 <thomas.hartmann@qt.io>
This commit is contained in:
Kai Koehne
2020-12-04 16:38:34 +01:00
parent 493f44ac6a
commit eb711d7bd6
5 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/qtdesignstudio/examples/Optimal3DScene/qtquickcontrols2.conf
View File

@@ -1,6 +1,3 @@
; This file can be edited to change the style of the application ; This file can be edited to change the style of the application
; Read "Qt Quick Controls 2 Configuration File" for details: ; Read "Qt Quick Controls 2 Configuration File" for details:
; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html ; https://doc.qt.io/qt/qtquickcontrols2-configuration.html
[Controls]
Style=Default

5
doc/qtdesignstudio/examples/loginui1/qtquickcontrols2.conf
View File

@@ -1,6 +1,3 @@
; This file can be edited to change the style of the application ; This file can be edited to change the style of the application
; Read "Qt Quick Controls 2 Configuration File" for details: ; Read "Qt Quick Controls 2 Configuration File" for details:
; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html ; https://doc.qt.io/qt/qtquickcontrols2-configuration.html
[Controls]
Style=Default

5
doc/qtdesignstudio/examples/loginui2/qtquickcontrols2.conf
View File

@@ -1,6 +1,3 @@
; This file can be edited to change the style of the application ; This file can be edited to change the style of the application
; Read "Qt Quick Controls 2 Configuration File" for details: ; Read "Qt Quick Controls 2 Configuration File" for details:
; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html ; https://doc.qt.io/qt/qtquickcontrols2-configuration.html
[Controls]
Style=Default

5
doc/qtdesignstudio/examples/loginui3/qtquickcontrols2.conf
View File

@@ -1,6 +1,3 @@
; This file can be edited to change the style of the application ; This file can be edited to change the style of the application
; Read "Qt Quick Controls 2 Configuration File" for details: ; Read "Qt Quick Controls 2 Configuration File" for details:
; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html ; https://doc.qt.io/qt/qtquickcontrols2-configuration.html
[Controls]
Style=Default

5
doc/qtdesignstudio/examples/loginui4/qtquickcontrols2.conf
View File

@@ -1,6 +1,3 @@
; This file can be edited to change the style of the application ; This file can be edited to change the style of the application
; Read "Qt Quick Controls 2 Configuration File" for details: ; Read "Qt Quick Controls 2 Configuration File" for details:
; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html ; https://doc.qt.io/qt/qtquickcontrols2-configuration.html
[Controls]
Style=Default