From 141be52f2f5a0029a7ee4ca3ab211fd2576c02b1 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Wed, 30 Nov 2016 15:31:00 +0100
Subject: Merge the two features for shared memory

Change-Id: Ic7bd27b289b755c801e3c510c44b2afe9a253bd8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/corelib/configure.json | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/corelib/configure.json')

diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index 89f824d880..c170b38977 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -355,11 +355,6 @@
             "condition": "features.statemachine",
             "output": [ "publicFeature" ]
         },
-        "sharedmemory": {
-            "label": "Enable QSharedMemory",
-            "condition": "config.android || config.win32 || tests.ipc_sysv || tests.ipc_posix",
-            "output": [ { "type": "define", "negative": true, "name": "QT_NO_SHAREDMEMORY" } ]
-        },
         "slog2": {
             "label": "slog2",
             "condition": "libs.slog2",
@@ -395,7 +390,9 @@
             "label": "QSharedMemory",
             "purpose": "Provides access to a shared memory segment.",
             "section": "Kernel",
-            "condition": "!config.vxworks",
+            "condition": [
+                "config.android || config.win32 || (!config.vxworks && (tests.ipc_sysv || tests.ipc_posix))"
+            ],
             "output": [ "publicFeature", "feature" ]
         },
         "systemsemaphore": {
-- 
cgit v1.2.3