Remove qt5compat Module

mavlink · Nov 10, 2024 · fab8497 · fab8497
1 parent ac083a3
commit fab8497
Show file tree

Hide file tree

Showing 21 changed files with 481 additions and 51 deletions.
diff --git a/.github/actions/qt-android/action.yml b/.github/actions/qt-android/action.yml
@@ -68,7 +68,7 @@ runs:
         target: desktop
         arch: ${{ inputs.arch }}
         dir: ${{ runner.temp }}
-        modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+        modules: qtcharts qtlocation qtpositioning qtspeech qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
         cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
 
     - name: Install Qt for Android (armv7)
@@ -82,7 +82,7 @@ runs:
         arch: android_armv7
         dir: ${{ runner.temp }}
         extra: --autodesktop
-        modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+        modules: qtcharts qtlocation qtpositioning qtspeech qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
         cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
 
     - name: Install Qt for Android (arm64_v8a)
@@ -96,7 +96,7 @@ runs:
         arch: android_arm64_v8a
         dir: ${{ runner.temp }}
         extra: --autodesktop
-        modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+        modules: qtcharts qtlocation qtpositioning qtspeech qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
         cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
 
     - name: Install Qt for Android (x86)
@@ -110,7 +110,7 @@ runs:
         arch: android_x86
         dir: ${{ runner.temp }}
         extra: --autodesktop
-        modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+        modules: qtcharts qtlocation qtpositioning qtspeech qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
         cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
 
     - name: Install Qt for Android (x86_64)
@@ -124,5 +124,5 @@ runs:
         arch: android_x86_64
         dir: ${{ runner.temp }}
         extra: --autodesktop
-        modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+        modules: qtcharts qtlocation qtpositioning qtspeech qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
         cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -72,7 +72,7 @@ jobs:
           target: desktop
           arch: clang_64
           dir: ${{ runner.temp }}
-          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+          modules: qtcharts qtlocation qtpositioning qtspeech qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
           cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
 
       - name: Install Qt for iOS
@@ -85,7 +85,7 @@ jobs:
           arch: ios
           dir: ${{ runner.temp }}
           extra: --autodesktop
-          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+          modules: qtcharts qtlocation qtpositioning qtspeech qtmultimedia qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
           cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
 
       - run: mkdir ${{ runner.temp }}/shadow_build_dir

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -98,7 +98,7 @@ jobs:
           target: desktop
           arch: gcc_64
           dir: ${{ runner.temp }}
-          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+          modules: qtcharts qtlocation qtpositioning qtspeech qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
           cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
 
       # - name: Build GStreamer

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -86,7 +86,7 @@ jobs:
           target: desktop
           arch: clang_64
           dir: ${{ runner.temp }}
-          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+          modules: qtcharts qtlocation qtpositioning qtspeech qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
           cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
 
       - run: mkdir ${{ runner.temp }}/shadow_build_dir

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -94,7 +94,7 @@ jobs:
           target: desktop
           arch: win64_msvc2019_64
           dir: ${{ runner.temp }}
-          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+          modules: qtcharts qtlocation qtpositioning qtspeech qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
           cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
 
       - name: Install Qt for Windows (Arm64)
@@ -108,7 +108,7 @@ jobs:
           arch: win64_msvc2019_arm64
           dir: ${{ runner.temp }}
           extra: --autodesktop
-          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+          modules: qtcharts qtlocation qtpositioning qtspeech qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
           cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
 
       - name: Set up Visual Studio shell

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -159,7 +159,6 @@ find_package(Qt6
     COMPONENTS
         Concurrent
         Core
-        Core5Compat
         Location
         Multimedia
         Network

diff --git a/custom-example/res/Custom/Widgets/CustomAttitudeWidget.qml b/custom-example/res/Custom/Widgets/CustomAttitudeWidget.qml
@@ -10,13 +10,14 @@
  */
 
 import QtQuick
+import QtQuick.Effects
 
 import QGroundControl
 import QGroundControl.Controls
 import QGroundControl.ScreenTools
 import QGroundControl.Palette
 import QGroundControl.FlightMap
-import Qt5Compat.GraphicalEffects
+
 Item {
     id: root
 
@@ -99,18 +100,25 @@ Item {
         }
     }
 
-    Rectangle {
-        id:             mask
-        anchors.fill:   instrument
-        radius:         width / 2
-        color:          "black"
-        visible:        false
+    MultiEffect {
+        source: instrument
+        anchors.fill: instrument
+        maskEnabled: true
+        maskSource: mask
     }
 
-    OpacityMask {
-        anchors.fill:   instrument
-        source:         instrument
-        maskSource:     mask
+    Item {
+        id: mask
+        width: instrument.width
+        height: instrument.height
+        layer.enabled: true
+        visible: false
+        Rectangle {
+            width: parent.width
+            height: parent.height
+            radius: width / 2
+            color: "black"
+        }
     }
 
     Rectangle {

diff --git a/deploy/docker/Dockerfile-build-ubuntu b/deploy/docker/Dockerfile-build-ubuntu
@@ -1,7 +1,7 @@
 FROM ubuntu:22.04
 
 ARG QT_VERSION=6.6.3
-ARG QT_MODULES="qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors"
+ARG QT_MODULES="qtcharts qtlocation qtpositioning qtspeech qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors"
 
 ENV DEBIAN_FRONTEND noninteractive
 

diff --git a/deploy/vagrant/Vagrantfile b/deploy/vagrant/Vagrantfile
@@ -94,7 +94,7 @@ Vagrant.configure(2) do |config|
      version="6.6"
      host="linux"
      target="desktop"
-     modules="qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors"
+     modules="qtcharts qtlocation qtpositioning qtspeech qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors"
      su - vagrant -c "rm -rf ${dir}"
      su - vagrant -c "mkdir -p ${dir}"
      su - vagrant -c "python3 -m aqt install-qt -O ${dir} ${host} ${target} ${version} -m ${modules}"

diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml
@@ -408,27 +408,21 @@ SetupPage {
                     height: rltAltFinalField.y + rltAltFinalField.height + _margins
                     color:  ggcPal.windowShade
 
-                    Image {
+                    QGCColoredImage {
                         id:                 icon
+                        visible:            _showIcon
                         anchors.margins:    _margins
                         anchors.left:       parent.left
                         anchors.top:        parent.top
                         height:             ScreenTools.defaultFontPixelWidth * 20
                         width:              ScreenTools.defaultFontPixelWidth * 20
+                        color:              ggcPal.text
                         sourceSize.width:   width
                         mipmap:             true
                         fillMode:           Image.PreserveAspectFit
-                        visible:            false
                         source:             "/qmlimages/ReturnToHomeAltitude.svg"
                     }
 
-                    ColorOverlay {
-                        anchors.fill:   icon
-                        source:         icon
-                        color:          ggcPal.text
-                        visible:        _showIcon
-                    }
-
                     QGCRadioButton {
                         id:                 returnAtCurrentRadio
                         anchors.margins:    _margins

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2,7 +2,6 @@ find_package(Qt6
     REQUIRED
     COMPONENTS
         Core
-        Core5Compat
         QuickControls2
         QuickWidgets
         Widgets
@@ -64,7 +63,6 @@ target_link_libraries(QGC
         Qt6::Quick
         Qt6::QuickControls2
         Qt6::QuickWidgets
-        Qt6::Core5Compat
         Qt6::Bluetooth
         API
         ADSB

diff --git a/src/FlightMap/Widgets/CompassRing.qml b/src/FlightMap/Widgets/CompassRing.qml
@@ -8,6 +8,7 @@
  ****************************************************************************/
 
 import QtQuick
+import QtQuick.Effects
 
 import QGroundControl.Controls
 import QGroundControl.ScreenTools
@@ -67,18 +68,24 @@ Item {
         }
     }
 
-    Rectangle {
-        id:             mask
-        anchors.fill:   instrument
-        radius:         width / 2
-        color:          "black"
-        visible:        false
+    MultiEffect {
+        source: instrument
+        anchors.fill: instrument
+        maskEnabled: true
+        maskSource: mask
     }
 
-    OpacityMask {
-        anchors.fill:   instrument
-        source:         instrument
-        maskSource:     mask
+    Item {
+        id: mask
+        width: instrument.width
+        height: instrument.height
+        layer.enabled: true
+        visible: false
+        Rectangle {
+            width: parent.width
+            height: parent.height
+            radius: width / 2
+            color: "black"
+        }
     }
-
 }
diff --git a/src/QmlControls/CMakeLists.txt b/src/QmlControls/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(GraphicalEffects)
+
 find_package(Qt6 REQUIRED COMPONENTS Concurrent Core Gui Location Positioning Qml QmlIntegration Quick Widgets)
 
 if(QGC_UTM_ADAPTER)
@@ -72,6 +74,7 @@ target_link_libraries(QmlControls
         Geo
         GPS
         MockLink
+        qgcgraphicaleffectsplugin
     PUBLIC
         Qt6::Core
         Qt6::Gui

diff --git a/src/QmlControls/GraphicalEffects/CMakeLists.txt b/src/QmlControls/GraphicalEffects/CMakeLists.txt
@@ -0,0 +1,27 @@
+find_package(Qt6 REQUIRED COMPONENTS Core Qml Quick)
+
+qt_add_qml_module(qgcgraphicaleffectsplugin
+    URI "QGroundControl.GraphicalEffects"
+    VERSION 1.0
+    STATIC
+    CLASS_NAME QGCGraphicalEffectsPlugin
+    PLUGIN_TARGET qgcgraphicaleffectsplugin
+    NO_GENERATE_PLUGIN_SOURCE
+    NO_PLUGIN_OPTIONAL
+    RESOURCE_PREFIX "/qt/qml"
+    QML_FILES "ColorOverlay.qml"
+    RESOURCES "coloroverlay.frag.qsb"
+    SOURCES
+        plugin.cpp
+        qgfxsourceproxy.cpp
+        qgfxsourceproxy_p.h
+)
+
+target_include_directories(qgcgraphicaleffectsplugin PUBLIC ${Qt6Quick_PRIVATE_INCLUDE_DIRS})
+
+target_link_libraries(qgcgraphicaleffectsplugin
+    PUBLIC
+        Qt::Core
+        Qt::Qml
+        Qt::Quick
+)