AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove QT_NO_QWS_MULTIPROCESS

Browse Source 
Change-Id: I1d6731dc5268919d0c36d5d27285321742be708f
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
This commit is contained in:
Stephen Kelly 2012-02-23 00:47:54 +01:00 committed by Qt by Nokia
parent de5ebd342f
commit 5a3496ce88
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -495,7 +495,6 @@ class QDataStream;
# define QT_NO_LPR # define QT_NO_LPR
# define QT_NO_SHAREDMEMORY // only POSIX, no SysV and in the end... # 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 # define QT_NO_SYSTEMSEMAPHORE // not needed at all in a flat address space
# define QT_NO_QWS_MULTIPROCESS // no processes
#endif #endif
# include <QtCore/qfeatures.h> # include <QtCore/qfeatures.h>
@ -1452,7 +1451,6 @@ Q_CORE_EXPORT int qrand();
#ifdef Q_OS_QNX #ifdef Q_OS_QNX
// QNX doesn't have SYSV style shared memory. Multiprocess QWS apps, // QNX doesn't have SYSV style shared memory. Multiprocess QWS apps,
// shared fonts and QSystemSemaphore + QSharedMemory are not available // shared fonts and QSystemSemaphore + QSharedMemory are not available
# define QT_NO_QWS_MULTIPROCESS
# define QT_NO_QWS_SHARE_FONTS # define QT_NO_QWS_SHARE_FONTS
# define QT_NO_SYSTEMSEMAPHORE # define QT_NO_SYSTEMSEMAPHORE
# define QT_NO_SHAREDMEMORY # define QT_NO_SHAREDMEMORY

2
src/plugins/platforms/vnc/qvncserver.h
View File

@ -262,7 +262,7 @@ public:
int refreshRate; int refreshRate;
QVNCServer *vncServer; QVNCServer *vncServer;
#if !defined(QT_NO_QWS_MULTIPROCESS) && !defined(QT_NO_SHAREDMEMORY) #if !defined(QT_NO_SHAREDMEMORY)
QSharedMemory shm; QSharedMemory shm;
#endif #endif