2022-06-05 03:05:04 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2021-08-12 19:40:25 +02:00
|
|
|
From: =?UTF-8?q?Martin=20B=C5=99=C3=ADza?= <m@rtinbriza.cz>
|
|
|
|
|
Date: Wed, 15 Dec 2021 19:38:27 +0100
|
2022-06-05 03:05:04 +02:00
|
|
|
Subject: [PATCH] Disable shared memory and semaphores
|
2021-08-12 19:40:25 +02:00
|
|
|
|
|
|
|
|
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
|
2022-12-03 09:20:59 -07:00
|
|
|
index 1f0dd9819abb1f8dac52250d24aa8d0763f05445..65b641e283a42cdc2bd6c63c1750b46e0b33ab02 100644
|
2021-08-12 19:40:25 +02:00
|
|
|
--- a/mkspecs/serenity-g++/qplatformdefs.h
|
|
|
|
|
+++ b/mkspecs/serenity-g++/qplatformdefs.h
|
2022-06-05 03:05:04 +02:00
|
|
|
@@ -43,6 +43,9 @@
|
2021-08-12 19:40:25 +02:00
|
|
|
|
|
|
|
|
#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
|
2022-12-03 09:20:59 -07:00
|
|
|
index 57dcb2cb93eaacf905c585c3fd24a4c9ed07418b..fefcdc9d159163f34642c1b856cf992e93d234bb 100644
|
2021-08-12 19:40:25 +02:00
|
|
|
--- a/src/corelib/kernel/qsharedmemory_p.h
|
|
|
|
|
+++ b/src/corelib/kernel/qsharedmemory_p.h
|
2022-12-03 09:20:59 -07:00
|
|
|
@@ -15,6 +15,7 @@
|
2021-08-12 19:40:25 +02:00
|
|
|
// We mean it.
|
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
+#include "qplatformdefs.h"
|
|
|
|
|
#include "qsharedmemory.h"
|
|
|
|
|
|
|
|
|
|
#include <QtCore/qstring.h>
|
2022-12-03 09:20:59 -07:00
|
|
|
@@ -42,7 +43,7 @@ QT_END_NAMESPACE
|
2021-08-12 19:40:25 +02:00
|
|
|
# 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
|
2022-12-03 09:20:59 -07:00
|
|
|
index 09fbcd2ed65a7f8e7bb9756c02209f0eb96ede44..7267c52b11a5c91e062ad20f357a627ae8888b81 100644
|
2021-08-12 19:40:25 +02:00
|
|
|
--- a/src/corelib/kernel/qsystemsemaphore_p.h
|
|
|
|
|
+++ b/src/corelib/kernel/qsystemsemaphore_p.h
|
2022-12-03 09:20:59 -07:00
|
|
|
@@ -15,6 +15,7 @@
|
2021-08-12 19:40:25 +02:00
|
|
|
// We mean it.
|
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
+#include "qplatformdefs.h"
|
|
|
|
|
#include "qsystemsemaphore.h"
|
|
|
|
|
|
|
|
|
|
#ifndef QT_NO_SYSTEMSEMAPHORE
|
