summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2023-09-14 13:16:48 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2023-09-15 15:26:06 +0200
commit828770c60c1c0342a015fc7fe2d6e714f645fb64 (patch)
treefa4685af239d5679611c18d2e21a70c0c2f5ccf3
parentb629bdc085ea5ef556180d59bfc1dc292f93cc6c (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. Pick-to: 6.6.0 6.6 Fixes: QTBUG-117052 Change-Id: Idac23d207f8dd644d059977ca41b6e32b17b3a49 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-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 41877d4c52..d1f7028d23 100644
--- a/src/corelib/configure.cmake
+++ b/src/corelib/configure.cmake
@@ -481,7 +481,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")