diff options
| author | DeepBlueV7.X <nicolas.werner@hotmail.de> | 2024-06-25 17:31:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-25 17:31:12 +0000 |
| commit | 2f17cf641635210f102f9b2965492d1b177eb5ac (patch) | |
| tree | 733df50944fbd88e998272c079de2b0537b0d25a | |
| parent | Pin clang-format to version 17 in CI (hopefully temporarily) (diff) | |
| parent | No wayland on Haiku, fixes build errors (diff) | |
| download | nheko-2f17cf641635210f102f9b2965492d1b177eb5ac.tar.xz | |
Merge pull request #1761 from Begasus/haiku
No wayland on Haiku, fixes build errors
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index bdfb84e7..0dad400b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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>(); |