demo_threading: provide proxies for Qt 5 and 6 with graphical effects

Author: ahayzen-kdab

examples/demo_threading/CMakeLists.txt

@@ -49,6 +49,13 @@ target_link_libraries(${CRATE} INTERFACE
     Qt::QuickControls2
 )
 
+# Qt Graphical Effects imports changed in Qt 6 so provide proxies
+if(QT_VERSION LESS 6.0.0)
+    set(QML_COMPAT_RESOURCES qml/compat/compat_qt5.qrc)
+else()
+    set(QML_COMPAT_RESOURCES qml/compat/compat_qt6.qrc)
+endif()
+
 add_executable(${APP_NAME}
     cpp/helpers/energyusageproxymodel.h
     cpp/helpers/energyusageproxymodel.cpp
@@ -57,6 +64,7 @@ add_executable(${APP_NAME}
     cpp/helpers/sensor.cpp
     images/images.qrc
     qml/qml.qrc
+    ${QML_COMPAT_RESOURCES}
 )
 
 target_link_libraries(${APP_NAME} PRIVATE

examples/demo_threading/qml/MainWindow.qml

@@ -5,8 +5,8 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 import QtQuick 2.12
 import QtQuick.Window 2.12
+
 import com.kdab.energy 1.0
-import QtGraphicalEffects 1.10
 
 Window {
     id: root

examples/demo_threading/qml/Panel.qml

@@ -3,7 +3,6 @@
 //
 // SPDX-License-Identifier: MIT OR Apache-2.0
 import QtQuick 2.12
-import QtGraphicalEffects 1.10
 
 Item {
     id: root

examples/demo_threading/qml/SensorUI.qml

@@ -4,7 +4,8 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 import QtQuick 2.12
-import QtGraphicalEffects 1.10
+
+import "qrc:/compat" as Compat
 
 Item {
     id: sensorUI
@@ -53,7 +54,7 @@ Item {
         }
     }
 
-    ConicalGradient {
+    Compat.ConicalGradient {
         id: angle
         anchors.margins: -15
         anchors.fill: parent
@@ -67,7 +68,7 @@ Item {
         visible: false
     }
 
-    OpacityMask {
+    Compat.OpacityMask {
         anchors.fill: efect
         maskSource: efect
         source: angle

examples/demo_threading/qml/compat/ConicalGradientQt5.qml

@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+// SPDX-FileContributor: Andrew Hayzen <[email protected]>
+
+// SPDX-License-Identifier: MIT OR Apache-2.0
+
+import QtQuick 2.12
+
+import QtGraphicalEffects 1.10
+
+ConicalGradient {
+
+}

examples/demo_threading/qml/compat/ConicalGradientQt6.qml

@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+// SPDX-FileContributor: Andrew Hayzen <[email protected]>
+
+// SPDX-License-Identifier: MIT OR Apache-2.0
+
+import QtQuick 2.12
+
+import Qt5Compat.GraphicalEffects
+
+ConicalGradient {
+
+}

examples/demo_threading/qml/compat/OpacityMaskQt5.qml

@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+// SPDX-FileContributor: Andrew Hayzen <[email protected]>
+
+// SPDX-License-Identifier: MIT OR Apache-2.0
+
+import QtQuick 2.12
+
+import QtGraphicalEffects 1.10
+
+OpacityMask {
+
+}

examples/demo_threading/qml/compat/OpacityMaskQt6.qml

@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+// SPDX-FileContributor: Andrew Hayzen <[email protected]>
+
+// SPDX-License-Identifier: MIT OR Apache-2.0
+
+import QtQuick 2.12
+
+import Qt5Compat.GraphicalEffects
+
+OpacityMask {
+
+}

examples/demo_threading/qml/compat/compat_qt5.qrc

@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/compat">
+        <file alias="ConicalGradient">ConicalGradientQt5.qml</file>
+        <file alias="OpacityMask">OpacityMaskQt5.qml</file>
+    </qresource>
+</RCC>

examples/demo_threading/qml/compat/compat_qt5.qrc.license

@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+# SPDX-FileContributor: Andrew Hayzen <[email protected]>
+# SPDX-License-Identifier: MIT OR Apache-2.0