From 5c9fa4ca4a88a83c8fab84ce22f68af9c0a6a893 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 14 Sep 2023 13:16:48 +0200 Subject: [PATCH] CMake: Fix condition of the ipc_posix feature The ipc_posix feature was OFF despite the following test values: TEST_posix_shm ON TEST_posix_sem ON TEST_sysv_shm OFF TEST_sysv_sem OFF The 'NOT (TEST_sysv_shm AND TEST_sysv_sem)' part of the condition is not correctly evaluated. Resolve the parentheses to work around this issue. Pick-to: 6.6.0 Fixes: QTBUG-117052 Change-Id: Idac23d207f8dd644d059977ca41b6e32b17b3a49 Reviewed-by: Alexandru Croitor (cherry picked from commit 828770c60c1c0342a015fc7fe2d6e714f645fb64) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/configure.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 56892fd7f49..6f4cb49e6d7 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -632,7 +632,7 @@ qt_feature("ipc_posix" LABEL "Defaulting legacy IPC to POSIX" CONDITION TEST_posix_shm AND TEST_posix_sem AND ( FEATURE_ipc_posix OR (APPLE AND QT_FEATURE_appstore_compliant) - OR NOT (TEST_sysv_shm AND TEST_sysv_sem) + OR NOT TEST_sysv_shm OR NOT TEST_sysv_sem ) ) qt_feature_definition("ipc_posix" "QT_POSIX_IPC")