From b3aebd476b713c992b0a36ee3bdf3da406820e18 Mon Sep 17 00:00:00 2001 From: Nicholas Guriev Date: Sat, 2 Sep 2023 19:22:42 +0300 Subject: [PATCH] Fix build against Qt5 in Linux --- CMakeLists.txt | 2 ++ webview/platform/linux/webview_linux_compositor.cpp | 4 ++++ webview/platform/linux/webview_linux_webkitgtk.cpp | 2 ++ 3 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 18ed682..d1a2602 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,8 @@ PUBLIC ${src_loc} ) +set_target_properties(lib_webview PROPERTIES AUTOMOC ON) + target_link_libraries(lib_webview PUBLIC desktop-app::lib_ui diff --git a/webview/platform/linux/webview_linux_compositor.cpp b/webview/platform/linux/webview_linux_compositor.cpp index a252d54..830dd46 100644 --- a/webview/platform/linux/webview_linux_compositor.cpp +++ b/webview/platform/linux/webview_linux_compositor.cpp @@ -21,6 +21,7 @@ namespace { class Output; class Chrome : public QWaylandQuickShellSurfaceItem { + Q_OBJECT public: Chrome( Output *output, @@ -39,6 +40,7 @@ class Chrome : public QWaylandQuickShellSurfaceItem { }; class Output : public QWaylandQuickOutput { + Q_OBJECT public: Output( QWaylandCompositor *compositor, @@ -231,3 +233,5 @@ void Compositor::setWidget(QQuickWidget *widget) { } } // namespace Webview + +#include "webview_linux_compositor.moc" diff --git a/webview/platform/linux/webview_linux_webkitgtk.cpp b/webview/platform/linux/webview_linux_webkitgtk.cpp index 631414e..bee1434 100644 --- a/webview/platform/linux/webview_linux_webkitgtk.cpp +++ b/webview/platform/linux/webview_linux_webkitgtk.cpp @@ -109,6 +109,7 @@ Instance::Instance(bool remoting) : _remoting(remoting) { if (_remoting) { if ((_wayland = ProvidesQWidget())) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) [[maybe_unused]] static const auto Inited = [] { const auto backend = Ui::GL::ChooseBackendDefault( Ui::GL::CheckCapabilities(nullptr)); @@ -124,6 +125,7 @@ Instance::Instance(bool remoting) } return true; }(); +#endif // Qt >= 6.0.0 } startProcess();