mirror of
https://github.com/RGBCube/serenity
synced 2025-05-24 08:45:08 +00:00
ac762c5520
It's necessary to have a working serenity platform plugin for it to work with GUI applications
62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
From f376d694af85f2f14de87f235d929895baa66fed Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Martin=20B=C5=99=C3=ADza?= <m@rtinbriza.cz>
|
|
Date: Wed, 15 Dec 2021 19:38:27 +0100
|
|
Subject: [PATCH 3/5] Disable shared memory and semaphores
|
|
|
|
It's probably not done in the cleanest way but it works
|
|
---
|
|
mkspecs/serenity-g++/qplatformdefs.h | 3 +++
|
|
src/corelib/kernel/qsharedmemory_p.h | 3 ++-
|
|
src/corelib/kernel/qsystemsemaphore_p.h | 1 +
|
|
3 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/mkspecs/serenity-g++/qplatformdefs.h b/mkspecs/serenity-g++/qplatformdefs.h
|
|
index c054ddc5..a5a759c0 100644
|
|
--- a/mkspecs/serenity-g++/qplatformdefs.h
|
|
+++ b/mkspecs/serenity-g++/qplatformdefs.h
|
|
@@ -44,6 +44,9 @@
|
|
|
|
#define _GLIBCXX_HAVE_MBSTATE_T 1
|
|
|
|
+#define QT_NO_SHAREDMEMORY 1
|
|
+#define QT_NO_SYSTEMSEMAPHORE 1
|
|
+
|
|
#include "qglobal.h"
|
|
|
|
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
|
|
diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h
|
|
index e06e7e86..7292782d 100644
|
|
--- a/src/corelib/kernel/qsharedmemory_p.h
|
|
+++ b/src/corelib/kernel/qsharedmemory_p.h
|
|
@@ -51,6 +51,7 @@
|
|
// We mean it.
|
|
//
|
|
|
|
+#include "qplatformdefs.h"
|
|
#include "qsharedmemory.h"
|
|
|
|
#include <QtCore/qstring.h>
|
|
@@ -78,7 +79,7 @@ QT_END_NAMESPACE
|
|
# include "private/qobject_p.h"
|
|
#endif
|
|
|
|
-#if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_RTEMS)
|
|
+#if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_RTEMS) && !defined(Q_OS_SERENITY)
|
|
# include <sys/sem.h>
|
|
#endif
|
|
|
|
diff --git a/src/corelib/kernel/qsystemsemaphore_p.h b/src/corelib/kernel/qsystemsemaphore_p.h
|
|
index 56619d73..56cf8687 100644
|
|
--- a/src/corelib/kernel/qsystemsemaphore_p.h
|
|
+++ b/src/corelib/kernel/qsystemsemaphore_p.h
|
|
@@ -51,6 +51,7 @@
|
|
// We mean it.
|
|
//
|
|
|
|
+#include "qplatformdefs.h"
|
|
#include "qsystemsemaphore.h"
|
|
|
|
#ifndef QT_NO_SYSTEMSEMAPHORE
|
|
--
|
|
2.33.1
|
|
|