Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I62feb82fcf389bf83c92f83e2ed1a6783d3179ba

1 files changed, 76 insertions, 72 deletions

diff --git a/src/imports/controls/material/CMakeLists.txt b/src/imports/controls/material/CMakeLists.txt
index 7f6f8a39..c1c964b2 100644
--- a/src/imports/controls/material/CMakeLists.txt
+++ b/src/imports/controls/material/CMakeLists.txt
@@ -34,85 +34,90 @@ add_qml_module(qtquickcontrols2materialstyleplugin
 )
 
 # Resources:
+set(qtquickcontrols2materialstyleplugin_resource_files
+    "images/arrow-indicator.png"
+    "images/arrow-indicator@2x.png"
+    "images/arrow-indicator@3x.png"
+    "images/arrow-indicator@4x.png"
+    "images/check.png"
+    "images/check@2x.png"
+    "images/check@3x.png"
+    "images/check@4x.png"
+    "images/drop-indicator.png"
+    "images/drop-indicator@2x.png"
+    "images/drop-indicator@3x.png"
+    "images/drop-indicator@4x.png"
+    "shaders/+glslcore/RectangularGlow.frag"
+    "shaders/+hlsl/RectangularGlow.frag"
+    "shaders/+qsb/RectangularGlow.frag"
+    "shaders/RectangularGlow.frag"
+)
+
 add_qt_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin"
     PREFIX
         "/qt-project.org/imports/QtQuick/Controls.2/Material"
     FILES
-        images/arrow-indicator.png
-        images/arrow-indicator@2x.png
-        images/arrow-indicator@3x.png
-        images/arrow-indicator@4x.png
-        images/check.png
-        images/check@2x.png
-        images/check@3x.png
-        images/check@4x.png
-        images/drop-indicator.png
-        images/drop-indicator@2x.png
-        images/drop-indicator@3x.png
-        images/drop-indicator@4x.png
-        shaders/+glslcore/RectangularGlow.frag
-        shaders/+hlsl/RectangularGlow.frag
-        shaders/RectangularGlow.frag
+        ${qtquickcontrols2materialstyleplugin_resource_files}
 )
 
 
 set(qml_files
-    ApplicationWindow.qml
-    BoxShadow.qml
-    BusyIndicator.qml
-    Button.qml
-    CheckBox.qml
-    CheckDelegate.qml
-    CheckIndicator.qml
-    ComboBox.qml
-    CursorDelegate.qml
-    DelayButton.qml
-    Dial.qml
-    Dialog.qml
-    DialogButtonBox.qml
-    Drawer.qml
-    ElevationEffect.qml
-    Frame.qml
-    GroupBox.qml
-    ItemDelegate.qml
-    Label.qml
-    Menu.qml
-    MenuBar.qml
-    MenuBarItem.qml
-    MenuItem.qml
-    MenuSeparator.qml
-    Page.qml
-    PageIndicator.qml
-    Pane.qml
-    Popup.qml
-    ProgressBar.qml
-    RadioButton.qml
-    RadioDelegate.qml
-    RadioIndicator.qml
-    RangeSlider.qml
-    RoundButton.qml
-    RectangularGlow.qml
-    ScrollBar.qml
-    ScrollIndicator.qml
-    Slider.qml
-    SliderHandle.qml
-    SpinBox.qml
-    SplitView.qml
-    StackView.qml
-    SwipeDelegate.qml
-    SwipeView.qml
-    Switch.qml
-    SwitchDelegate.qml
-    SwitchIndicator.qml
-    TabBar.qml
-    TabButton.qml
-    TextArea.qml
-    TextField.qml
-    ToolBar.qml
-    ToolButton.qml
-    ToolSeparator.qml
-    ToolTip.qml
-    Tumbler.qml
+    "ApplicationWindow.qml"
+    "BoxShadow.qml"
+    "BusyIndicator.qml"
+    "Button.qml"
+    "CheckBox.qml"
+    "CheckDelegate.qml"
+    "CheckIndicator.qml"
+    "ComboBox.qml"
+    "CursorDelegate.qml"
+    "DelayButton.qml"
+    "Dial.qml"
+    "Dialog.qml"
+    "DialogButtonBox.qml"
+    "Drawer.qml"
+    "ElevationEffect.qml"
+    "Frame.qml"
+    "GroupBox.qml"
+    "ItemDelegate.qml"
+    "Label.qml"
+    "Menu.qml"
+    "MenuBar.qml"
+    "MenuBarItem.qml"
+    "MenuItem.qml"
+    "MenuSeparator.qml"
+    "Page.qml"
+    "PageIndicator.qml"
+    "Pane.qml"
+    "Popup.qml"
+    "ProgressBar.qml"
+    "RadioButton.qml"
+    "RadioDelegate.qml"
+    "RadioIndicator.qml"
+    "RangeSlider.qml"
+    "RoundButton.qml"
+    "RectangularGlow.qml"
+    "ScrollBar.qml"
+    "ScrollIndicator.qml"
+    "Slider.qml"
+    "SliderHandle.qml"
+    "SpinBox.qml"
+    "SplitView.qml"
+    "StackView.qml"
+    "SwipeDelegate.qml"
+    "SwipeView.qml"
+    "Switch.qml"
+    "SwitchDelegate.qml"
+    "SwitchIndicator.qml"
+    "TabBar.qml"
+    "TabButton.qml"
+    "TextArea.qml"
+    "TextField.qml"
+    "ToolBar.qml"
+    "ToolButton.qml"
+    "ToolSeparator.qml"
+    "ToolTip.qml"
+    "Tumbler.qml"
 )
 
 add_qt_resource(qtquickcontrols2materialstyleplugin qmake_QtQuick_Controls_2_Material
@@ -126,7 +131,6 @@ qt_install_qml_files(qtquickcontrols2materialstyleplugin
 
 
 #### Keys ignored in scope 1:.:.:material.pro:<TRUE>:
-# CONFIG = "no_cxx_module" "install_qml_files" "builtin_resources" "qtquickcompiler"
 # IMPORT_NAME = "QtQuick.Controls.Material"
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
 # OTHER_FILES = "qmldir" "$$QML_FILES"