summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@digia.com>2014-05-06 14:10:29 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-06 16:35:56 +0200
commitc76d8c42b2fd87f620a4ea47a5c4134a084e4142 (patch)
tree48f3001d741ebb59da02c497b4230b1e1eb0bb86 /src/corelib
parent85aef2dd4b059d2ba9cba4605d9fef87f3e2c4fc (diff)
Doc: removed references to QtSharedMemory.
Task-number: QTBUG-38772 Change-Id: Ibc71acfafcb93d0c7e6c8ae84d412c34aacd2967 Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/kernel/qsharedmemory.cpp8
1 files 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