diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2023-06-20 14:32:36 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2023-06-22 22:15:19 +0200 |
| commit | f5a2f4739b26428d87a2538988ed114c834f9c72 (patch) | |
| tree | 31a078bddf1b11b0dc7dc3e56a376b0022584af2 | |
| parent | 6922c2fcfec92292d763c0346b7afdc44c63d1e9 (diff) | |
kf5: Drop "5" from VCLPLUG_KF5_{IMPLEMENTATION,PUBLIC} defines
Rename those to no more include the Qt/KF version number,
since they will be used for the upcoming kf6 VCL plugin
as well.
This is basically the same as
commit 51d148c748d8e23b69ba91d3c1b5a9057bd22548
Author: Michael Weghorn <m.weghorn@posteo.de>
Date: Wed Sep 29 10:26:03 2021 +0200
qt5: Drop "5" from VCLPLUG_QT5_{IMPLEMENTATION,PUBLIC} defines
, just for the kf5 instead of the qt5 VCL plugin.
Change-Id: I9ec6d40a05ee55ff0df4869966831d6bff94f575
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153435
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
| -rw-r--r-- | vcl/Library_vclplug_kf5.mk | 2 | ||||
| -rw-r--r-- | vcl/inc/vclpluginapi.h | 6 | ||||
| -rw-r--r-- | vcl/unx/kf5/KFSalInstance.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vcl/Library_vclplug_kf5.mk b/vcl/Library_vclplug_kf5.mk index 3bc4c17d1811..4e28be29a3a6 100644 --- a/vcl/Library_vclplug_kf5.mk +++ b/vcl/Library_vclplug_kf5.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Library_set_include,vclplug_kf5,\ )) $(eval $(call gb_Library_add_defs,vclplug_kf5,\ - -DVCLPLUG_KF5_IMPLEMENTATION \ + -DVCLPLUG_KF_IMPLEMENTATION \ )) $(eval $(call gb_Library_use_sdk_api,vclplug_kf5)) diff --git a/vcl/inc/vclpluginapi.h b/vcl/inc/vclpluginapi.h index 930f080a9a9d..4211a581c979 100644 --- a/vcl/inc/vclpluginapi.h +++ b/vcl/inc/vclpluginapi.h @@ -35,10 +35,10 @@ #define VCLPLUG_GTK_PUBLIC SAL_DLLPUBLIC_IMPORT #endif -#if defined VCLPLUG_KF5_IMPLEMENTATION -#define VCLPLUG_KF5_PUBLIC SAL_DLLPUBLIC_EXPORT +#if defined VCLPLUG_KF_IMPLEMENTATION +#define VCLPLUG_KF_PUBLIC SAL_DLLPUBLIC_EXPORT #else -#define VCLPLUG_KF5_PUBLIC SAL_DLLPUBLIC_IMPORT +#define VCLPLUG_KF_PUBLIC SAL_DLLPUBLIC_IMPORT #endif #if defined VCLPLUG_OSX_IMPLEMENTATION diff --git a/vcl/unx/kf5/KFSalInstance.cxx b/vcl/unx/kf5/KFSalInstance.cxx index 7dd7d4a89678..741f01006356 100644 --- a/vcl/unx/kf5/KFSalInstance.cxx +++ b/vcl/unx/kf5/KFSalInstance.cxx @@ -68,7 +68,7 @@ KFSalInstance::createPicker(css::uno::Reference<css::uno::XComponentContext> con } extern "C" { -VCLPLUG_KF5_PUBLIC SalInstance* create_SalInstance() +VCLPLUG_KF_PUBLIC SalInstance* create_SalInstance() { static const bool bUseCairo = (nullptr == getenv("SAL_VCL_KF5_USE_QFONT")); |