diff options
| author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2022-08-24 13:41:31 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-31 15:19:59 +0000 |
| commit | c2a4e4966b42a90bebdd166dbe562a29d93fdeac (patch) | |
| tree | 72488930439918ae4de7717fa94bb5f7aa94c317 /examples | |
| parent | b851c6f0edc2b23e4c104132b5d4297e21e5a16f (diff) | |
examples, texteditor: remove the config file, and use default settings instead
The qtquickcontrols2.conf file was hard coding the style to be
Material. In addition, it was overriding both the Primary and the
Foreground color, and sat Theme=System. The latter meant that the
application would run in either Light or Dark mode, depending on
the OS. And for Dark mode, the assigned colors caused the text to
end up with the same color as the background color, and therefore
be invisible.
The same with the toolbar buttons; since the icon color of a toolbar
button map to the primary color, and the primary color was hard-coded
to be the same as the background color in the configuration file, the
buttons would appear hidden.
Since we now have native styles for both macOS and Windows (and
Fusion on Linux), overriding the style (and especially the colors)
in a config file seems unnecessary.
This patch will therefore remove the whole config file, and use
the default style settings instead.
Fixes: QTBUG-105860
Change-Id: I330fe30746096cf26d8dca343f2c122d7c32c7fe
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit ec582ef0b9e31c5e8fb9d36a17f1e39f593d7455)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quickcontrols2/texteditor/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | examples/quickcontrols2/texteditor/qtquickcontrols2.conf | 11 | ||||
| -rw-r--r-- | examples/quickcontrols2/texteditor/texteditor.qrc | 1 |
3 files changed, 0 insertions, 13 deletions
diff --git a/examples/quickcontrols2/texteditor/CMakeLists.txt b/examples/quickcontrols2/texteditor/CMakeLists.txt index 187d1a88b4..6c3de0891f 100644 --- a/examples/quickcontrols2/texteditor/CMakeLists.txt +++ b/examples/quickcontrols2/texteditor/CMakeLists.txt @@ -37,7 +37,6 @@ set(texteditor_resource_files "images/qt-logo.png" "qml/+touch/texteditor.qml" "qml/texteditor.qml" - "qtquickcontrols2.conf" "texteditor.html" ) diff --git a/examples/quickcontrols2/texteditor/qtquickcontrols2.conf b/examples/quickcontrols2/texteditor/qtquickcontrols2.conf deleted file mode 100644 index ecac617fcb..0000000000 --- a/examples/quickcontrols2/texteditor/qtquickcontrols2.conf +++ /dev/null @@ -1,11 +0,0 @@ -[Controls] -Style=Material - -[Material] -Primary=White -Foreground=#444444 -Accent=Blue -Theme=System - -[Universal] -Theme=System diff --git a/examples/quickcontrols2/texteditor/texteditor.qrc b/examples/quickcontrols2/texteditor/texteditor.qrc index 8f2da8432b..cdb7225a39 100644 --- a/examples/quickcontrols2/texteditor/texteditor.qrc +++ b/examples/quickcontrols2/texteditor/texteditor.qrc @@ -1,6 +1,5 @@ <RCC> <qresource prefix="/"> - <file>qtquickcontrols2.conf</file> <file>images/qt-logo.png</file> <file>fonts/fontello.ttf</file> <file>qml/texteditor.qml</file> |