summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>2020-02-22 23:08:03 +0000
committerJan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>2020-03-14 23:32:30 +0000
commita372b6ad1cb8c63fc8b27a3042aad0e50cb6b95e (patch)
tree3c3287a7200e253bec212324eb2c341ddb651b53
parente54b30b2684e542927169e6b8de7fe01b9152c01 (diff)
Build qt5 VCL backend
Change-Id: Id29470e1c31e34b772832ce40bd390e708122c8e
-rw-r--r--meson.build4
-rw-r--r--vcl/meson.build83
-rw-r--r--vcl/qt5/Qt5AccessibleWidget.cxx1
-rw-r--r--vcl/qt5/Qt5Clipboard.cxx1
-rw-r--r--vcl/qt5/Qt5FilePicker.cxx1
-rw-r--r--vcl/qt5/Qt5Frame.cxx1
-rw-r--r--vcl/qt5/Qt5Instance.cxx1
-rw-r--r--vcl/qt5/Qt5MainWindow.cxx1
-rw-r--r--vcl/qt5/Qt5Menu.cxx1
-rw-r--r--vcl/qt5/Qt5Object.cxx1
-rw-r--r--vcl/qt5/Qt5Timer.cxx1
-rw-r--r--vcl/qt5/Qt5Widget.cxx1
-rw-r--r--vcl/qt5/Qt5XAccessible.cxx1
13 files changed, 87 insertions, 11 deletions
diff --git a/meson.build b/meson.build
index 1a6f07f6f463..8a41962db1ff 100644
--- a/meson.build
+++ b/meson.build
@@ -163,6 +163,10 @@ hyphen_dep = cpp.find_library('hyphen')
mythes_dep = dependency('mythes')
libexttextcat_dep = dependency('libexttextcat')
+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.5')
mdds_dep = declare_dependency(include_directories: 'mdds')
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 dd062e369c46..e14eae593e19 100644
--- a/vcl/qt5/Qt5AccessibleWidget.cxx
+++ b/vcl/qt5/Qt5AccessibleWidget.cxx
@@ -18,7 +18,6 @@
*/
#include <Qt5AccessibleWidget.hxx>
-#include <Qt5AccessibleWidget.moc>
#include <QtGui/QAccessibleInterface>
diff --git a/vcl/qt5/Qt5Clipboard.cxx b/vcl/qt5/Qt5Clipboard.cxx
index cadedbfd327e..6bd9ef2b7664 100644
--- a/vcl/qt5/Qt5Clipboard.cxx
+++ b/vcl/qt5/Qt5Clipboard.cxx
@@ -9,7 +9,6 @@
*/
#include <Qt5Clipboard.hxx>
-#include <Qt5Clipboard.moc>
#include <cppuhelper/supportsservice.hxx>
#include <sal/log.hxx>
diff --git a/vcl/qt5/Qt5FilePicker.cxx b/vcl/qt5/Qt5FilePicker.cxx
index d37c28b33c11..386e890c3ef5 100644
--- a/vcl/qt5/Qt5FilePicker.cxx
+++ b/vcl/qt5/Qt5FilePicker.cxx
@@ -18,7 +18,6 @@
*/
#include <Qt5FilePicker.hxx>
-#include <Qt5FilePicker.moc>
#include <Qt5Frame.hxx>
#include <Qt5Tools.hxx>
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 905e542a65b0..b56933d3d2a3 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -18,7 +18,6 @@
*/
#include <Qt5Frame.hxx>
-#include <Qt5Frame.moc>
#include <Qt5Data.hxx>
#include <Qt5DragAndDrop.hxx>
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 1a0f10864e41..970373ff86bc 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -18,7 +18,6 @@
*/
#include <Qt5Instance.hxx>
-#include <Qt5Instance.moc>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
diff --git a/vcl/qt5/Qt5MainWindow.cxx b/vcl/qt5/Qt5MainWindow.cxx
index a2a0d6cea86f..79d72488b70f 100644
--- a/vcl/qt5/Qt5MainWindow.cxx
+++ b/vcl/qt5/Qt5MainWindow.cxx
@@ -9,7 +9,6 @@
*/
#include <Qt5MainWindow.hxx>
-#include <Qt5MainWindow.moc>
#include <Qt5AccessibleWidget.hxx>
#include <QtGui/QAccessible>
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index b2e752faedaa..e6f0fde24658 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -8,7 +8,6 @@
*/
#include <Qt5Menu.hxx>
-#include <Qt5Menu.moc>
#include <Qt5Frame.hxx>
#include <Qt5Instance.hxx>
diff --git a/vcl/qt5/Qt5Object.cxx b/vcl/qt5/Qt5Object.cxx
index 5bbfef5a5870..3bef055747ca 100644
--- a/vcl/qt5/Qt5Object.cxx
+++ b/vcl/qt5/Qt5Object.cxx
@@ -18,7 +18,6 @@
*/
#include <Qt5Object.hxx>
-#include <Qt5Object.moc>
#include <Qt5Frame.hxx>
#include <Qt5Widget.hxx>
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 <Qt5Timer.hxx>
-#include <Qt5Timer.moc>
#include <QtWidgets/QApplication>
#include <QtCore/QThread>
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 70f480364f57..477fbc0ccaa0 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -18,7 +18,6 @@
*/
#include <Qt5Widget.hxx>
-#include <Qt5Widget.moc>
#include <Qt5Frame.hxx>
#include <Qt5Graphics.hxx>
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 <Qt5XAccessible.hxx>
-#include <Qt5XAccessible.moc>
#include <Qt5Frame.hxx>
#include <Qt5Tools.hxx>