mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-02 21:18:51 +02:00
56 lines
1.4 KiB
Plaintext
56 lines
1.4 KiB
Plaintext
From 44831be8f21e06291cb1d8cbfd911eb621bde849 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Wed, 10 Nov 2021 18:18:12 +1000
|
|
Subject: Fixes for Haiku
|
|
|
|
|
|
diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
|
|
index 2a7fb2d..8eaae4c 100644
|
|
--- a/ui/platform/linux/ui_utility_linux.cpp
|
|
+++ b/ui/platform/linux/ui_utility_linux.cpp
|
|
@@ -609,7 +609,7 @@ TitleControls::Layout TitleControlsLayout() {
|
|
}
|
|
#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
|
|
|
|
-#ifdef __HAIKU__
|
|
+#ifdef Q_OS_HAIKU
|
|
return TitleControls::Layout{
|
|
.left = {
|
|
TitleControls::Control::Close,
|
|
@@ -619,7 +619,7 @@ TitleControls::Layout TitleControlsLayout() {
|
|
TitleControls::Control::Maximize,
|
|
}
|
|
};
|
|
-#else // __HAIKU__
|
|
+#else // Q_OS_HAIKU
|
|
return TitleControls::Layout{
|
|
.right = {
|
|
TitleControls::Control::Minimize,
|
|
@@ -627,7 +627,7 @@ TitleControls::Layout TitleControlsLayout() {
|
|
TitleControls::Control::Close,
|
|
}
|
|
};
|
|
-#endif // !__HAIKU__
|
|
+#endif // !Q_OS_HAIKU
|
|
}
|
|
|
|
} // namespace Platform
|
|
diff --git a/ui/ui_utility.cpp b/ui/ui_utility.cpp
|
|
index e66055d..e31d635 100644
|
|
--- a/ui/ui_utility.cpp
|
|
+++ b/ui/ui_utility.cpp
|
|
@@ -9,6 +9,10 @@
|
|
#include "ui/platform/ui_platform_utility.h"
|
|
#include "ui/style/style_core.h"
|
|
|
|
+#ifdef Q_OS_HAIKU
|
|
+#include <base/haiku_types.h>
|
|
+#endif
|
|
+
|
|
#include <QtWidgets/QApplication>
|
|
#include <QtGui/QWindow>
|
|
#include <QtGui/QtEvents>
|
|
--
|
|
2.30.2
|
|
|