diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-22 16:50:30 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-22 16:50:30 (GMT) |
| commit | d9ab330f613bd2c921ba00ed36b6eea8927aec80 (patch) | |
| tree | 8a5337dac7617fe8e654fd4ffd1302c587967c76 /src/corelib/kernel | |
| parent | dacc8cb0b2abd5ec3e9603c9bcf5b8f489639404 (diff) | |
| parent | 701bdcbc8b7751834f6d24844bcb91a23cbdc409 (diff) | |
| download | Qt-d9ab330f613bd2c921ba00ed36b6eea8927aec80.zip Qt-d9ab330f613bd2c921ba00ed36b6eea8927aec80.tar.gz Qt-d9ab330f613bd2c921ba00ed36b6eea8927aec80.tar.bz2 | |
Merge branch '4.5'
Conflicts:
src/corelib/kernel/qsharedmemory_unix.cpp
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qsharedmemory_unix.cpp | 5 | ||||
| -rw-r--r-- | src/corelib/kernel/qsystemsemaphore_p.h | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qtranslator.cpp | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp index cd248dc..12f21b7 100644 --- a/src/corelib/kernel/qsharedmemory_unix.cpp +++ b/src/corelib/kernel/qsharedmemory_unix.cpp @@ -47,9 +47,12 @@ #include <qdir.h> #include <qdebug.h> +#include <errno.h> + #ifndef QT_NO_SHAREDMEMORY -#include <errno.h> +QT_BEGIN_NAMESPACE + #include <sys/types.h> #include <sys/ipc.h> #include <sys/shm.h> diff --git a/src/corelib/kernel/qsystemsemaphore_p.h b/src/corelib/kernel/qsystemsemaphore_p.h index 81d4f10..a4a7389 100644 --- a/src/corelib/kernel/qsystemsemaphore_p.h +++ b/src/corelib/kernel/qsystemsemaphore_p.h @@ -101,9 +101,9 @@ public: QSystemSemaphore::SystemSemaphoreError error; }; -#endif // QT_NO_SYSTEMSEMAPHORE +QT_END_NAMESPACE +#endif // QT_NO_SYSTEMSEMAPHORE -QT_END_NAMESPACE #endif // QSYSTEMSEMAPHORE_P_H diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp index 77d6599..3e4b467 100644 --- a/src/corelib/kernel/qtranslator.cpp +++ b/src/corelib/kernel/qtranslator.cpp @@ -819,6 +819,6 @@ bool QTranslator::isEmpty() const Use translate(\a context, \a sourceText, \a comment) instead. */ -#endif // QT_NO_TRANSLATION - QT_END_NAMESPACE + +#endif // QT_NO_TRANSLATION |