diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-03 23:04:58 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-03 23:04:58 (GMT) |
| commit | 2174ab779191b730b93097a093609cecbb98aa96 (patch) | |
| tree | 31b0c0c455788eb713f183768905617a9274fc6c /src/corelib/kernel/qsharedmemory_unix.cpp | |
| parent | 15a51033a3efed2eafd3527758ea1f6b864d719b (diff) | |
| parent | f0844f9da7a834c282f6f04b2676f28de444e9dc (diff) | |
| download | Qt-2174ab779191b730b93097a093609cecbb98aa96.zip Qt-2174ab779191b730b93097a093609cecbb98aa96.tar.gz Qt-2174ab779191b730b93097a093609cecbb98aa96.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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) { |