From b3b6dd49baa3fa19e6c635005c091eacb4789e58 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 29 May 2023 19:06:48 +0400 Subject: [PATCH] xdgdesktopportal: Fallback to base theme if color scheme is unknown This should be better than returning unknown if xdg-desktop-portal is not running or its backend doesn't know color scheme This also matches the pratice of all other QXdgDesktopPortalTheme methods Pick-to: 6.5 Change-Id: I352e091a019bc5b683c3f1dad223e55717888d02 Reviewed-by: Jan Grulich Reviewed-by: Thiago Macieira --- .../platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp index 2f46b532974..a31c8b61050 100644 --- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp +++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp @@ -208,6 +208,8 @@ QVariant QXdgDesktopPortalTheme::themeHint(ThemeHint hint) const Qt::ColorScheme QXdgDesktopPortalTheme::colorScheme() const { Q_D(const QXdgDesktopPortalTheme); + if (d->colorScheme == Qt::ColorScheme::Unknown) + return d->baseTheme->colorScheme(); return d->colorScheme; }