summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>2020-02-22 23:08:19 +0000
committerJan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>2020-03-14 23:32:33 +0000
commitbd888a2cfb6feb2e7f6d0bce52b92b70dc2b1723 (patch)
tree880294d6fa941167ce5de4f3971d9fac5df952a0
parenta372b6ad1cb8c63fc8b27a3042aad0e50cb6b95e (diff)
Build kf55 VCL backend
Change-Id: Ie1ba0024258dc9cbbb941527cd4374c2e2b5b24e
-rw-r--r--meson.build5
-rw-r--r--vcl/meson.build45
-rw-r--r--vcl/unx/kf5/KF5FilePicker.cxx1
3 files changed, 50 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 8a41962db1ff..3890bf051652 100644
--- a/meson.build
+++ b/meson.build
@@ -167,6 +167,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.5')
mdds_dep = declare_dependency(include_directories: 'mdds')
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 0d95cd0be304..601f85816b1a 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>