diff options
| author | Simon Quigley <tsimonq2@ubuntu.com> | 2018-10-10 21:16:17 -0500 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-10-11 08:46:31 +0200 |
| commit | ac9c14dbbd3a4341de0aa1b1dbc37ad2ce69398c (patch) | |
| tree | 3c9f448cc2ce28f6fbf3ff170f4702be0f239157 /vcl/source/app | |
| parent | 754cff7a3f5e6c7a8ff0aa39cc94c3246d7125ee (diff) | |
Add support for LXQt as a Linux desktop environment.
This change makes LXQt use the Breeze icon theme, and adds it as a
desktop environment along the other supported DEs.
Change-Id: I482d85620986c8fc4e33b4722b887b81c77c23bf
Reviewed-on: https://gerrit.libreoffice.org/61641
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'vcl/source/app')
| -rw-r--r-- | vcl/source/app/IconThemeSelector.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/app/salplug.cxx | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx index 3665d1ace8dc..cf18f5f2c687 100644 --- a/vcl/source/app/IconThemeSelector.cxx +++ b/vcl/source/app/IconThemeSelector.cxx @@ -57,7 +57,8 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi (void)desktopEnvironment; #else if ( desktopEnvironment.equalsIgnoreAsciiCase("kde4") || - desktopEnvironment.equalsIgnoreAsciiCase("kde5") ) { + desktopEnvironment.equalsIgnoreAsciiCase("kde5") || + desktopEnvironment.equalsIgnoreAsciiCase("lxqt") ) { r = "breeze"; } else if ( desktopEnvironment.equalsIgnoreAsciiCase("macosx") ) { diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx index 441964e3a4c3..a79339cd0ad2 100644 --- a/vcl/source/app/salplug.cxx +++ b/vcl/source/app/salplug.cxx @@ -189,7 +189,9 @@ SalInstance* autodetect_plugin() desktop == DESKTOP_XFCE || desktop == DESKTOP_MATE ) pList = pStandardFallbackList; - else if( desktop == DESKTOP_KDE4 || desktop == DESKTOP_KDE5 ) + else if( desktop == DESKTOP_KDE4 || + desktop == DESKTOP_KDE5 || + desktop == DESKTOP_LXQT ) pList = pKDEFallbackList; SalInstance* pInst = nullptr; @@ -314,7 +316,8 @@ const OUString& SalGetDesktopEnvironment() // Order to match desktops.hxx' DesktopType static const char * const desktop_strings[] = { "none", "unknown", "GNOME", "UNITY", - "XFCE", "MATE", "KDE4", "KDE5" }; + "XFCE", "MATE", "KDE4", "KDE5", + "LXQT" }; static OUString aDesktopEnvironment; if( aDesktopEnvironment.isEmpty()) { |