Skip to content

Fix build against Qt5 in Linux #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mymedia2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix build against Qt5 in Linux #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions webview/platform/linux/webview_linux_compositor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ namespace {
class Output;

class Chrome : public QWaylandQuickShellSurfaceItem {
Q_OBJECT
public:
Chrome(
Output *output,
Expand All @@ -39,6 +40,7 @@ class Chrome : public QWaylandQuickShellSurfaceItem {
};

class Output : public QWaylandQuickOutput {
Q_OBJECT
public:
Output(
QWaylandCompositor *compositor,
Expand Down Expand Up @@ -231,3 +233,5 @@ void Compositor::setWidget(QQuickWidget *widget) {
}

} // namespace Webview

#include "webview_linux_compositor.moc"
2 changes: 2 additions & 0 deletions webview/platform/linux/webview_linux_webkitgtk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -124,6 +125,7 @@ Instance::Instance(bool remoting)
}
return true;
}();
#endif // Qt >= 6.0.0
}

startProcess();
Expand Down