From 3e563542b389d1ccbbfc744695fd58ab3d06ecff Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Mon, 29 Jan 2024 13:35:18 +0100
Subject: [PATCH] QGenericUnixServices: make sure the picker returns a color

This amends b646c7b76c7787cff57bca0fde04d9f58abdfbb8 .

Pick-to: 6.6 6.5
Change-Id: Ic7183c06a93085d65b31c86380889b78c714548b
Reviewed-by: David Edmundson <davidedmundson@kde.org>
(cherry picked from commit f07d8309d6c61397677703cfa195927aee0cd50e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/gui/platform/unix/qgenericunixservices.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/gui/platform/unix/qgenericunixservices.cpp b/src/gui/platform/unix/qgenericunixservices.cpp
index 457981c23fb..bfd2556b1e6 100644
--- a/src/gui/platform/unix/qgenericunixservices.cpp
+++ b/src/gui/platform/unix/qgenericunixservices.cpp
@@ -354,9 +354,13 @@ private Q_SLOTS:
     {
         if (result != 0)
             return;
-        XDGDesktopColor color{};
-        map.value(u"color"_s).value<QDBusArgument>() >> color;
-        Q_EMIT colorPicked(color.toQColor());
+        if (map.contains(u"color"_s)) {
+            XDGDesktopColor color{};
+            map.value(u"color"_s).value<QDBusArgument>() >> color;
+            Q_EMIT colorPicked(color.toQColor());
+        } else {
+            Q_EMIT colorPicked({});
+        }
         deleteLater();
     }