Fix colorized icon with Qt5Compat.GraphicalEffects instead MultiEffec…

…t from Qt6 At the moment, MultiEffect has limitations in its operation. It does not work with black images. Therefore, the most logical solution would be to use the features from Qt5
mavlink · Apr 7, 2024 · b062191 · b062191
1 parent 94912ee
commit b062191
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -81,6 +81,7 @@ find_package(Qt6
         TextToSpeech
         Widgets
         Xml
+        Core5Compat
     OPTIONAL_COMPONENTS
         LinguistTools
         SerialPort

diff --git a/QGCPostLinkCommon.pri b/QGCPostLinkCommon.pri
@@ -120,7 +120,8 @@ LinuxBuild {
         libQt6LabsAnimation.so.6 \
         libQt6Positioning.so.6 \
         libQt6QuickDialogs2.so.6 \
-        libQt6Sql.so.6
+        libQt6Sql.so.6 \
+        libQt6Core5Compat.so.6
 
     # Not all Qt libs are built in all systems. CI doesn't build Wayland, for example.
     QT_LIB_OPTIONALS = ""

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
@@ -257,7 +257,8 @@ QT += \
     xml \
     texttospeech \
     core-private \
-    quick3d
+    quick3d \
+    core5compat
 
 # Multimedia only used if QVC is enabled
 !contains (DEFINES, QGC_DISABLE_UVC) {

diff --git a/src/QmlControls/QGCColoredImage.qml b/src/QmlControls/QGCColoredImage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Effects
+import Qt5Compat.GraphicalEffects
 
 import QGroundControl.Palette
 
@@ -35,10 +35,9 @@ Item {
         sourceSize.height:  height
     }
 
-    MultiEffect {
-        source: image
-        anchors.fill: image
-        colorizationColor: parent.color
-        colorization: 1.0
+    ColorOverlay {
+        anchors.fill:       image
+        source:             image
+        color:              parent.color
     }
 }