diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-10-21 13:50:30 +0000 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-11-06 12:05:31 +0100 |
| commit | 9335945c7cb215f387ed1444e28533fac437c6e8 (patch) | |
| tree | d4bdbf17d4272f9d4ee32d57275883f79ad200b8 /vcl/inc | |
| parent | f69be03d72fbaa535adc8b06475d2806283b79ab (diff) | |
KF5 initial VCL plugin
Something that compiles, basically just interface stubs.
All used Svp classes don't use any cairo.
Change-Id: I9a8858c930989438cc2a3f3346c01a7abc579d62
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/jobset.h | 2 | ||||
| -rw-r--r-- | vcl/inc/salgdi.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/unx/gendata.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/vclpluginapi.h | 6 |
4 files changed, 9 insertions, 3 deletions
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h index 35a706536b45..dc04e9a54bd1 100644 --- a/vcl/inc/jobset.h +++ b/vcl/inc/jobset.h @@ -29,7 +29,7 @@ #define JOBSETUP_SYSTEM_UNIX 3 #define JOBSETUP_SYSTEM_MAC 4 -class ImplJobSetup +class VCL_PLUGIN_PUBLIC ImplJobSetup { private: sal_uInt16 mnSystem; //< System - JOBSETUP_SYSTEM_xxxx diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 1a9157ca9747..a368630ebd74 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -21,6 +21,7 @@ #define INCLUDED_VCL_INC_SALGDI_HXX #include <vcl/metric.hxx> +#include <vcl/sysdata.hxx> #include "impfontmetricdata.hxx" #include "salgdiimpl.hxx" @@ -45,7 +46,6 @@ class OpenGLContext; class OutputDevice; class FreetypeFont; class CommonSalLayout; -struct SystemGraphicsData; #if ENABLE_CAIRO_CANVAS struct SystemFontData; diff --git a/vcl/inc/unx/gendata.hxx b/vcl/inc/unx/gendata.hxx index fda6680a962a..4410f435ba86 100644 --- a/vcl/inc/unx/gendata.hxx +++ b/vcl/inc/unx/gendata.hxx @@ -23,7 +23,7 @@ enum GenericUnixSalDataType { SAL_DATA_GTK, SAL_DATA_GTK3, SAL_DATA_KDE4, SAL_DATA_KDE5, SAL_DATA_UNX, SAL_DATA_SVP, SAL_DATA_ANDROID, SAL_DATA_IOS, - SAL_DATA_HEADLESS }; + SAL_DATA_HEADLESS, SAL_DATA_KF5 }; class VCL_DLLPUBLIC GenericUnixSalData : public SalData { diff --git a/vcl/inc/vclpluginapi.h b/vcl/inc/vclpluginapi.h index 3901b1218d82..41567284c99e 100644 --- a/vcl/inc/vclpluginapi.h +++ b/vcl/inc/vclpluginapi.h @@ -41,6 +41,12 @@ #define VCLPLUG_KDE4_PUBLIC SAL_DLLPUBLIC_IMPORT #endif +#if defined VCLPLUG_KF5_IMPLEMENTATION +#define VCLPLUG_KF5_PUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define VCLPLUG_KF5_PUBLIC SAL_DLLPUBLIC_IMPORT +#endif + #if defined VCLPLUG_SVP_IMPLEMENTATION #define VCLPLUG_SVP_PUBLIC SAL_DLLPUBLIC_EXPORT #else |