[Libreoffice-commits] core.git: vcl/unx

[Abhyudaya Sharma]

 vcl/unx/generic/plugadapt/salplug.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit f2bf002e90bf5cc74cf190d66507e59b78ba73e9
Author: Abhyudaya Sharma <sharmaabhyudaya at gmail.com>
Date:   Wed Jun 13 16:19:40 2018 +0530

    Add autodetection for KDE5 VCL Plugin
    
    Change-Id: I91f8a780d53e5a36b8c67706aeb58f57a4b6ea18
    Reviewed-on: https://gerrit.libreoffice.org/55746
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    Tested-by: Jenkins

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index b7ed29a22f5d..41039c0584f8 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -163,6 +163,9 @@ static SalInstance* autodetect_plugin()
 {
     static const char* const pKDEFallbackList[] =
     {
+#if ENABLE_KDE5
+       "kde5",
+#endif
 #if ENABLE_GTK3_KDE5
         "gtk3_kde5",
 #endif
@@ -233,7 +236,7 @@ SalInstance *CreateSalInstance()
 
     // fallback, try everything
     static const char* const pPlugin[] = {
-        "gtk3", "gtk", "kde4", "kde", "tde", "gen" };
+        "gtk3", "gtk", "kde5", "kde4", "kde", "tde", "gen" };
 
     for ( int i = 0; !pInst && i != SAL_N_ELEMENTS(pPlugin); ++i )
         pInst = tryInstance( OUString::createFromAscii( pPlugin[ i ] ) );
@@ -314,4 +317,4 @@ SalData::~SalData() COVERITY_NOEXCEPT_FALSE
     psp::PrinterInfoManager::release();
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file