diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-09-05 02:53:07 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-12-17 18:33:13 +0100 |
| commit | 410bf59de02192c2daf1158b9de76ec0ebab4c56 (patch) | |
| tree | be010e92b862f169076de979796075c925c3e576 /cui | |
| parent | 6a53832080cf201e960113de8e1887d99e857606 (diff) | |
kde5: remove older kde/tde plugins, and references to that
KDE4 is out of maintenance upstream since Nov. 2014, and binaries
provided by TDF have switched to KDE5 as the official backend.
Change-Id: I165465b56d3ba3a18912b203c06ae8fc6111c0c9
Reviewed-on: https://gerrit.libreoffice.org/60014
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/Library_cui.mk | 1 | ||||
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 4db46539816c..8ede124d16be 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -21,7 +21,6 @@ $(eval $(call gb_Library_set_precompiled_header,cui,$(SRCDIR)/cui/inc/pch/precom $(eval $(call gb_Library_add_defs,cui,\ $(if $(filter TRUE,$(ENABLE_GTK)),-DENABLE_GTK) \ - $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \ )) $(eval $(call gb_Library_use_custom_headers,cui,\ diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index bc2510fb8e7a..9fa7ce06d79b 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -206,10 +206,10 @@ OUString impl_SystemFileOpenServiceName() { const OUString &rDesktopEnvironment = Application::GetDesktopEnvironment(); - if ( rDesktopEnvironment.equalsIgnoreAsciiCase("kde4") ) + if ( rDesktopEnvironment.equalsIgnoreAsciiCase("kde5") ) { - #if ENABLE_KDE4 - return OUString("com.sun.star.ui.dialogs.KDE4FilePicker" ); + #if ENABLE_KDE5 + return OUString("com.sun.star.ui.dialogs.KDE5FilePicker" ); #else return OUString(); #endif |