diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2023-06-22 08:56:36 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2023-06-22 22:16:23 +0200 |
| commit | 06dbdb0f5b618ce01a79f07dc78e8049c419cc5f (patch) | |
| tree | ffed7334454a422a8f2a8bd49563665df1ca1651 /vcl | |
| parent | 720bf6ac8612c32942bb059f9086ee86c2963bb5 (diff) | |
Use kf6 VCL plugin by default on Plasma 6
If running in a Plasma 6 session, use the kf6
VCL plugin if available. Otherwise use the same
fallbacks as on Plasma 5 or LXQt.
Change-Id: I223002d116c896d628f6ab4e3c1246a774b5ebe9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153439
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/salplug.cxx | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx index 7f0ba2e96bb9..026867e99bf2 100644 --- a/vcl/source/app/salplug.cxx +++ b/vcl/source/app/salplug.cxx @@ -217,6 +217,26 @@ const char* const* autodetect_plugin_list() nullptr }; + static const char* const pPlasma6FallbackList[] = + { +#if ENABLE_KF6 + "kf6", +#endif +#if ENABLE_KF5 + "kf5", +#endif +#if ENABLE_GTK3_KDE5 + "gtk3_kde5", +#endif +#if ENABLE_GTK3 + "gtk3", +#endif +#if ENABLE_GEN + "gen", +#endif + nullptr + }; + static const char* const pStandardFallbackList[] = { #if ENABLE_GTK3 @@ -250,8 +270,10 @@ const char* const* autodetect_plugin_list() desktop == DESKTOP_XFCE || desktop == DESKTOP_MATE ) pList = pStandardFallbackList; - else if (desktop == DESKTOP_PLASMA5 || desktop == DESKTOP_PLASMA6 || desktop == DESKTOP_LXQT) + else if (desktop == DESKTOP_PLASMA5 || desktop == DESKTOP_LXQT) pList = pKDEFallbackList; + else if (desktop == DESKTOP_PLASMA6) + pList = pPlasma6FallbackList; return pList; } |