1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QGenericUnixServices: make sure the picker returns a color

Browse Source 
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>
This commit is contained in:
Liang Qi 2024-01-29 13:35:18 +01:00 committed by Qt Cherry-pick Bot
parent e32853b75d
commit 3e563542b3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/platform/unix/qgenericunixservices.cpp
View File

@ -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();
}