From bb333700054e4c1e699d907e67f4e6be498968a1 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 27 Aug 2020 13:28:07 +0200 Subject: Fix examples' usages of styles After the type registration changes, importing a style explicitly will cause that style's QML types to be used, so applications should put style-specific code into file-selected directories if they need to support multiple styles. [ChangeLog][Important Behavior Changes] Due to the recent type registration changes, importing a style explicitly (e.g. "import QtQuick.Controls.Material") now registers that style's QML types in addition to making its API (attached, singleton, etc.) available. For this reason, it is now advised to have style-specific code in a separate QML file and use file selectors if your application supports more than one style. If your style only supports one style, importing that style explicitly will work as expected. For example, if you use Material.foreground in your QML code and your application supports more than one style, you should refactor the code that uses the binding into its own file; e.g. +Material/MyComponent.qml. Fixes: QTBUG-86263 Change-Id: I38e40ff4f20f61218550ad73945dafb912193466 Reviewed-by: Ulf Hermann --- examples/quickcontrols2/sidepanel/CMakeLists.txt | 1 + examples/quickcontrols2/sidepanel/qtquickcontrols2.conf | 2 ++ examples/quickcontrols2/sidepanel/sidepanel.pro | 1 + examples/quickcontrols2/sidepanel/sidepanel.qml | 1 - 4 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 examples/quickcontrols2/sidepanel/qtquickcontrols2.conf (limited to 'examples/quickcontrols2/sidepanel') diff --git a/examples/quickcontrols2/sidepanel/CMakeLists.txt b/examples/quickcontrols2/sidepanel/CMakeLists.txt index d10c48d4..e057461c 100644 --- a/examples/quickcontrols2/sidepanel/CMakeLists.txt +++ b/examples/quickcontrols2/sidepanel/CMakeLists.txt @@ -37,6 +37,7 @@ set(qmake_immediate_resource_files "images/qt-logo@2x.png" "images/qt-logo@3x.png" "images/qt-logo@4x.png" + "qtquickcontrols2.conf" "sidepanel.qml" ) diff --git a/examples/quickcontrols2/sidepanel/qtquickcontrols2.conf b/examples/quickcontrols2/sidepanel/qtquickcontrols2.conf new file mode 100644 index 00000000..b6c7c87e --- /dev/null +++ b/examples/quickcontrols2/sidepanel/qtquickcontrols2.conf @@ -0,0 +1,2 @@ +[Controls] +Style=Material diff --git a/examples/quickcontrols2/sidepanel/sidepanel.pro b/examples/quickcontrols2/sidepanel/sidepanel.pro index 1fddc70a..3ae9cd8d 100644 --- a/examples/quickcontrols2/sidepanel/sidepanel.pro +++ b/examples/quickcontrols2/sidepanel/sidepanel.pro @@ -12,6 +12,7 @@ RESOURCES += \ images/qt-logo@3x.png \ images/qt-logo@4x.png \ images/qt-logo.png \ + qtquickcontrols2.conf \ sidepanel.qml target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/sidepanel diff --git a/examples/quickcontrols2/sidepanel/sidepanel.qml b/examples/quickcontrols2/sidepanel/sidepanel.qml index 70af901d..68a8a170 100644 --- a/examples/quickcontrols2/sidepanel/sidepanel.qml +++ b/examples/quickcontrols2/sidepanel/sidepanel.qml @@ -50,7 +50,6 @@ import QtQuick import QtQuick.Controls -import QtQuick.Controls.Material ApplicationWindow { id: window -- cgit v1.2.3