summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2023-09-14 13:16:48 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-09-18 12:59:57 +0000
commit9b5c3d31042749b165f4245626f20f18991b7b05 (patch)
tree34dfbd74f36f794f23407ff1f56a056c9c4ab86a
parent478c80fd07e1afa8b4a8586ec2864ba1b35a82fd (diff)
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. Fixes: QTBUG-117052 Change-Id: Idac23d207f8dd644d059977ca41b6e32b17b3a49 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 828770c60c1c0342a015fc7fe2d6e714f645fb64) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 5c9fa4ca4a88a83c8fab84ce22f68af9c0a6a893)
-rw-r--r--src/corelib/configure.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
index 56892fd7f4..6f4cb49e6d 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")