diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2009-05-22 11:20:10 (GMT) |
|---|---|---|
| committer | Markus Goetz <Markus.Goetz@nokia.com> | 2009-05-22 12:40:07 (GMT) |
| commit | 8b2a16bd7f434a159e34e93dbffc983927a0a143 (patch) | |
| tree | 366d7fe340ceaa512b292f25a23d4496ac903d8f /src/corelib | |
| parent | a0396c8c68aca446e68434e516bd46d749093b0f (diff) | |
| download | Qt-8b2a16bd7f434a159e34e93dbffc983927a0a143.zip Qt-8b2a16bd7f434a159e34e93dbffc983927a0a143.tar.gz Qt-8b2a16bd7f434a159e34e93dbffc983927a0a143.tar.bz2 | |
Fixed compilation with -qtnamespace
Task-number: 254333
Reviewed-by: Andy Shaw <qt-info@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qtemporaryfile.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qsharedmemory_unix.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qsystemsemaphore_p.h | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qtranslator.cpp | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp index 7c0b018..b4d8a48 100644 --- a/src/corelib/io/qtemporaryfile.cpp +++ b/src/corelib/io/qtemporaryfile.cpp @@ -766,6 +766,8 @@ bool QTemporaryFile::open(OpenMode flags) return false; } +QT_END_NAMESPACE + #endif // QT_NO_TEMPORARYFILE -QT_END_NAMESPACE + diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp index 487c653..61d56f4 100644 --- a/src/corelib/kernel/qsharedmemory_unix.cpp +++ b/src/corelib/kernel/qsharedmemory_unix.cpp @@ -49,10 +49,10 @@ #include <errno.h> -QT_BEGIN_NAMESPACE - #ifndef QT_NO_SHAREDMEMORY +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 |