From 0f5fb6ac42699c035bfe655efef76d42660eb0b1 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Sat, 22 Feb 2020 23:08:03 +0000 Subject: Build qt5 VCL backend Change-Id: Id29470e1c31e34b772832ce40bd390e708122c8e --- meson.build | 4 ++ vcl/meson.build | 83 +++++++++++++++++++++++++++++++++++++++++ vcl/qt5/Qt5AccessibleWidget.cxx | 1 - vcl/qt5/Qt5Clipboard.cxx | 1 - vcl/qt5/Qt5FilePicker.cxx | 1 - vcl/qt5/Qt5Frame.cxx | 1 - vcl/qt5/Qt5Instance.cxx | 1 - vcl/qt5/Qt5MainWindow.cxx | 1 - vcl/qt5/Qt5Menu.cxx | 1 - vcl/qt5/Qt5Object.cxx | 1 - vcl/qt5/Qt5Timer.cxx | 1 - vcl/qt5/Qt5Widget.cxx | 1 - vcl/qt5/Qt5XAccessible.cxx | 1 - 13 files changed, 87 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index 7b5b5ca3eefc..b6337fa3ad0b 100644 --- a/meson.build +++ b/meson.build @@ -165,6 +165,10 @@ mythes_dep = dependency('mythes') libexttextcat_dep = dependency('libexttextcat') numbertext_dep = dependency('libnumbertext') +qt5 = import('qt5') +qt5_dep = dependency('qt5', modules: ['Core', 'Gui', 'Widgets']) +qt5_x11_dep = dependency('qt5', modules: ['X11Extras']) + # 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 dcbdb95d7747..1c44908e820f 100644 --- a/vcl/meson.build +++ b/vcl/meson.build @@ -657,3 +657,86 @@ desktopdetector_lib = shared_library('desktopdetector', dependencies: [x11_dep], install: true, ) + +vclplug_qt5_moc = qt5.preprocess( + moc_headers : [ + 'inc/qt5/Qt5AccessibleWidget.hxx', + 'inc/qt5/Qt5Clipboard.hxx', + 'inc/qt5/Qt5FilePicker.hxx', + 'inc/qt5/Qt5Frame.hxx', + 'inc/qt5/Qt5Instance.hxx', + 'inc/qt5/Qt5MainWindow.hxx', + 'inc/qt5/Qt5Menu.hxx', + 'inc/qt5/Qt5Object.hxx', + 'inc/qt5/Qt5Timer.hxx', + 'inc/qt5/Qt5Widget.hxx', + 'inc/qt5/Qt5XAccessible.hxx' + ], + include_directories: 'inc/qt5', + dependencies: [ qt5_dep ], +) + +vclplug_qt5 = shared_library('vclplug_qt5lo', + 'qt5/Qt5AccessibleEventListener.cxx', + 'qt5/Qt5AccessibleWidget.cxx', + 'qt5/Qt5Bitmap.cxx', + 'qt5/Qt5Clipboard.cxx', + 'qt5/Qt5Data.cxx', + 'qt5/Qt5DragAndDrop.cxx', + 'qt5/Qt5FilePicker.cxx', + 'qt5/Qt5Font.cxx', + 'qt5/Qt5FontFace.cxx', + 'qt5/Qt5Frame.cxx', + 'qt5/Qt5Graphics.cxx', + 'qt5/Qt5Graphics_Controls.cxx', + 'qt5/Qt5Graphics_GDI.cxx', + 'qt5/Qt5Graphics_Text.cxx', + 'qt5/Qt5Instance.cxx', + 'qt5/Qt5Instance_Print.cxx', + 'qt5/Qt5MainWindow.cxx', + 'qt5/Qt5Menu.cxx', + 'qt5/Qt5Object.cxx', + 'qt5/Qt5OpenGLContext.cxx', + 'qt5/Qt5Painter.cxx', + 'qt5/Qt5Printer.cxx', + 'qt5/Qt5SvpGraphics.cxx', + 'qt5/Qt5SvpSurface.cxx', + 'qt5/Qt5System.cxx', + 'qt5/Qt5Timer.cxx', + 'qt5/Qt5Tools.cxx', + 'qt5/Qt5Transferable.cxx', + 'qt5/Qt5VirtualDevice.cxx', + 'qt5/Qt5Widget.cxx', + 'qt5/Qt5XAccessible.cxx', + vclplug_qt5_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_QT5_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, + ], + dependencies: [ + cairo_dep, + epoxy_dep, + harfbuzz_dep, + qt5_dep, + qt5_x11_dep, + ], + install : true, +) + diff --git a/vcl/qt5/Qt5AccessibleWidget.cxx b/vcl/qt5/Qt5AccessibleWidget.cxx index 879c451ec277..4b9dc4401cae 100644 --- a/vcl/qt5/Qt5AccessibleWidget.cxx +++ b/vcl/qt5/Qt5AccessibleWidget.cxx @@ -18,7 +18,6 @@ */ #include -#include #include diff --git a/vcl/qt5/Qt5Clipboard.cxx b/vcl/qt5/Qt5Clipboard.cxx index 8720cfe44310..5f30c0d7dd13 100644 --- a/vcl/qt5/Qt5Clipboard.cxx +++ b/vcl/qt5/Qt5Clipboard.cxx @@ -9,7 +9,6 @@ */ #include -#include #include #include diff --git a/vcl/qt5/Qt5FilePicker.cxx b/vcl/qt5/Qt5FilePicker.cxx index 18e24580107e..4de8d982a5b8 100644 --- a/vcl/qt5/Qt5FilePicker.cxx +++ b/vcl/qt5/Qt5FilePicker.cxx @@ -18,7 +18,6 @@ */ #include -#include #include #include diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx index f8f8d20dae6f..0fa154109e50 100644 --- a/vcl/qt5/Qt5Frame.cxx +++ b/vcl/qt5/Qt5Frame.cxx @@ -18,7 +18,6 @@ */ #include -#include #include #include diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx index 5afbd8722418..583d421b0dac 100644 --- a/vcl/qt5/Qt5Instance.cxx +++ b/vcl/qt5/Qt5Instance.cxx @@ -18,7 +18,6 @@ */ #include -#include #include diff --git a/vcl/qt5/Qt5MainWindow.cxx b/vcl/qt5/Qt5MainWindow.cxx index 45d726ba22be..3cede20ea705 100644 --- a/vcl/qt5/Qt5MainWindow.cxx +++ b/vcl/qt5/Qt5MainWindow.cxx @@ -9,7 +9,6 @@ */ #include -#include #include #include diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx index b743197c8aa6..9255eca3b9cf 100644 --- a/vcl/qt5/Qt5Menu.cxx +++ b/vcl/qt5/Qt5Menu.cxx @@ -8,7 +8,6 @@ */ #include -#include #include #include diff --git a/vcl/qt5/Qt5Object.cxx b/vcl/qt5/Qt5Object.cxx index 631321681daa..87f705473d31 100644 --- a/vcl/qt5/Qt5Object.cxx +++ b/vcl/qt5/Qt5Object.cxx @@ -18,7 +18,6 @@ */ #include -#include #include #include diff --git a/vcl/qt5/Qt5Timer.cxx b/vcl/qt5/Qt5Timer.cxx index bbc2800e868d..c7d4d718a773 100644 --- a/vcl/qt5/Qt5Timer.cxx +++ b/vcl/qt5/Qt5Timer.cxx @@ -18,7 +18,6 @@ */ #include -#include #include #include diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx index a2bf8fe6472d..8ab632f8a267 100644 --- a/vcl/qt5/Qt5Widget.cxx +++ b/vcl/qt5/Qt5Widget.cxx @@ -18,7 +18,6 @@ */ #include -#include #include #include diff --git a/vcl/qt5/Qt5XAccessible.cxx b/vcl/qt5/Qt5XAccessible.cxx index e9f0804d5061..89cfca55a89b 100644 --- a/vcl/qt5/Qt5XAccessible.cxx +++ b/vcl/qt5/Qt5XAccessible.cxx @@ -8,7 +8,6 @@ */ #include -#include #include #include -- cgit v1.2.3