diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-07 09:37:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-07 09:37:21 (GMT) |
| commit | 75ff3f73544653f6828ac979a381f48e055cc3ad (patch) | |
| tree | b88463673e7f928fb32390d63d3a798099a16ef8 /src/corelib | |
| parent | 4c964245ba0b41225de01d2dfdff518070bb76b2 (diff) | |
| parent | 0f9b98736ceedebece6c9cd4ce2e669300f882c7 (diff) | |
| download | Qt-75ff3f73544653f6828ac979a381f48e055cc3ad.zip Qt-75ff3f73544653f6828ac979a381f48e055cc3ad.tar.gz Qt-75ff3f73544653f6828ac979a381f48e055cc3ad.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix build for desktop
Fix the build with -qtnamespace configure options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/arch/generic/qatomic_generic_windows.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/kernel/qsystemsemaphore_win.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/arch/generic/qatomic_generic_windows.cpp b/src/corelib/arch/generic/qatomic_generic_windows.cpp index 7ce0eea..123b823 100644 --- a/src/corelib/arch/generic/qatomic_generic_windows.cpp +++ b/src/corelib/arch/generic/qatomic_generic_windows.cpp @@ -43,6 +43,7 @@ #include <QtCore/qatomic.h> +QT_BEGIN_NAMESPACE class QCriticalSection { @@ -129,3 +130,5 @@ void *QBasicAtomicPointer_fetchAndAddOrdered(void * volatile *_q_value, qptrdiff qAtomicCriticalSection.unlock(); return returnValue; } + +QT_END_NAMESPACE diff --git a/src/corelib/kernel/qsystemsemaphore_win.cpp b/src/corelib/kernel/qsystemsemaphore_win.cpp index 0e9d645..76b57b9 100644 --- a/src/corelib/kernel/qsystemsemaphore_win.cpp +++ b/src/corelib/kernel/qsystemsemaphore_win.cpp @@ -133,6 +133,6 @@ bool QSystemSemaphorePrivate::modifySemaphore(int count) return true; } -#endif // QT_NO_SYSTEMSEMAPHORE - QT_END_NAMESPACE + +#endif // QT_NO_SYSTEMSEMAPHORE |