From c76d8c42b2fd87f620a4ea47a5c4134a084e4142 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Tue, 6 May 2014 14:10:29 +0200 Subject: [PATCH] Doc: removed references to QtSharedMemory. Task-number: QTBUG-38772 Change-Id: Ibc71acfafcb93d0c7e6c8ae84d412c34aacd2967 Reviewed-by: Martin Smith --- src/corelib/kernel/qsharedmemory.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp index 407a6a4e02..cde42c4f6e 100644 --- a/src/corelib/kernel/qsharedmemory.cpp +++ b/src/corelib/kernel/qsharedmemory.cpp @@ -125,11 +125,9 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &key, or writing to the shared memory, and remember to release the lock with unlock() after you are done. - Unlike QtSharedMemory, QSharedMemory automatically destroys the - shared memory segment when the last instance of QSharedMemory is - detached from the segment, and no references to the segment - remain. Do not mix using QtSharedMemory and QSharedMemory. Port - everything to QSharedMemory. + QSharedMemory automatically destroys the shared memory segment when + the last instance of QSharedMemory is detached from the segment, and + no references to the segment remain. \warning QSharedMemory changes the key in a Qt-specific way, unless otherwise specified. Interoperation with non-Qt applications is achieved by first creating