diff options
| author | Liang Qi <liang.qi@qt.io> | 2024-01-29 13:35:18 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2024-02-03 21:40:13 +0100 |
| commit | f07d8309d6c61397677703cfa195927aee0cd50e (patch) | |
| tree | 4796fff1a60865830ce7ddfa73ad356cb2b489e5 /src/gui/platform/unix/qgenericunixservices.cpp | |
| parent | c5f22c54cbff8c31ab9e5111e74faae4e188e99b (diff) | |
QGenericUnixServices: make sure the picker returns a color
This amends b646c7b76c7787cff57bca0fde04d9f58abdfbb8 .
Pick-to: 6.7 6.6 6.5
Change-Id: Ic7183c06a93085d65b31c86380889b78c714548b
Reviewed-by: David Edmundson <davidedmundson@kde.org>
Diffstat (limited to 'src/gui/platform/unix/qgenericunixservices.cpp')
| -rw-r--r-- | src/gui/platform/unix/qgenericunixservices.cpp | 10 |
1 files 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(); } |