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

5 files changed, 19 insertions, 3 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
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index a51e295..632df78 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -5031,7 +5031,7 @@ void QWidgetPrivate::registerTouchWindow(bool enable)
     if (enable == touchEventsEnabled)
         return;
 
-    QCocoaView *view = static_cast<QCocoaView *>(qt_mac_effectiveview_for(q));
+    QT_MANGLE_NAMESPACE(QCocoaView) *view = static_cast<QT_MANGLE_NAMESPACE(QCocoaView) *>(qt_mac_effectiveview_for(q));
     if (!view)
         return;
 
diff --git a/src/gui/text/qfontengine_coretext_p.h b/src/gui/text/qfontengine_coretext_p.h
index 0a2ae1f..4bd80be 100644
--- a/src/gui/text/qfontengine_coretext_p.h
+++ b/src/gui/text/qfontengine_coretext_p.h
@@ -52,6 +52,10 @@
 
 #if !defined(Q_WS_MAC) || (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
 class QRawFontPrivate;
 class QCoreTextFontEngineMulti;
 class QCoreTextFontEngine : public QFontEngine
@@ -146,6 +150,10 @@ private:
 
 CGAffineTransform qt_transform_from_fontdef(const QFontDef &fontDef);
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif// !defined(Q_WS_MAC) || (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
 
 #endif // QFONTENGINE_CORETEXT_P_H
diff --git a/src/qt3support/network/q3socketdevice_win.cpp b/src/qt3support/network/q3socketdevice_win.cpp
index df115d7..bde63a0 100644
--- a/src/qt3support/network/q3socketdevice_win.cpp
+++ b/src/qt3support/network/q3socketdevice_win.cpp
@@ -83,8 +83,13 @@ typedef struct {
     struct  qt_in6_addr sin6_addr;  /* IPv6 address */
     u_long  sin6_scope_id;          /* set of interfaces for a scope */
 } qt_sockaddr_in6;
+
+QT_END_NAMESPACE
+
 #endif
 
+QT_BEGIN_NAMESPACE
+
 #ifndef AF_INET6
 #define AF_INET6        23              /* Internetwork Version 6 */
 #endif