diff options
| author | Jan-Marek Glogowski <jan-marek.glogowski@extern.cib.de> | 2020-02-22 23:08:19 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-04-07 16:17:22 +0000 |
| commit | 1250daaf1149ee0980b34faf4da72c668c225e21 (patch) | |
| tree | f9a72c035be303c1fdbbb472c123c9bfbab1611f | |
| parent | 0f5fb6ac42699c035bfe655efef76d42660eb0b1 (diff) | |
Build kf55 VCL backend
Change-Id: Ie1ba0024258dc9cbbb941527cd4374c2e2b5b24e
| -rw-r--r-- | meson.build | 5 | ||||
| -rw-r--r-- | vcl/meson.build | 45 | ||||
| -rw-r--r-- | vcl/unx/kf5/KF5FilePicker.cxx | 1 |
3 files changed, 50 insertions, 1 deletions
diff --git a/meson.build b/meson.build index b6337fa3ad0b..e7808e8e65c4 100644 --- a/meson.build +++ b/meson.build @@ -169,6 +169,11 @@ qt5 = import('qt5') qt5_dep = dependency('qt5', modules: ['Core', 'Gui', 'Widgets']) qt5_x11_dep = dependency('qt5', modules: ['X11Extras']) +kf5_kio_filewidgets_dep = dependency('KF5KIO', modules: ['KF5::KIOFileWidgets']) +kf5_i18n_dep = dependency('KF5I18n') +kf5_config_dep = dependency('KF5KIO', modules: 'KF5::ConfigCore') +kf5_winsys_dep = dependency('KF5WindowSystem') + # The version in Ubuntu eoan is too old. mdds_dep = dependency('mdds-1.6', version: '>=1.6.0', diff --git a/vcl/meson.build b/vcl/meson.build index 1c44908e820f..da938ede5110 100644 --- a/vcl/meson.build +++ b/vcl/meson.build @@ -740,3 +740,48 @@ vclplug_qt5 = shared_library('vclplug_qt5lo', install : true, ) +vclplug_kf5_moc = qt5.preprocess( + moc_headers : [ + 'unx/kf5/KF5FilePicker.hxx' + ], + include_directories: [ 'inc/qt5', 'unx/kf5' ], + dependencies: [ qt5_dep ] +) + +vclplug_kf5 = shared_library('vclplug_kf5lo', + 'unx/kf5/KF5FilePicker.cxx', + 'unx/kf5/KF5SalFrame.cxx', + 'unx/kf5/KF5SalInstance.cxx', + vclplug_kf5_moc, + udk_fake_h, off_fake_h, common_hxx, + include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'inc/qt5', setup_inc], + cpp_args: ['-DLIBO_INTERNAL_ONLY', + '-DVCLPLUG_KF5_IMPLEMENTATION', + '-Wno-deprecated-declarations'], + link_with: [ + basegfx_lib, + comphelper_lib, + cppu_lib, + cppuhelper_lib, + i18nlangtag_lib, + i18nutil_lib, + sal_lib, + salhelper_lib, + sot_lib, + svl_lib, + tl_lib, + ucbhelper_lib, + utl_lib, + vcl_lib, + vclplug_qt5, + ], + dependencies: [ + cairo_dep, + harfbuzz_dep, + kf5_config_dep, + kf5_i18n_dep, + kf5_kio_filewidgets_dep, + qt5_dep, + ], + install : true, +) diff --git a/vcl/unx/kf5/KF5FilePicker.cxx b/vcl/unx/kf5/KF5FilePicker.cxx index 20e64007bd96..c2e979db21ba 100644 --- a/vcl/unx/kf5/KF5FilePicker.cxx +++ b/vcl/unx/kf5/KF5FilePicker.cxx @@ -18,7 +18,6 @@ */ #include "KF5FilePicker.hxx" -#include <KF5FilePicker.moc> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <cppuhelper/supportsservice.hxx> |