Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
  Fix compilation with namespace.
  Fix compilation with namespace.

7 files changed, 19 insertions, 8 deletions

diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h
index e5e7c59..a539050 100644
--- a/src/declarative/qml/qml.h
+++ b/src/declarative/qml/qml.h
@@ -55,8 +55,6 @@
 
 QT_BEGIN_HEADER
 
-QT_MODULE(Declarative)
-
 #define QML_DECLARE_TYPE(TYPE) \
     Q_DECLARE_METATYPE(TYPE *) \
     Q_DECLARE_METATYPE(QList<TYPE *> *) \
@@ -90,6 +88,8 @@ QT_END_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Declarative)
+
 #if defined(Q_OS_SYMBIAN)
 #define QML_DEFINE_INTERFACE(INTERFACE) \
     static int defineInterface##INTERFACE = qmlRegisterInterface<INTERFACE>(#INTERFACE);
diff --git a/src/gui/text/qstatictext.h b/src/gui/text/qstatictext.h
index 1e59944..00d42e0 100644
--- a/src/gui/text/qstatictext.h
+++ b/src/gui/text/qstatictext.h
@@ -97,10 +97,10 @@ private:
     friend class QStaticTextPrivate;
 };
 
-Q_DECLARE_METATYPE(QStaticText)
-
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QStaticText)
+
 QT_END_HEADER
 
 #endif // QSTATICTEXT_H
diff --git a/src/multimedia/base/qmediaserviceprovider.cpp b/src/multimedia/base/qmediaserviceprovider.cpp
index 8d1e0fa..eb97e16 100644
--- a/src/multimedia/base/qmediaserviceprovider.cpp
+++ b/src/multimedia/base/qmediaserviceprovider.cpp
@@ -48,7 +48,7 @@
 #include "qmediapluginloader_p.h"
 #include <QtMultimedia/qmediaplayer.h>
 
-
+QT_BEGIN_NAMESPACE
 
 class QMediaServiceProviderHintPrivate : public QSharedData
 {
@@ -594,6 +594,8 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider()
 #endif
 }
 
+QT_END_NAMESPACE
+
 /*!
     \class QMediaServiceProviderPlugin
     \preliminary
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index 5f50fdb..0684bd1 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -947,9 +947,10 @@ QStringList QMediaPlayer::supportedMimeTypes(Flags flags)
             Such playback service can be used for beeps, ringtones, etc.
 */
 
-#include "moc_qmediaplayer.cpp"
-
 QT_END_NAMESPACE
 
-QT_END_NAMESPACE
+QT_END_HEADER
+
+#include "moc_qmediaplayer.cpp"
+
 
diff --git a/src/multimedia/qml/qsoundeffect.cpp b/src/multimedia/qml/qsoundeffect.cpp
index f0c9659..df9af7b 100644
--- a/src/multimedia/qml/qsoundeffect.cpp
+++ b/src/multimedia/qml/qsoundeffect.cpp
@@ -52,6 +52,7 @@
 #include "qsoundeffect_qsound_p.h"
 #endif
 
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass SoundEffect QSoundEffect
@@ -250,3 +251,4 @@ void QSoundEffect::repeat()
     }
 }
 
+QT_END_NAMESPACE
diff --git a/src/multimedia/qml/qsoundeffect_qsound_p.cpp b/src/multimedia/qml/qsoundeffect_qsound_p.cpp
index 33f5bd4..0292d26 100644
--- a/src/multimedia/qml/qsoundeffect_qsound_p.cpp
+++ b/src/multimedia/qml/qsoundeffect_qsound_p.cpp
@@ -65,6 +65,7 @@
 
 #include "qsoundeffect_qsound_p.h"
 
+QT_BEGIN_NAMESPACE
 
 QSoundEffectPrivate::QSoundEffectPrivate(QObject* parent):
     QObject(parent),
@@ -221,3 +222,4 @@ void QSoundEffectPrivate::unloadSample()
     m_sound = 0;
 }
 
+QT_END_NAMESPACE
diff --git a/src/multimedia/qml/wavedecoder_p.cpp b/src/multimedia/qml/wavedecoder_p.cpp
index 5fc5a96..b7d6101 100644
--- a/src/multimedia/qml/wavedecoder_p.cpp
+++ b/src/multimedia/qml/wavedecoder_p.cpp
@@ -44,6 +44,8 @@
 #include <QtCore/qtimer.h>
 #include <QtCore/qendian.h>
 
+QT_BEGIN_NAMESPACE
+
 WaveDecoder::WaveDecoder(QIODevice *s, QObject *parent):
     QIODevice(parent),
     haveFormat(false),
@@ -134,3 +136,5 @@ void WaveDecoder::handleData()
         emit formatKnown();
     }
 }
+
+QT_END_NAMESPACE