diff options
| author | axis <qt-info@nokia.com> | 2009-05-25 11:26:23 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-25 11:26:23 (GMT) |
| commit | de01a7e1e827ee7df035e0b32166db2263712e63 (patch) | |
| tree | 3a5cda42d360c63c027afd80eb2e6715faa72aaa /src/corelib/kernel/qsharedmemory_unix.cpp | |
| parent | 4c06cd950d27ba10d2288d508cbaef4e44abee91 (diff) | |
| parent | 44d992ca150d9448cb7b9114b2bc489b441c7b76 (diff) | |
| download | Qt-de01a7e1e827ee7df035e0b32166db2263712e63.zip Qt-de01a7e1e827ee7df035e0b32166db2263712e63.tar.gz Qt-de01a7e1e827ee7df035e0b32166db2263712e63.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/corelib/io/qfile.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/network/socket/qnativesocketengine_p.h
src/network/socket/qnativesocketengine_unix.cpp
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 |