From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20B=C5=99=C3=ADza?= Date: Wed, 15 Dec 2021 19:38:27 +0100 Subject: [PATCH] Disable shared memory and semaphores It's probably not done in the cleanest way but it works --- mkspecs/minerva-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/minerva-g++/qplatformdefs.h b/mkspecs/minerva-g++/qplatformdefs.h index ff6bd088c99a77689733af03858950fab1cf6284..c39b40670b45aa853b6678835ef2d46564ba9506 100644 --- a/mkspecs/minerva-g++/qplatformdefs.h +++ b/mkspecs/minerva-g++/qplatformdefs.h @@ -43,6 +43,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 57dcb2cb93eaacf905c585c3fd24a4c9ed07418b..fefcdc9d159163f34642c1b856cf992e93d234bb 100644 --- a/src/corelib/kernel/qsharedmemory_p.h +++ b/src/corelib/kernel/qsharedmemory_p.h @@ -15,6 +15,7 @@ // We mean it. // +#include "qplatformdefs.h" #include "qsharedmemory.h" #include @@ -42,7 +43,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_MINERVA) # include #endif diff --git a/src/corelib/kernel/qsystemsemaphore_p.h b/src/corelib/kernel/qsystemsemaphore_p.h index 09fbcd2ed65a7f8e7bb9756c02209f0eb96ede44..7267c52b11a5c91e062ad20f357a627ae8888b81 100644 --- a/src/corelib/kernel/qsystemsemaphore_p.h +++ b/src/corelib/kernel/qsystemsemaphore_p.h @@ -15,6 +15,7 @@ // We mean it. // +#include "qplatformdefs.h" #include "qsystemsemaphore.h" #ifndef QT_NO_SYSTEMSEMAPHORE