diff options
author | Lars Knoll <lars.knoll@qt.io> | 2016-11-17 13:23:47 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2016-11-24 08:37:38 +0000 |
commit | 72ed34b792f5acca5e0ada3b3d753b7a16274ff6 (patch) | |
tree | ccf27ceb90d95bef9d9f429edaa9e2127f68e638 /src/corelib/configure.json | |
parent | 34be7dc9d09c45a5e47a13716ee4db70f95dabcf (diff) |
Don't set platform specific QT_NO_FOO defines in qglobal.h
They should be enabled/disabled through the configuration system.
Remove some unused defines, and move one define from qglobal.h to
a proper feature definition in Qt Gui.
Change-Id: Ie8d5bff9712ba745af60b42ceca3f0440bed2706
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/configure.json')
-rw-r--r-- | src/corelib/configure.json | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 5017f4652a..0d1954c3a8 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -396,13 +396,17 @@ "label": "QSharedMemory", "purpose": "Provides access to a shared memory segment.", "section": "Kernel", + "condition": "!config.vxworks", "output": [ "publicFeature", "feature" ] }, "systemsemaphore": { "label": "QSystemSemaphore", "purpose": "Provides a general counting system semaphore.", "section": "Kernel", - "condition": "config.android || config.win32 || tests.ipc_sysv || tests.ipc_posix", + "condition": [ + "!config.integrity && !config.vxworks", + "config.android || config.win32 || tests.ipc_sysv || tests.ipc_posix" + ], "output": [ "publicFeature", "feature" ] }, "xmlstream": { @@ -442,6 +446,7 @@ "label": "QProcess", "purpose": "Supports external process invocation.", "section": "File I/O", + "condition": "!config.winrt && !config.uikit && !config.integrity && !config.vxworks", "output": [ "publicFeature", "feature" ] }, "temporaryfile": { @@ -466,6 +471,7 @@ "label": "QFileSystemWatcher", "purpose": "Provides an interface for monitoring files and directories for modifications.", "section": "File I/O", + "condition": "!config.winrt", "output": [ "publicFeature", "feature" ] }, "filesystemiterator": { |