From 2c8a8ceba66819c870312a454477187444a363df Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Sat, 26 Feb 2022 03:36:00 +0200
Subject: [PATCH] build fix for the case when QT_NO_SHAREDMEMORY is defined

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 src/core/global/qconfig.h.cmake   |  6 +++---
 src/core/kernel/qsharedmemory_p.h | 12 +++++++++---
 src/gui/widgets/qscrollarea_p.h   |  6 +++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/core/global/qconfig.h.cmake b/src/core/global/qconfig.h.cmake
index e6ae94b80..21ed3540a 100644
--- a/src/core/global/qconfig.h.cmake
+++ b/src/core/global/qconfig.h.cmake
@@ -129,6 +129,9 @@
 // #cmakedefine QT_NO_PROPERTIES
 // #cmakedefine QT_NO_PROXYMODEL
 // #cmakedefine QT_NO_RESIZEHANDLER
+// #cmakedefine QT_NO_RUBBERBAND
+// #cmakedefine QT_NO_SCROLLAREA
+// #cmakedefine QT_NO_SCROLLBAR
 
 // Misc
 #cmakedefine QT_NO_USING_NAMESPACE
@@ -169,9 +172,6 @@
 #cmakedefine QT_NO_PROGRESSDIALOG
 #cmakedefine QT_NO_QUATERNION
 #cmakedefine QT_NO_QUUID_STRING
-#cmakedefine QT_NO_RUBBERBAND
-#cmakedefine QT_NO_SCROLLAREA
-#cmakedefine QT_NO_SCROLLBAR
 #cmakedefine QT_NO_SHAREDMEMORY
 #cmakedefine QT_NO_SHORTCUT
 #cmakedefine QT_NO_SIGNALMAPPER
diff --git a/src/core/kernel/qsharedmemory_p.h b/src/core/kernel/qsharedmemory_p.h
index e3d601dbc..ac2c30f5d 100644
--- a/src/core/kernel/qsharedmemory_p.h
+++ b/src/core/kernel/qsharedmemory_p.h
@@ -36,14 +36,20 @@
 #include "qsharedmemory.h"
 
 #ifdef QT_NO_SHAREDMEMORY
+
+QT_BEGIN_NAMESPACE
+
 # ifndef QT_NO_SYSTEMSEMAPHORE
 namespace QSharedMemoryPrivate
 {
-    QString makePlatformSafeKey(const QString &key, ,
+    QString makePlatformSafeKey(const QString &key,
             const QString &prefix = QLatin1String("/qipc_sharedmemory_"));
 }
-#endif
-#else
+#endif // QT_NO_SYSTEMSEMAPHORE
+
+QT_END_NAMESPACE
+
+#else // QT_NO_SHAREDMEMORY
 
 #include "qsystemsemaphore.h"
 #include "qobject_p.h"
diff --git a/src/gui/widgets/qscrollarea_p.h b/src/gui/widgets/qscrollarea_p.h
index 78c797702..3c44c8ba8 100644
--- a/src/gui/widgets/qscrollarea_p.h
+++ b/src/gui/widgets/qscrollarea_p.h
@@ -53,8 +53,8 @@ public:
     Qt::Alignment alignment;
 };
 
-#endif
-
 QT_END_NAMESPACE
 
-#endif
+#endif // QT_NO_SCROLLAREA
+
+#endif // QSCROLLAREA_P_H
-- 
2.11.0