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

QNX: Enable QSharedMemory and QSystemSemaphore support.

Browse Source 
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>
This commit is contained in:
Rafael Roquetto 2015-01-12 13:12:40 -02:00 committed by Tobias Koenig
parent bbb40616d2
commit 8fdd1bb8cb
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/corelib/ipc/ipc.pro
View File

@ -2,5 +2,5 @@ requires(qtHaveModule(widgets))
TEMPLATE = subdirs TEMPLATE = subdirs
# no QSharedMemory # no QSharedMemory
!vxworks:!qnx:SUBDIRS = sharedmemory !vxworks:SUBDIRS = sharedmemory
!wince*:qtHaveModule(network): SUBDIRS += localfortuneserver localfortuneclient !wince*:qtHaveModule(network): SUBDIRS += localfortuneserver localfortuneclient

7
src/corelib/global/qglobal.h
View File

@ -1049,13 +1049,6 @@ Q_CORE_EXPORT int qrand();
#define QT_MODULE(x) #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__) #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. "\ # error "You must build your code with position independent code if Qt was built with -reduce-relocations. "\
"Compile your code with -fPIC or -fPIE." "Compile your code with -fPIC or -fPIE."

2
tests/auto/corelib/kernel/kernel.pro
View File

@ -37,4 +37,4 @@ SUBDIRS=\
# This test is only applicable on Windows # This test is only applicable on Windows
!win32*|winrt: SUBDIRS -= qwineventnotifier !win32*|winrt: SUBDIRS -= qwineventnotifier
android|qnx: SUBDIRS -= qsharedmemory qsystemsemaphore android: SUBDIRS -= qsharedmemory qsystemsemaphore