summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-02-23 00:47:54 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-24 13:20:00 +0100
commit5a3496ce884dc6b2135ed9154b1da00aa0b64188 (patch)
tree491a16850474b639569eaf9c9d7ddb887c85b428
parentde5ebd342f46567a04b58ed28a55ebae48041847 (diff)
Remove QT_NO_QWS_MULTIPROCESS
Change-Id: I1d6731dc5268919d0c36d5d27285321742be708f Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
-rw-r--r--src/corelib/global/qglobal.h2
-rw-r--r--src/plugins/platforms/vnc/qvncserver.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index ecd981614a..382a05deea 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -495,7 +495,6 @@ class QDataStream;
# define QT_NO_LPR
# 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_QWS_MULTIPROCESS // no processes
#endif
# include <QtCore/qfeatures.h>
@@ -1452,7 +1451,6 @@ Q_CORE_EXPORT int qrand();
#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_QWS_MULTIPROCESS
# define QT_NO_QWS_SHARE_FONTS
# define QT_NO_SYSTEMSEMAPHORE
# define QT_NO_SHAREDMEMORY
diff --git a/src/plugins/platforms/vnc/qvncserver.h b/src/plugins/platforms/vnc/qvncserver.h
index b0c53dde95..e8b093764f 100644
--- a/src/plugins/platforms/vnc/qvncserver.h
+++ b/src/plugins/platforms/vnc/qvncserver.h
@@ -262,7 +262,7 @@ public:
int refreshRate;
QVNCServer *vncServer;
-#if !defined(QT_NO_QWS_MULTIPROCESS) && !defined(QT_NO_SHAREDMEMORY)
+#if !defined(QT_NO_SHAREDMEMORY)
QSharedMemory shm;
#endif