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>bb10
parent
34be7dc9d0
commit
72ed34b792
|
|
@ -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": {
|
||||
|
|
|
|||
|
|
@ -619,32 +619,6 @@ private:
|
|||
|
||||
class QDataStream;
|
||||
|
||||
#if defined(Q_OS_VXWORKS)
|
||||
# define QT_NO_CRASHHANDLER // no popen
|
||||
# define QT_NO_PROCESS // no exec*, no fork
|
||||
# define QT_NO_SHAREDMEMORY // only POSIX, no SysV and in the end...
|
||||
# define QT_NO_SYSTEMSEMAPHORE // not needed at all in a flat address space
|
||||
#endif
|
||||
|
||||
#if defined(Q_OS_WINRT)
|
||||
# define QT_NO_FILESYSTEMWATCHER
|
||||
# define QT_NO_NETWORKPROXY
|
||||
# define QT_NO_PROCESS
|
||||
# define QT_NO_SOCKETNOTIFIER
|
||||
# define QT_NO_SOCKS5
|
||||
#endif
|
||||
|
||||
#if defined(QT_PLATFORM_UIKIT)
|
||||
# define QT_NO_PROCESS
|
||||
#endif
|
||||
|
||||
#if defined(Q_OS_INTEGRITY)
|
||||
# define QT_NO_CRASHHANDLER // no popen
|
||||
# define QT_NO_PROCESS // no exec*, no fork
|
||||
# define QT_NO_SYSTEMSEMAPHORE // not needed at all in a single AddressSpace
|
||||
# define QT_NO_MULTIPROCESS // no system
|
||||
#endif
|
||||
|
||||
inline void qt_noop(void) {}
|
||||
|
||||
/* These wrap try/catch so we can switch off exceptions later.
|
||||
|
|
|
|||
|
|
@ -964,6 +964,13 @@
|
|||
"section": "Utilities",
|
||||
"condition": "features.properties",
|
||||
"output": [ "publicFeature", "feature" ]
|
||||
},
|
||||
"multiprocess": {
|
||||
"label": "Multi process",
|
||||
"description": "Provides support for detecting the desktop environment, launching external processes and opening URLs.",
|
||||
"section": "Utilities",
|
||||
"condition": "!config.integrity",
|
||||
"output": [ "privateFeature" ]
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -207,12 +207,14 @@
|
|||
"label": "QNetworkProxy",
|
||||
"purpose": "Provides network proxy support.",
|
||||
"section": "Networking",
|
||||
"condition": "!config.winrt",
|
||||
"output": [ "publicFeature", "feature" ]
|
||||
},
|
||||
"socks5": {
|
||||
"label": "SOCKS5",
|
||||
"purpose": "Provides SOCKS5 support in QNetworkProxy.",
|
||||
"section": "Networking",
|
||||
"condition": "!config.winrt",
|
||||
"output": [ "publicFeature", "feature" ]
|
||||
},
|
||||
"networkinterface": {
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
****************************************************************************/
|
||||
|
||||
#include "qgenericunixservices_p.h"
|
||||
#include <QtGui/private/qtguiglobal_p.h>
|
||||
|
||||
#include <QtCore/QStandardPaths>
|
||||
#include <QtCore/QProcess>
|
||||
|
|
@ -48,7 +49,7 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
#ifndef QT_NO_MULTIPROCESS
|
||||
#if QT_CONFIG(multiprocess)
|
||||
|
||||
enum { debug = 0 };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue