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 <ulf.hermann@qt.io>

15 files changed, 128 insertions, 12 deletions

diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/+Material/ChatToolBar.qml
index d4a66764..d4a66764 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/+Material/ChatToolBar.qml
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt b/examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt
index d63eb4b1..9e3df84d 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt
@@ -37,7 +37,7 @@ target_link_libraries(chapter5-styling PUBLIC
 
 # Resources:
 set(qml_resource_files
-    "+material/ChatToolBar.qml"
+    "+Material/ChatToolBar.qml"
     "ChatToolBar.qml"
     "ContactPage.qml"
     "ConversationPage.qml"
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/qml.qrc b/examples/quickcontrols2/chattutorial/chapter5-styling/qml.qrc
index 6dcfb073..54cf6d5a 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/qml.qrc
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/qml.qrc
@@ -5,6 +5,6 @@
         <file>ConversationPage.qml</file>
         <file>qtquickcontrols2.conf</file>
         <file>ChatToolBar.qml</file>
-        <file>+material/ChatToolBar.qml</file>
+        <file>+Material/ChatToolBar.qml</file>
     </qresource>
 </RCC>
diff --git a/examples/quickcontrols2/gallery/+Material/ToolBar.qml b/examples/quickcontrols2/gallery/+Material/ToolBar.qml
new file mode 100644
index 00000000..18ca5c82
--- /dev/null
+++ b/examples/quickcontrols2/gallery/+Material/ToolBar.qml
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick.Controls.Material
+
+ToolBar {
+    Material.foreground: "white"
+}
diff --git a/examples/quickcontrols2/gallery/.prev_CMakeLists.txt b/examples/quickcontrols2/gallery/.prev_CMakeLists.txt
index a175afa9..042b3a0c 100644
--- a/examples/quickcontrols2/gallery/.prev_CMakeLists.txt
+++ b/examples/quickcontrols2/gallery/.prev_CMakeLists.txt
@@ -33,6 +33,8 @@ target_link_libraries(gallery PUBLIC
 
 # Resources:
 set(qmake_immediate_resource_files
+    "+Material/ToolBar.qml"
+    "ToolBar.qml"
     "gallery.qml"
     "icons/gallery/20x20/back.png"
     "icons/gallery/20x20/drawer.png"
@@ -86,6 +88,7 @@ set(qmake_immediate_resource_files
     "pages/TextFieldPage.qml"
     "pages/ToolTipPage.qml"
     "pages/TumblerPage.qml"
+    "qmldir"
     "qtquickcontrols2.conf"
 )
 
diff --git a/examples/quickcontrols2/gallery/CMakeLists.txt b/examples/quickcontrols2/gallery/CMakeLists.txt
index d4c9df04..93355b9a 100644
--- a/examples/quickcontrols2/gallery/CMakeLists.txt
+++ b/examples/quickcontrols2/gallery/CMakeLists.txt
@@ -33,6 +33,8 @@ target_link_libraries(gallery_controls2 PUBLIC # special case
 
 # Resources:
 set(qmake_immediate_resource_files
+    "+Material/ToolBar.qml"
+    "ToolBar.qml"
     "gallery.qml"
     "icons/gallery/20x20/back.png"
     "icons/gallery/20x20/drawer.png"
@@ -86,6 +88,7 @@ set(qmake_immediate_resource_files
     "pages/TextFieldPage.qml"
     "pages/ToolTipPage.qml"
     "pages/TumblerPage.qml"
+    "qmldir"
     "qtquickcontrols2.conf"
 )
 
diff --git a/examples/quickcontrols2/gallery/ToolBar.qml b/examples/quickcontrols2/gallery/ToolBar.qml
new file mode 100644
index 00000000..9f1d1f9e
--- /dev/null
+++ b/examples/quickcontrols2/gallery/ToolBar.qml
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick.Controls
+
+ToolBar {}
diff --git a/examples/quickcontrols2/gallery/gallery.pro b/examples/quickcontrols2/gallery/gallery.pro
index 2b898fca..e1ac462a 100644
--- a/examples/quickcontrols2/gallery/gallery.pro
+++ b/examples/quickcontrols2/gallery/gallery.pro
@@ -34,6 +34,7 @@ RESOURCES += \
     pages/TextFieldPage.qml \
     pages/ToolTipPage.qml \
     pages/TumblerPage.qml \
+    qmldir \
     qtquickcontrols2.conf \
     icons/gallery/index.theme \
     icons/gallery/20x20/back.png \
@@ -59,7 +60,9 @@ RESOURCES += \
     images/qt-logo.png \
     images/qt-logo@2x.png \
     images/qt-logo@3x.png \
-    images/qt-logo@4x.png
+    images/qt-logo@4x.png \
+    ToolBar.qml \
+    +Material/ToolBar.qml
 
 target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/gallery
 INSTALLS += target
diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml
index 872bdb44..f53ce735 100644
--- a/examples/quickcontrols2/gallery/gallery.qml
+++ b/examples/quickcontrols2/gallery/gallery.qml
@@ -51,10 +51,10 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import QtQuick.Controls.Material
-import QtQuick.Controls.Universal
 import Qt.labs.settings
 
+import "." as App
+
 ApplicationWindow {
     id: window
     width: 360
@@ -113,9 +113,7 @@ ApplicationWindow {
         onTriggered: optionsMenu.open()
     }
 
-    header: ToolBar {
-        Material.foreground: "white"
-
+    header: App.ToolBar {
         RowLayout {
             spacing: 20
             anchors.fill: parent
diff --git a/examples/quickcontrols2/gallery/qmldir b/examples/quickcontrols2/gallery/qmldir
new file mode 100644
index 00000000..6b7f86bf
--- /dev/null
+++ b/examples/quickcontrols2/gallery/qmldir
@@ -0,0 +1 @@
+module App
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
diff --git a/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml b/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml
index 61d7de8a..9730ad09 100644
--- a/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml
+++ b/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml
@@ -50,7 +50,6 @@
 
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Controls.Material
 import QtQuick.Layouts
 import QtQuick.Window
 
@@ -77,8 +76,6 @@ ApplicationWindow {
                 text: "\uE80A" // icon-ok
                 opacity: !textArea.readOnly ? 1 : 0
                 onClicked: textArea.readOnly = true
-
-                Material.foreground: Material.accent
             }
 
             Label {