diff options
| author | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-05-27 08:30:07 (GMT) |
|---|---|---|
| committer | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-05-27 08:30:07 (GMT) |
| commit | d9e42d5c30ec551e6bded0277712eb0c6718b659 (patch) | |
| tree | 7ca4f5f08c644ea130ade8f2eaf84cf54abe797c /src/corelib/kernel/qsharedmemory_unix.cpp | |
| parent | fde5a9bde254dd0381762e2c52c0f4904599d40a (diff) | |
| parent | d61736900e8781fa2fa3b98f30abf8925787d0f9 (diff) | |
| download | Qt-d9e42d5c30ec551e6bded0277712eb0c6718b659.zip Qt-d9e42d5c30ec551e6bded0277712eb0c6718b659.tar.gz Qt-d9e42d5c30ec551e6bded0277712eb0c6718b659.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 |