summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qsharedmemory_p.h
diff options
context:
space:
mode:
authorMirko Damiani <mirko@develer.com>2010-02-08 16:09:24 +0100
committerAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>2010-05-31 09:21:11 +0200
commit9b4ff3deb28b3d642dc4480207f2f23841cf26e9 (patch)
tree103e8f6b0639e85e0f9a0af7ca0d943e64c518fd /src/corelib/kernel/qsharedmemory_p.h
parent90abe364b7e9b0aa201a3e0ed0b043643519e21b (diff)
Added native key support to QSharedMemory API.
Methods setNativeKey() and nativeKey() were added to QSharedMemory API. Shared memory's native key is returned by nativeKey() and it is set with either setKey() or setNativeKey(). setKey() leads to a native key that is platform independent while setNativeKey() directly sets the native key without any mangling. When using setNativeKey(), key() returns a null string and shared memory's system semaphore is not set. This means that is up to the user to define a such protection mechanism (i.e. lock() can't be used on native keys). QSharedMemory tests were updated. Merge-request: 1497 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com> Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qsharedmemory_p.h')
-rw-r--r--src/corelib/kernel/qsharedmemory_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h
index a52f8b3f08..632a6e928c 100644
--- a/src/corelib/kernel/qsharedmemory_p.h
+++ b/src/corelib/kernel/qsharedmemory_p.h
@@ -122,6 +122,7 @@ public:
void *memory;
int size;
QString key;
+ QString nativeKey;
QSharedMemory::SharedMemoryError error;
QString errorString;
#ifndef QT_NO_SYSTEMSEMAPHORE