diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-09-04 13:12:40 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-09-04 13:12:40 (GMT) |
| commit | e15ab744f15127422ef62a0b70e6cf129f52f48f (patch) | |
| tree | 72352e1e297f0322610234c2eeb994820407616e /src/corelib/kernel/qsharedmemory_unix.cpp | |
| parent | 04802c1fe74439111c7bbe92fcb777dcbd618500 (diff) | |
| parent | b3b9813f1083fc556aea1f952329551da97aee90 (diff) | |
| download | Qt-e15ab744f15127422ef62a0b70e6cf129f52f48f.zip Qt-e15ab744f15127422ef62a0b70e6cf129f52f48f.tar.gz Qt-e15ab744f15127422ef62a0b70e6cf129f52f48f.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib/kernel/qsharedmemory_unix.cpp')
| -rw-r--r-- | src/corelib/kernel/qsharedmemory_unix.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp index e411681..f62577e 100644 --- a/src/corelib/kernel/qsharedmemory_unix.cpp +++ b/src/corelib/kernel/qsharedmemory_unix.cpp @@ -283,7 +283,6 @@ bool QSharedMemoryPrivate::detach() // If there are no attachments then remove it. if (shmid_ds.shm_nattch == 0) { // mark for removal - struct shmid_ds shmid_ds; if (-1 == shmctl(id, IPC_RMID, &shmid_ds)) { setErrorString(QLatin1String("QSharedMemory::remove")); switch (errno) { |