diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2015-01-12 13:12:40 -0200 |
|---|---|---|
| committer | Tobias Koenig <tobias.koenig@kdab.com> | 2015-01-13 11:54:12 +0100 |
| commit | 8fdd1bb8cb68332db605c9f250c64dd114747c45 (patch) | |
| tree | b19a99735c88c67e581cefbbc6f3ea21ec534643 | |
| parent | bbb40616d25b1a1378050bca4de98ebc454bd2b7 (diff) | |
QNX: Enable QSharedMemory and QSystemSemaphore support.
Commit 96995db4af6e1f5e9fe313 implements the necessary bits for this to work
under QNX.
Change-Id: Ie9e2f421f4f27fcaf40697dd363e9ed047754f0d
Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
| -rw-r--r-- | examples/corelib/ipc/ipc.pro | 2 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 7 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/kernel.pro | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/examples/corelib/ipc/ipc.pro b/examples/corelib/ipc/ipc.pro index 4b4b3870a4..5fc3c7457f 100644 --- a/examples/corelib/ipc/ipc.pro +++ b/examples/corelib/ipc/ipc.pro @@ -2,5 +2,5 @@ requires(qtHaveModule(widgets)) TEMPLATE = subdirs # no QSharedMemory -!vxworks:!qnx:SUBDIRS = sharedmemory +!vxworks:SUBDIRS = sharedmemory !wince*:qtHaveModule(network): SUBDIRS += localfortuneserver localfortuneclient diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 48ba09075d..e368cf0d96 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1049,13 +1049,6 @@ Q_CORE_EXPORT int qrand(); #define QT_MODULE(x) -#ifdef Q_OS_QNX -// QNX doesn't have SYSV style shared memory. Multiprocess QWS apps, -// shared fonts and QSystemSemaphore + QSharedMemory are not available -# define QT_NO_SYSTEMSEMAPHORE -# define QT_NO_SHAREDMEMORY -#endif - #if !defined(QT_BOOTSTRAPPED) && defined(QT_REDUCE_RELOCATIONS) && defined(__ELF__) && !defined(__PIC__) && !defined(__PIE__) # error "You must build your code with position independent code if Qt was built with -reduce-relocations. "\ "Compile your code with -fPIC or -fPIE." diff --git a/tests/auto/corelib/kernel/kernel.pro b/tests/auto/corelib/kernel/kernel.pro index 4b3b2e824e..7a3388c949 100644 --- a/tests/auto/corelib/kernel/kernel.pro +++ b/tests/auto/corelib/kernel/kernel.pro @@ -37,4 +37,4 @@ SUBDIRS=\ # This test is only applicable on Windows !win32*|winrt: SUBDIRS -= qwineventnotifier -android|qnx: SUBDIRS -= qsharedmemory qsystemsemaphore +android: SUBDIRS -= qsharedmemory qsystemsemaphore |