diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-04-10 16:20:32 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-06-01 10:06:23 +0200 |
| commit | 3a0b3d3fa7ed8984908c4b6c54ae135cc0683051 (patch) | |
| tree | 835da060a7088feaf913cdef1644079e957f7e97 /vcl | |
| parent | 69cc9ae6527c1671ecf39e6d1f1e92fa4d113c6c (diff) | |
KDE5SalInstance derives from Qt5Instance
again, Qt5Instance needs to be made DLLPUBLIC
Change-Id: I8645f0898183fd9bc2ac40110846b98e6b6447d6
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/qt5/Qt5Instance.hxx | 3 | ||||
| -rw-r--r-- | vcl/unx/kde5/KDE5SalInstance.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/kde5/KDE5SalInstance.hxx | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx index 0a4892c15533..71b816a83be4 100644 --- a/vcl/inc/qt5/Qt5Instance.hxx +++ b/vcl/inc/qt5/Qt5Instance.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vclpluginapi.h> #include <unx/geninst.h> #include <salusereventlist.hxx> @@ -30,7 +31,7 @@ class QApplication; class SalYieldMutex; class SalFrame; -class Qt5Instance : public QObject, public SalGenericInstance, public SalUserEventList +class VCLPLUG_QT5_PUBLIC Qt5Instance : public QObject, public SalGenericInstance, public SalUserEventList { Q_OBJECT diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx index 0f0a5daf8c74..31c55e3436bd 100644 --- a/vcl/unx/kde5/KDE5SalInstance.cxx +++ b/vcl/unx/kde5/KDE5SalInstance.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star; KDE5SalInstance::KDE5SalInstance(SalYieldMutex* pMutex) - :SvpSalInstance( pMutex ) + :Qt5Instance( pMutex, true ) { ImplSVData* pSVData = ImplGetSVData(); delete pSVData->maAppData.mpToolkitName; diff --git a/vcl/unx/kde5/KDE5SalInstance.hxx b/vcl/unx/kde5/KDE5SalInstance.hxx index c61a63a8e271..7b549a18c08d 100644 --- a/vcl/unx/kde5/KDE5SalInstance.hxx +++ b/vcl/unx/kde5/KDE5SalInstance.hxx @@ -20,13 +20,14 @@ #pragma once #include <headless/svpinst.hxx> +#include <qt5/Qt5Instance.hxx> #include "KDE5SalFrame.hxx" class SalYieldMutex; class SalFrame; class KDE5XLib; -class KDE5SalInstance : public SvpSalInstance +class KDE5SalInstance : public Qt5Instance { protected: |