diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-11-30 15:31:00 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-12-06 17:03:26 +0000 |
| commit | 141be52f2f5a0029a7ee4ca3ab211fd2576c02b1 (patch) | |
| tree | 6253c197b1deda49a96fdc485a62b7b99876cb83 /src/corelib/configure.json | |
| parent | 506aa694a9e466f04c392d814b02c2130611dce6 (diff) | |
Merge the two features for shared memory
Change-Id: Ic7bd27b289b755c801e3c510c44b2afe9a253bd8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib/configure.json')
| -rw-r--r-- | src/corelib/configure.json | 9 |
1 files changed, 3 insertions, 6 deletions
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": { |