1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge the two features for shared memory

Browse Source 
Change-Id: Ic7bd27b289b755c801e3c510c44b2afe9a253bd8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Ulf Hermann 2016-11-30 15:31:00 +01:00
parent 506aa694a9
commit 141be52f2f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/configure.json
View File

@ -355,11 +355,6 @@
"condition": "features.statemachine", "condition": "features.statemachine",
"output": [ "publicFeature" ] "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": { "slog2": {
"label": "slog2", "label": "slog2",
"condition": "libs.slog2", "condition": "libs.slog2",
@ -395,7 +390,9 @@
"label": "QSharedMemory", "label": "QSharedMemory",
"purpose": "Provides access to a shared memory segment.", "purpose": "Provides access to a shared memory segment.",
"section": "Kernel", "section": "Kernel",
"condition": "!config.vxworks", "condition": [
"config.android || config.win32 || (!config.vxworks && (tests.ipc_sysv || tests.ipc_posix))"
],
"output": [ "publicFeature", "feature" ] "output": [ "publicFeature", "feature" ]
}, },
"systemsemaphore": { "systemsemaphore": {