Merge pull request #1761 from Begasus/haiku

No wayland on Haiku, fixes build errors
pull/1776/head
DeepBlueV7.X 5 months ago committed by GitHub
commit 2f17cf6416
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 3
      src/main.cpp

@ -250,7 +250,8 @@ main(int argc, char *argv[])
#if __has_include(<QtGui/qpa/qplatformwindow_p.h>) && \ #if __has_include(<QtGui/qpa/qplatformwindow_p.h>) && \
((QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) && QT_CONFIG(wayland)) || \ ((QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) && QT_CONFIG(wayland)) || \
(QT_VERSION < QT_VERSION_CHECK(6, 7, 0) && defined(Q_OS_UNIX) && !defined(Q_OS_MACOS))) (QT_VERSION < QT_VERSION_CHECK(6, 7, 0) && defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) \
&& !defined(Q_OS_HAIKU)))
// getting a valid activation token on wayland is a bit of a pain, it works most reliably // getting a valid activation token on wayland is a bit of a pain, it works most reliably
// when you have an actual window, that has the focus... // when you have an actual window, that has the focus...
auto waylandApp = app.nativeInterface<QNativeInterface::QWaylandApplication>(); auto waylandApp = app.nativeInterface<QNativeInterface::QWaylandApplication>();

Loading…
Cancel
Save