Merge pull request #1761 from Begasus/haiku

No wayland on Haiku, fixes build errors
This commit is contained in:
DeepBlueV7.X 2024-06-25 17:31:12 +00:00 committed by GitHub
commit 2f17cf6416
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -250,7 +250,8 @@ main(int argc, char *argv[])
#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) && 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
// when you have an actual window, that has the focus...
auto waylandApp = app.nativeInterface<QNativeInterface::QWaylandApplication>();