From ae6e27d601f608a91c091e3337d2fc3f3a0fd01d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Tue, 11 Jul 2023 09:50:02 +0200 Subject: [PATCH] ipc common: move end-of-namespace into same scope as start To avoid issues building with shared memory & system semaphore disabled. Change-Id: I525abe97f82266b8cca0e4f1847849054c016a4b Reviewed-by: Marc Mutz Reviewed-by: Thiago Macieira (cherry picked from commit 42022f8b3848f806feec7bf3fe86c15312f1596e) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/ipc/qtipccommon.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/corelib/ipc/qtipccommon.h b/src/corelib/ipc/qtipccommon.h index a922c0f54fa..b58de9ed0b8 100644 --- a/src/corelib/ipc/qtipccommon.h +++ b/src/corelib/ipc/qtipccommon.h @@ -200,8 +200,9 @@ inline auto QNativeIpcKey::legacyDefaultTypeForOs() noexcept -> Type #endif } -#endif // QT_CONFIG(sharedmemory) || QT_CONFIG(systemsemaphore) - QT_END_NAMESPACE +#endif // QT_CONFIG(sharedmemory) || QT_CONFIG(systemsemaphore) + + #endif // QNATIVEIPCKEY_H