diff options
| author | Iain <qt-info@nokia.com> | 2009-05-26 15:17:31 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-05-26 15:17:31 (GMT) |
| commit | 82f8c6fbc0006d08638a397941f170e2bee6460d (patch) | |
| tree | 3fc8b33e139a28d17482b9fe7bd349896cbd5ece /src/corelib/kernel/qsharedmemory_unix.cpp | |
| parent | 8d9b58cde5d1ad6c6684bcc3516cd3782b946bfc (diff) | |
| parent | 4998ad5f72314b48ad8c8115b64f4cb4b747c2bc (diff) | |
| download | Qt-82f8c6fbc0006d08638a397941f170e2bee6460d.zip Qt-82f8c6fbc0006d08638a397941f170e2bee6460d.tar.gz Qt-82f8c6fbc0006d08638a397941f170e2bee6460d.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib/kernel/qsharedmemory_unix.cpp')
| -rw-r--r-- | src/corelib/kernel/qsharedmemory_unix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp index c4395d9..b664093 100644 --- a/src/corelib/kernel/qsharedmemory_unix.cpp +++ b/src/corelib/kernel/qsharedmemory_unix.cpp @@ -56,10 +56,10 @@ #include <fcntl.h> #include <unistd.h> -QT_BEGIN_NAMESPACE - #ifndef QT_NO_SHAREDMEMORY +QT_BEGIN_NAMESPACE + QSharedMemoryPrivate::QSharedMemoryPrivate() : QObjectPrivate(), memory(0), size(0), error(QSharedMemory::NoError), #ifndef QT_NO_SYSTEMSEMAPHORE |