Fix namespace compilation.

Back-ported from Qt5 changes:
24b1b6bd5c6a3960cfdf71cc644d95926430c267
d641f03b6efecce266ef329eb4bbc48d87c2fc12
2734491c7230bfa54af46ef56085a56e61eed8a0
f037bb1fa72b7dee790367776a913b18a07445ac

Change-Id: I73e2e8996376ea40b9763224554aafba7fe7bdb6
Reviewed-by: Danny Pope <daniel.pope@nokia.com>

73 files changed, 208 insertions, 65 deletions

diff --git a/demos/qt3d/photobrowser3d/bytereader.h b/demos/qt3d/photobrowser3d/bytereader.h
index 81cdad85a..c790b823b 100644
--- a/demos/qt3d/photobrowser3d/bytereader.h
+++ b/demos/qt3d/photobrowser3d/bytereader.h
@@ -44,8 +44,11 @@
 
 #include <QObject>
 
-class ThumbnailableImage;
+QT_BEGIN_NAMESPACE
 class QUrl;
+QT_END_NAMESPACE
+
+class ThumbnailableImage;
 
 class ByteReader : public QObject
 {
diff --git a/demos/qt3d/photobrowser3d/imagedisplay.h b/demos/qt3d/photobrowser3d/imagedisplay.h
index 302bb70b4..b0d7a56dc 100644
--- a/demos/qt3d/photobrowser3d/imagedisplay.h
+++ b/demos/qt3d/photobrowser3d/imagedisplay.h
@@ -47,9 +47,12 @@
 
 #include <QString>
 
+QT_BEGIN_NAMESPACE
 class QGLBuilder;
 class QGLTexture2D;
 class QGLPainter;
+QT_END_NAMESPACE
+
 class ThumbnailNode;
 
 class ImageDisplay : public QGLSceneNode
diff --git a/demos/qt3d/photobrowser3d/pancontroller.h b/demos/qt3d/photobrowser3d/pancontroller.h
index 66834a9bf..b6e938abb 100644
--- a/demos/qt3d/photobrowser3d/pancontroller.h
+++ b/demos/qt3d/photobrowser3d/pancontroller.h
@@ -45,8 +45,11 @@
 #include <QObject>
 #include <Qt>
 
-class PanControllerPrivate;
+QT_BEGIN_NAMESPACE
 class QGLView;
+QT_END_NAMESPACE
+
+class PanControllerPrivate;
 
 class PanController : public QObject
 {
diff --git a/demos/qt3d/photobrowser3d/photobrowser3dview.h b/demos/qt3d/photobrowser3d/photobrowser3dview.h
index 848d8d376..50443c31d 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3dview.h
+++ b/demos/qt3d/photobrowser3d/photobrowser3dview.h
@@ -44,18 +44,22 @@
 
 #include "qglview.h"
 
-class ImageDisplay;
-class SkyBox;
+QT_BEGIN_NAMESPACE
 class QGLMaterialCollection;
 class QGLSceneNode;
-class ImageManager;
 class QState;
 class QStateMachine;
-class QFocusAdaptor;
+QT_END_NAMESPACE
+
+
+class SkyBox;
+class ImageDisplay;
+class ImageManager;
 class QAtlas;
 class Buttons;
 class QPhotoBrowser3DScene;
 class PanController;
+class QFocusAdaptor;
 
 class PhotoBrowser3DView : public QGLView
 {
diff --git a/demos/qt3d/photobrowser3d/qatlas.h b/demos/qt3d/photobrowser3d/qatlas.h
index 693a63b4d..33b5b5429 100644
--- a/demos/qt3d/photobrowser3d/qatlas.h
+++ b/demos/qt3d/photobrowser3d/qatlas.h
@@ -47,12 +47,14 @@
 #include "qarray.h"
 #include "qgeometrydata.h"
 
+QT_BEGIN_NAMESPACE
 class QAreaAllocator;
 class QGLTexture2D;
 class QGLMaterial;
 class QGeometryData;
 class QGLFramebufferObject;
 class QGLFramebufferObjectSurface;
+QT_END_NAMESPACE
 
 struct QAtlasEntry
 {
diff --git a/demos/qt3d/photobrowser3d/qfocusadaptor.h b/demos/qt3d/photobrowser3d/qfocusadaptor.h
index a94684610..8d0fe895f 100644
--- a/demos/qt3d/photobrowser3d/qfocusadaptor.h
+++ b/demos/qt3d/photobrowser3d/qfocusadaptor.h
@@ -44,8 +44,11 @@
 
 #include <QObject>
 
+QT_BEGIN_NAMESPACE
 class QGLView;
 class QGLSceneNode;
+QT_END_NAMESPACE
+
 class QFocusAdaptorPrivate;
 
 class QFocusAdaptor : public QObject
diff --git a/demos/qt3d/photobrowser3d/qphotobrowser3dscene.h b/demos/qt3d/photobrowser3d/qphotobrowser3dscene.h
index c34790cc2..73eb71599 100644
--- a/demos/qt3d/photobrowser3d/qphotobrowser3dscene.h
+++ b/demos/qt3d/photobrowser3d/qphotobrowser3dscene.h
@@ -44,7 +44,9 @@
 
 #include "qglabstractscene.h"
 
+QT_BEGIN_NAMESPACE
 class QGLSceneNode;
+QT_END_NAMESPACE
 
 class QPhotoBrowser3DScene : public QGLAbstractScene
 {
diff --git a/demos/qt3d/photobrowser3d/skybox.h b/demos/qt3d/photobrowser3d/skybox.h
index b66a656ba..79b17219d 100644
--- a/demos/qt3d/photobrowser3d/skybox.h
+++ b/demos/qt3d/photobrowser3d/skybox.h
@@ -45,11 +45,13 @@
 #include <QString>
 #include <QObject>
 
+QT_BEGIN_NAMESPACE
 class QGLBuilder;
 class QGLSceneNode;
 class QGLPainter;
 class QGLView;
 class QGLCamera;
+QT_END_NAMESPACE
 
 class SkyBox : public QObject
 {
diff --git a/demos/qt3d/photobrowser3d/thumbnailableimage.h b/demos/qt3d/photobrowser3d/thumbnailableimage.h
index cd5504fce..2f5b5b98c 100644
--- a/demos/qt3d/photobrowser3d/thumbnailableimage.h
+++ b/demos/qt3d/photobrowser3d/thumbnailableimage.h
@@ -48,9 +48,12 @@
 #include "qarray.h"
 #include "qgeometrydata.h"
 
+QT_BEGIN_NAMESPACE
 class QImage;
-class ThumbnailableImagePrivate;
 class QGLPainter;
+QT_END_NAMESPACE
+
+class ThumbnailableImagePrivate;
 
 class ThumbnailableImage
 {
diff --git a/demos/qt3d/teaservice/meshobject.h b/demos/qt3d/teaservice/meshobject.h
index 5b2065aef..15b62f057 100644
--- a/demos/qt3d/teaservice/meshobject.h
+++ b/demos/qt3d/teaservice/meshobject.h
@@ -48,8 +48,10 @@
 #include "qglpainter.h"
 #include "qglabstractscene.h"
 
+QT_BEGIN_NAMESPACE
 class QGLView;
 class QGLSceneNode;
+QT_END_NAMESPACE
 
 class MeshObject : public QObject
 {
diff --git a/demos/qt3d/teaservice/perpixeleffect.cpp b/demos/qt3d/teaservice/perpixeleffect.cpp
index afba6b45a..fc3a4260a 100644
--- a/demos/qt3d/teaservice/perpixeleffect.cpp
+++ b/demos/qt3d/teaservice/perpixeleffect.cpp
@@ -41,8 +41,6 @@
 
 #include "perpixeleffect.h"
 
-QT_BEGIN_NAMESPACE
-
 PerPixelEffect::PerPixelEffect()
 {
     setVertexShaderFromFile(":per_pixel_lighting.vsh");
@@ -52,5 +50,3 @@ PerPixelEffect::PerPixelEffect()
 PerPixelEffect::~PerPixelEffect()
 {
 }
-
-QT_END_NAMESPACE
diff --git a/demos/qt3d/teaservice/sceneobject.h b/demos/qt3d/teaservice/sceneobject.h
index df8bdc485..0e3a33238 100644
--- a/demos/qt3d/teaservice/sceneobject.h
+++ b/demos/qt3d/teaservice/sceneobject.h
@@ -45,7 +45,9 @@
 #include <QtCore/qobject.h>
 #include "qglpainter.h"
 
+QT_BEGIN_NAMESPACE
 class QGLView;
+QT_END_NAMESPACE
 
 class SceneObject : public QObject
 {
diff --git a/examples/qt3d/basket/basketview.h b/examples/qt3d/basket/basketview.h
index 03a8d61fd..305b18c48 100644
--- a/examples/qt3d/basket/basketview.h
+++ b/examples/qt3d/basket/basketview.h
@@ -43,7 +43,9 @@
 
 #include "qglview.h"
 
+QT_BEGIN_NAMESPACE
 class QGLSceneNode;
+QT_END_NAMESPACE
 
 //! [1]
 class BasketView : public QGLView
diff --git a/examples/qt3d/builder/builder.h b/examples/qt3d/builder/builder.h
index a54dea6bf..01df7d878 100644
--- a/examples/qt3d/builder/builder.h
+++ b/examples/qt3d/builder/builder.h
@@ -43,8 +43,10 @@
 
 #include "qglview.h"
 
+QT_BEGIN_NAMESPACE
 class QGLSceneNode;
 class QGLBuilder;
+QT_END_NAMESPACE
 
 class BuilderView : public QGLView
 {
diff --git a/examples/qt3d/cube/cubeview.h b/examples/qt3d/cube/cubeview.h
index 8996fd342..7398bdf56 100644
--- a/examples/qt3d/cube/cubeview.h
+++ b/examples/qt3d/cube/cubeview.h
@@ -43,7 +43,9 @@
 
 #include "qglview.h"
 
+QT_BEGIN_NAMESPACE
 class QGLSceneNode;
+QT_END_NAMESPACE
 
 class CubeView : public QGLView
 {
diff --git a/examples/qt3d/cylinder/cylinderview.h b/examples/qt3d/cylinder/cylinderview.h
index c2f4824b9..0a4ac8bc4 100644
--- a/examples/qt3d/cylinder/cylinderview.h
+++ b/examples/qt3d/cylinder/cylinderview.h
@@ -43,7 +43,9 @@
 
 #include "qglview.h"
 
+QT_BEGIN_NAMESPACE
 class QGLSceneNode;
+QT_END_NAMESPACE
 
 class CylinderView : public QGLView
 {
diff --git a/examples/qt3d/geometry/geometry.h b/examples/qt3d/geometry/geometry.h
index f9a356fc8..ff1004496 100644
--- a/examples/qt3d/geometry/geometry.h
+++ b/examples/qt3d/geometry/geometry.h
@@ -45,7 +45,9 @@
 
 #include <QImage>
 
+QT_BEGIN_NAMESPACE
 class QGLTexture2D;
+QT_END_NAMESPACE
 
 class Geometry : public QGLSceneNode
 {
diff --git a/examples/qt3d/geometry/geometryview.h b/examples/qt3d/geometry/geometryview.h
index 822a7a409..e6cc33e4a 100644
--- a/examples/qt3d/geometry/geometryview.h
+++ b/examples/qt3d/geometry/geometryview.h
@@ -44,14 +44,17 @@
 #include "qglview.h"
 #include "qgltexture2d.h"
 
+QT_BEGIN_NAMESPACE
 class QTimer;
-class QuadPlane;
-class Geometry;
 class QGLLightParameters;
 class QGLMaterial;
 class QGLLightModel;
 class QGLMaterialCollection;
 class QWheelEvent;
+QT_END_NAMESPACE
+
+class QuadPlane;
+class Geometry;
 
 class GeometryView : public QGLView
 {
diff --git a/examples/qt3d/graphicsview/modelitem.h b/examples/qt3d/graphicsview/modelitem.h
index 063cbb2b2..7ab552193 100644
--- a/examples/qt3d/graphicsview/modelitem.h
+++ b/examples/qt3d/graphicsview/modelitem.h
@@ -45,7 +45,9 @@
 #include "qglbuilder.h"
 #include "qray3d.h"
 
+QT_BEGIN_NAMESPACE
 class QGraphicsEmbedScene;
+QT_END_NAMESPACE
 
 class ModelItem : public QObject, public QGLGraphicsViewportItem
 {
diff --git a/examples/qt3d/nesting/cubeview.h b/examples/qt3d/nesting/cubeview.h
index 1fae5de4d..5bcce12ab 100644
--- a/examples/qt3d/nesting/cubeview.h
+++ b/examples/qt3d/nesting/cubeview.h
@@ -45,8 +45,10 @@
 #include "qglbuilder.h"
 #include "qglframebufferobjectsurface.h"
 
+QT_BEGIN_NAMESPACE
 class QGLFramebufferObject;
 class QGLCamera;
+QT_END_NAMESPACE
 
 class CubeView : public QGLView
 {
diff --git a/examples/qt3d/solarsystem/solarsystem.h b/examples/qt3d/solarsystem/solarsystem.h
index aa166e726..9b8bcc1a4 100644
--- a/examples/qt3d/solarsystem/solarsystem.h
+++ b/examples/qt3d/solarsystem/solarsystem.h
@@ -44,9 +44,11 @@
 #include "qglview.h"
 #include "qgraphicsrotation3d.h"
 
+QT_BEGIN_NAMESPACE
 class QGLSceneNode;
 class QGLBuilder;
 class QGLShaderProgramEffect;
+QT_END_NAMESPACE
 
 class SolarSystemView : public QGLView
 {
diff --git a/examples/qt3d/tank/tankview.h b/examples/qt3d/tank/tankview.h
index 38b966158..74f264389 100644
--- a/examples/qt3d/tank/tankview.h
+++ b/examples/qt3d/tank/tankview.h
@@ -43,7 +43,10 @@
 
 #include "qglview.h"
 
+QT_BEGIN_NAMESPACE
 class QGLSceneNode;
+QT_END_NAMESPACE
+
 class Tank;
 
 class TankView : public QGLView
diff --git a/examples/qt3d/teapot/teapotview.h b/examples/qt3d/teapot/teapotview.h
index d251f990a..f0dd04283 100644
--- a/examples/qt3d/teapot/teapotview.h
+++ b/examples/qt3d/teapot/teapotview.h
@@ -45,7 +45,9 @@
 #include "qglview.h"
 #include "qglteapot.h"
 
+QT_BEGIN_NAMESPACE
 class QGLSceneNode;
+QT_END_NAMESPACE
 
 class TeapotView : public QGLView
 {
diff --git a/src/imports/shapes/capsulemesh.h b/src/imports/shapes/capsulemesh.h
index e065d9362..3076f6ab9 100644
--- a/src/imports/shapes/capsulemesh.h
+++ b/src/imports/shapes/capsulemesh.h
@@ -85,10 +85,10 @@ private:
     QScopedPointer<CapsuleMeshPrivate> d_ptr;
 };
 
-QML_DECLARE_TYPE(CapsuleMesh)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(CapsuleMesh)
+
 QT_END_HEADER
 
 #endif // CAPSULE_H
diff --git a/src/imports/shapes/cylindermesh.h b/src/imports/shapes/cylindermesh.h
index 181ee0add..bfdc46f31 100644
--- a/src/imports/shapes/cylindermesh.h
+++ b/src/imports/shapes/cylindermesh.h
@@ -85,10 +85,10 @@ private:
     QScopedPointer<CylinderMeshPrivate> d_ptr;
 };
 
-QML_DECLARE_TYPE(CylinderMesh)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(CylinderMesh)
+
 QT_END_HEADER
 
 #endif // CYLINDER_H
diff --git a/src/imports/shapes/line.cpp b/src/imports/shapes/line.cpp
index 0091aaffb..ef7c90716 100644
--- a/src/imports/shapes/line.cpp
+++ b/src/imports/shapes/line.cpp
@@ -42,8 +42,6 @@
 #include "line.h"
 #include "qglbuilder.h"
 
-QT_BEGIN_NAMESPACE
-
 /*!
     \qmlclass Line Line
     \brief The Line item represents a geometric line drawn in 3D space.
diff --git a/src/imports/shapes/line.h b/src/imports/shapes/line.h
index 42a06e212..4f788dd94 100644
--- a/src/imports/shapes/line.h
+++ b/src/imports/shapes/line.h
@@ -80,10 +80,10 @@ private:
     bool m_changeFlag;
 };
 
-QML_DECLARE_TYPE(Line)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(Line)
+
 QT_END_HEADER
 
 #endif // LINE_H
diff --git a/src/imports/shapes/point.cpp b/src/imports/shapes/point.cpp
index 93595b7a4..8f2709753 100644
--- a/src/imports/shapes/point.cpp
+++ b/src/imports/shapes/point.cpp
@@ -42,8 +42,6 @@
 #include "point.h"
 #include "qglbuilder.h"
 
-QT_BEGIN_NAMESPACE
-
 /*!
     \qmlclass Point Point
     \brief The Point item represents a geometric point drawn in 3D space.
diff --git a/src/imports/shapes/point.h b/src/imports/shapes/point.h
index 16467e1fb..591f4d8ad 100644
--- a/src/imports/shapes/point.h
+++ b/src/imports/shapes/point.h
@@ -80,10 +80,10 @@ private:
     bool m_changeFlag;
 };
 
-QML_DECLARE_TYPE(Point)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(Point)
+
 QT_END_HEADER
 
 #endif // POINT_H
diff --git a/src/imports/shapes/spheremesh.h b/src/imports/shapes/spheremesh.h
index 1d324fc87..b4e2b4f0a 100644
--- a/src/imports/shapes/spheremesh.h
+++ b/src/imports/shapes/spheremesh.h
@@ -90,10 +90,10 @@ private:
     QScopedPointer<SphereMeshPrivate> d_ptr;
 };
 
-QML_DECLARE_TYPE(SphereMesh)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(SphereMesh)
+
 QT_END_HEADER
 
 #endif   // SPHEREMESH_H
diff --git a/src/imports/threed/billboarditem3d.h b/src/imports/threed/billboarditem3d.h
index ae5332015..d60b75fa9 100644
--- a/src/imports/threed/billboarditem3d.h
+++ b/src/imports/threed/billboarditem3d.h
@@ -64,10 +64,10 @@ private:
     bool m_preserveUpVector;
 };
 
-QML_DECLARE_TYPE(BillboardItem3D)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(BillboardItem3D)
+
 QT_END_HEADER
 
 #endif // BILLBOARDITEM3D_H
diff --git a/src/imports/threed/scale3d.h b/src/imports/threed/scale3d.h
index 50aa10fb6..a648bae25 100644
--- a/src/imports/threed/scale3d.h
+++ b/src/imports/threed/scale3d.h
@@ -71,10 +71,10 @@ private:
     Q_DISABLE_COPY(Scale3D)
 };
 
-QML_DECLARE_TYPE(Scale3D)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(Scale3D)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/imports/threed/shaderprogram.h b/src/imports/threed/shaderprogram.h
index 842cfb6c4..d19866141 100644
--- a/src/imports/threed/shaderprogram.h
+++ b/src/imports/threed/shaderprogram.h
@@ -86,10 +86,10 @@ private:
     ShaderProgramPrivate *d;
 };
 
-QML_DECLARE_TYPE(ShaderProgram)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(ShaderProgram)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/imports/threed/shaderprogram_p.h b/src/imports/threed/shaderprogram_p.h
index 0802b4b79..6b67c4ce1 100644
--- a/src/imports/threed/shaderprogram_p.h
+++ b/src/imports/threed/shaderprogram_p.h
@@ -48,6 +48,8 @@
 #include "qdeclarativeeffect.h"
 #include "qglshaderprogrameffect.h"
 
+QT_BEGIN_NAMESPACE
+
 class ShaderProgram;
 class ShaderProgramEffect;
 
@@ -145,4 +147,6 @@ private:
     QSet<int> changedTextures;
 };
 
+QT_END_NAMESPACE
+
 #endif // SHADERPROGRAM_P_H
diff --git a/src/imports/threed/skybox.h b/src/imports/threed/skybox.h
index 22f3cdd4d..b9baef857 100644
--- a/src/imports/threed/skybox.h
+++ b/src/imports/threed/skybox.h
@@ -102,10 +102,10 @@ private:
     QGLCamera *m_camera;
 };
 
-QML_DECLARE_TYPE(Skybox)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(Skybox)
+
 QT_END_HEADER
 
 #endif // SKYBOX_H
diff --git a/src/imports/threed/threed.cpp b/src/imports/threed/threed.cpp
index 5faf87f09..3effca86c 100644
--- a/src/imports/threed/threed.cpp
+++ b/src/imports/threed/threed.cpp
@@ -63,8 +63,6 @@
 
 #include "billboarditem3d.h"
 
-QT_BEGIN_NAMESPACE
-
 QML_DECLARE_TYPE(QGraphicsTransform3D)
 QML_DECLARE_TYPE(QGraphicsRotation3D)
 QML_DECLARE_TYPE(QGraphicsTranslation3D)
@@ -76,6 +74,8 @@ QML_DECLARE_TYPE(QGLLightModel)
 QML_DECLARE_TYPE(QGLLightParameters)
 QML_DECLARE_TYPE(QGLCamera)
 
+QT_BEGIN_NAMESPACE
+
 class QThreedQmlModule : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
diff --git a/src/imports/threed/viewport.h b/src/imports/threed/viewport.h
index f18440589..c0c9c0552 100644
--- a/src/imports/threed/viewport.h
+++ b/src/imports/threed/viewport.h
@@ -149,10 +149,10 @@ private:
     QPointF viewDelta(qreal deltax, qreal deltay);
 };
 
-QML_DECLARE_TYPE(Viewport)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(Viewport)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/plugins/sceneformats/assimp/ailoaderiostream.h b/src/plugins/sceneformats/assimp/ailoaderiostream.h
index 5444c6616..b74d8c16e 100644
--- a/src/plugins/sceneformats/assimp/ailoaderiostream.h
+++ b/src/plugins/sceneformats/assimp/ailoaderiostream.h
@@ -42,10 +42,13 @@
 #ifndef AILOADERIOSTREAM_H
 #define AILOADERIOSTREAM_H
 
+#include <QtGlobal>
 #include "IOStream.h"
 #include "IOSystem.h"
 
+QT_BEGIN_NAMESPACE
 class QIODevice;
+QT_END_NAMESPACE
 
 class AiLoaderIOStream : public Assimp::IOStream
 {
diff --git a/src/plugins/sceneformats/assimp/ailoaderiosystem.h b/src/plugins/sceneformats/assimp/ailoaderiosystem.h
index d3c832849..00d2da6c1 100644
--- a/src/plugins/sceneformats/assimp/ailoaderiosystem.h
+++ b/src/plugins/sceneformats/assimp/ailoaderiosystem.h
@@ -46,7 +46,10 @@
 
 #include <QtCore/qurl.h>
 
+QT_BEGIN_NAMESPACE
 class QIODevice;
+QT_END_NAMESPACE
+
 class IOStream;
 
 class AiLoaderIOSystem : public Assimp::IOSystem
diff --git a/src/plugins/sceneformats/assimp/qailoader.h b/src/plugins/sceneformats/assimp/qailoader.h
index e5858852f..e7de00983 100644
--- a/src/plugins/sceneformats/assimp/qailoader.h
+++ b/src/plugins/sceneformats/assimp/qailoader.h
@@ -50,11 +50,14 @@
 
 #include "qglbuilder.h"
 
+class aiMaterial;
+
+QT_BEGIN_NAMESPACE
+
 class QAiMesh;
 class QGLSceneNode;
 class QAiSceneHandler;
 class QGLMaterial;
-class aiMaterial;
 class QAiScene;
 class QAiLoader
 {
@@ -87,4 +90,6 @@ private:
     QGLBuilder m_builder;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGL3DSLOADER_H
diff --git a/src/plugins/sceneformats/assimp/qaimesh.h b/src/plugins/sceneformats/assimp/qaimesh.h
index eaf9472e7..23d352aae 100644
--- a/src/plugins/sceneformats/assimp/qaimesh.h
+++ b/src/plugins/sceneformats/assimp/qaimesh.h
@@ -45,11 +45,14 @@
 #include "qaiscenehandler.h"
 #include "qgeometrydata.h"
 
+class aiMesh;
+
+QT_BEGIN_NAMESPACE
+
 class QGLMaterialCollection;
 class QGLSceneNode;
 class QGLBuilder;
 class QAiLoader;
-class aiMesh;
 
 class QAiMesh
 {
@@ -64,4 +67,6 @@ private:
     aiMesh *m_mesh;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGL3DSMESH_H
diff --git a/src/quick3d/qdeclarativeeffect.h b/src/quick3d/qdeclarativeeffect.h
index 91c799c8d..d187952c6 100644
--- a/src/quick3d/qdeclarativeeffect.h
+++ b/src/quick3d/qdeclarativeeffect.h
@@ -116,10 +116,10 @@ private:
     QDeclarativeEffectPrivate *d;
 };
 
-QML_DECLARE_TYPE(QDeclarativeEffect)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QDeclarativeEffect)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/quick3d/qdeclarativeitem3d.h b/src/quick3d/qdeclarativeitem3d.h
index 5d4895437..5645897fc 100644
--- a/src/quick3d/qdeclarativeitem3d.h
+++ b/src/quick3d/qdeclarativeitem3d.h
@@ -215,12 +215,12 @@ private:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeItem3D::CullFaces)
 
-QML_DECLARE_TYPE(QDeclarativeItem3D)
-
 Q_QT3D_QUICK_EXPORT void qDumpItem(QDeclarativeItem3D *item, bool detailed = true, int indent = 0);
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QDeclarativeItem3D)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/quick3d/qdeclarativemesh.h b/src/quick3d/qdeclarativemesh.h
index bdea9c776..d7eea5da7 100644
--- a/src/quick3d/qdeclarativemesh.h
+++ b/src/quick3d/qdeclarativemesh.h
@@ -131,14 +131,10 @@ private:
 
 };
 
-
-
-
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeMesh)
 
-QT_END_NAMESPACE
-
 QT_END_HEADER
 
 #endif
diff --git a/src/threed/effects/qglcolladafxeffect.cpp b/src/threed/effects/qglcolladafxeffect.cpp
index ee3b54835..665c0ea74 100644
--- a/src/threed/effects/qglcolladafxeffect.cpp
+++ b/src/threed/effects/qglcolladafxeffect.cpp
@@ -49,6 +49,8 @@
 #include "qglcolladafxeffect.h"
 #include "qglcolladafxeffect_p.h"
 
+QT_BEGIN_NAMESPACE
+
 QGLColladaFxEffect::QGLColladaFxEffect() : QGLShaderProgramEffect()
         , d( new QGLColladaFxEffectPrivate )
 {
@@ -404,3 +406,5 @@ void QGLColladaFxEffect::setActive(QGLPainter *painter, bool flag)
                          !fragmentShader().isEmpty();
     QGLShaderProgramEffect::setActive(painter, d->currentlyActive);
 }
+
+QT_END_NAMESPACE
diff --git a/src/threed/effects/qglcolladafxeffect.h b/src/threed/effects/qglcolladafxeffect.h
index cf9ddfde3..9486ec044 100644
--- a/src/threed/effects/qglcolladafxeffect.h
+++ b/src/threed/effects/qglcolladafxeffect.h
@@ -47,6 +47,8 @@
 #include <QGLShaderProgram>
 #include "qglshaderprogrameffect.h"
 
+QT_BEGIN_NAMESPACE
+
 class QXmlStreamReader;
 class QGLColladaParam;
 class QGLColladaFxEffectPrivate;
@@ -91,4 +93,6 @@ private:
     QGLColladaFxEffectPrivate* d;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGLCOLLADAEFFECT_H
diff --git a/src/threed/effects/qglcolladafxeffect_p.h b/src/threed/effects/qglcolladafxeffect_p.h
index bdeb58a74..cf7dae2f8 100644
--- a/src/threed/effects/qglcolladafxeffect_p.h
+++ b/src/threed/effects/qglcolladafxeffect_p.h
@@ -59,6 +59,8 @@
 #include "qgltexture2d.h"
 #include "qglcolladafxeffect.h"
 
+QT_BEGIN_NAMESPACE
+
 class QGLPainter;
 class QGLShaderProgram;
 class QGLMaterial;
@@ -104,4 +106,6 @@ public:
     bool currentlyActive;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGLCOLLADAFXEFFECT_P_H
diff --git a/src/threed/effects/qglcolladafxeffectfactory.cpp b/src/threed/effects/qglcolladafxeffectfactory.cpp
index 4abe177e3..192c2dc0e 100644
--- a/src/threed/effects/qglcolladafxeffectfactory.cpp
+++ b/src/threed/effects/qglcolladafxeffectfactory.cpp
@@ -52,6 +52,8 @@
 //#include "qglcolladafxeffectfactory_p.h"
 #include "qglcolladafxeffect_p.h"
 
+QT_BEGIN_NAMESPACE
+
 // The QGLColladaFxFactory class creates a list of QGLColladaFx objects from
 // COLLADA FX information according to the 1.4.1 March 2008 Release from
 // http://www.khronos.org/collada/
@@ -1283,9 +1285,11 @@ bool QGLColladaFxEffectFactory::resolveTexture2DImage(QGLTexture2D *texture, Res
 }
 
 
-
+QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QGLTexture2D*);
+
+QT_BEGIN_NAMESPACE
 /*!
     \internal
     Parses and consumes a texture collada element from \a xml.
@@ -1686,3 +1690,5 @@ void QGLColladaFxEffectFactory::processProgramElement( QXmlStreamReader& xml, Re
     findEndTag(xml, QLatin1String("program"));
     return;
 }
+
+QT_END_NAMESPACE
diff --git a/src/threed/effects/qglcolladafxeffectfactory.h b/src/threed/effects/qglcolladafxeffectfactory.h
index d70837e7f..1ed5bb9e4 100644
--- a/src/threed/effects/qglcolladafxeffectfactory.h
+++ b/src/threed/effects/qglcolladafxeffectfactory.h
@@ -50,13 +50,15 @@
 
 #include "qglcolladafxeffect.h"
 
+Q_DECLARE_METATYPE(QArray<float>)
+
+QT_BEGIN_NAMESPACE
+
 class QGLColladaFxEffect;
 class QGLColladaImageParam;
 class QGLColladaSurfaceParam;
 class QGLColladaSampler2DParam;
 
-Q_DECLARE_METATYPE(QArray<float>)
-
 typedef struct _ResultState
 {
     QMap<QString, QVariant> paramSids;
@@ -211,4 +213,6 @@ protected:
     QString mName;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGLCOLLADAFXEFFECTFACTORY_H
diff --git a/src/threed/effects/qglcolladafxeffectloader.cpp b/src/threed/effects/qglcolladafxeffectloader.cpp
index 9cf89eeb1..cb1812575 100644
--- a/src/threed/effects/qglcolladafxeffectloader.cpp
+++ b/src/threed/effects/qglcolladafxeffectloader.cpp
@@ -49,6 +49,8 @@
 
 //Q_DECLARE_METATYPE(QGLColladaFxEffect)
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \class QGLColladaFxEffectLoader
     \brief The QGLColladaFxEffectLoader class is a convenient way to load
@@ -184,3 +186,5 @@ QGLColladaFxEffect *QGLColladaFxEffectLoader::operator[](int i)
 
     return d->effects.at(i);
 }
+
+QT_END_NAMESPACE
diff --git a/src/threed/effects/qglcolladafxeffectloader.h b/src/threed/effects/qglcolladafxeffectloader.h
index b6bf9c881..84dbcf84e 100644
--- a/src/threed/effects/qglcolladafxeffectloader.h
+++ b/src/threed/effects/qglcolladafxeffectloader.h
@@ -48,6 +48,8 @@
 #include <QtCore/qscopedpointer.h>
 #include "qt3dglobal.h"
 
+QT_BEGIN_NAMESPACE
+
 class QGLColladaFxEffect;
 class QGLColladaFxEffectLoaderPrivate;
 
@@ -66,4 +68,6 @@ private:
     QScopedPointer<QGLColladaFxEffectLoaderPrivate> d_ptr;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGLCOLLADAFXEFFECTLOADER_H
diff --git a/src/threed/geometry/qgeometrydata.cpp b/src/threed/geometry/qgeometrydata.cpp
index 576bf8433..6ee4e1811 100644
--- a/src/threed/geometry/qgeometrydata.cpp
+++ b/src/threed/geometry/qgeometrydata.cpp
@@ -46,6 +46,8 @@
 #include <QtOpenGL/qgl.h>
 #include <QtCore/qdebug.h>
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \class QGeometryData
     \brief The QGeometryData class encapsulates sets of geometry data.
@@ -2022,4 +2024,7 @@ QDebug operator<<(QDebug dbg, const QGeometryData &vertices)
     }
     return dbg;
 }
+
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/threed/geometry/qglbuilder.cpp b/src/threed/geometry/qglbuilder.cpp
index 430afd1ef..1a73d9ca6 100644
--- a/src/threed/geometry/qglbuilder.cpp
+++ b/src/threed/geometry/qglbuilder.cpp
@@ -51,6 +51,8 @@
 
 #include <QtCore/qdebug.h>
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \class QGLBuilder
     \brief The QGLBuilder class constructs geometry for efficient display.
@@ -1376,3 +1378,5 @@ QGLBuilder& operator<<(QGLBuilder& builder, const QGeometryData& triangles)
     builder.addTriangles(triangles);
     return builder;
 }
+
+QT_END_NAMESPACE
diff --git a/src/threed/geometry/qglcylinder.cpp b/src/threed/geometry/qglcylinder.cpp
index 6fc3b4bde..76f5fc75a 100644
--- a/src/threed/geometry/qglcylinder.cpp
+++ b/src/threed/geometry/qglcylinder.cpp
@@ -441,3 +441,5 @@ QGLBuilder& operator<<(QGLBuilder& builder, const QGLCylinder& cylinder)
 
     return builder;
 }
+
+QT_END_NAMESPACE
diff --git a/src/threed/geometry/qglmaterialcollection.cpp b/src/threed/geometry/qglmaterialcollection.cpp
index 6e54ee0a0..0f3968370 100644
--- a/src/threed/geometry/qglmaterialcollection.cpp
+++ b/src/threed/geometry/qglmaterialcollection.cpp
@@ -413,3 +413,5 @@ void QGLMaterialCollection::materialDeleted()
 {
     removeMaterial(qobject_cast<QGLMaterial *>(sender()));
 }
+
+QT_END_NAMESPACE
diff --git a/src/threed/geometry/qglsection.cpp b/src/threed/geometry/qglsection.cpp
index 7c89c4ded..f60e9ffca 100644
--- a/src/threed/geometry/qglsection.cpp
+++ b/src/threed/geometry/qglsection.cpp
@@ -52,6 +52,8 @@
 
 #include <limits.h>
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \internal
     \class QGLSection
@@ -694,3 +696,5 @@ QDebug operator<<(QDebug dbg, const QGLSection &section)
     return dbg.space();
 }
 #endif
+
+QT_END_NAMESPACE
diff --git a/src/threed/geometry/qlogicalvertex.cpp b/src/threed/geometry/qlogicalvertex.cpp
index 0a299b0fb..84dc09ae9 100644
--- a/src/threed/geometry/qlogicalvertex.cpp
+++ b/src/threed/geometry/qlogicalvertex.cpp
@@ -44,6 +44,8 @@
 
 #include <QtCore/qdebug.h>
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \class QLogicalVertex
     \brief The QLogicalVertex class references QGeometryData at a single vertex.
@@ -414,3 +416,5 @@ QDebug operator<<(QDebug dbg, const QLogicalVertex &lv)
     return dbg.space();
 }
 #endif
+
+QT_END_NAMESPACE
diff --git a/src/threed/painting/qglpickcolors_p.h b/src/threed/painting/qglpickcolors_p.h
index d1a982768..0249fb149 100644
--- a/src/threed/painting/qglpickcolors_p.h
+++ b/src/threed/painting/qglpickcolors_p.h
@@ -61,4 +61,6 @@ QT_BEGIN_NAMESPACE
 QRgb qt_qgl_pick_color(int index);
 QRgb qt_qgl_normalize_pick_color(QRgb color, bool is444 = false);
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/threed/scene/qglpicknode.h b/src/threed/scene/qglpicknode.h
index 1e4944dab..5b53d5ff0 100644
--- a/src/threed/scene/qglpicknode.h
+++ b/src/threed/scene/qglpicknode.h
@@ -45,6 +45,8 @@
 #include <QtCore/qobject.h>
 #include "qt3dglobal.h"
 
+QT_BEGIN_NAMESPACE
+
 class QGLAbstractScene;
 class QGLSceneNode;
 class QEvent;
@@ -75,4 +77,6 @@ protected:
     QGLSceneNode *m_target;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGLPICKNODE_H
diff --git a/src/threed/scene/qglrendersequencer.cpp b/src/threed/scene/qglrendersequencer.cpp
index fe07e4455..0a739ed0f 100644
--- a/src/threed/scene/qglrendersequencer.cpp
+++ b/src/threed/scene/qglrendersequencer.cpp
@@ -47,6 +47,8 @@
 
 #include <QtCore/qstack.h>
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \class QGLRenderSequencer
     \brief The QGLRenderSequencer class orders the rendering of QGLSceneNode instances.
@@ -363,3 +365,5 @@ void QGLRenderSequencer::setComparator(QGLRenderOrderComparator *comparator)
     delete d->compare;
     d->compare = comparator;
 }
+
+QT_END_NAMESPACE
diff --git a/src/threed/scene/qglrenderstate.cpp b/src/threed/scene/qglrenderstate.cpp
index 2f9fa22c0..4414dbce1 100644
--- a/src/threed/scene/qglrenderstate.cpp
+++ b/src/threed/scene/qglrenderstate.cpp
@@ -41,6 +41,8 @@
 
 #include "qglrenderstate.h"
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \class QGLRenderState
     \brief The QGLRenderState class encapsulates the states of a rendering pass.
@@ -314,3 +316,5 @@ Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QGLRenderState &order)
 }
 
 #endif
+
+QT_END_NAMESPACE
diff --git a/src/threed/scene/qglrenderstate.h b/src/threed/scene/qglrenderstate.h
index c3d5f70e3..2007f19b4 100644
--- a/src/threed/scene/qglrenderstate.h
+++ b/src/threed/scene/qglrenderstate.h
@@ -48,6 +48,8 @@
 
 #include <QtCore/qshareddata.h>
 
+QT_BEGIN_NAMESPACE
+
 class QGLAbstractEffect;
 class QGLMaterial;
 
@@ -98,4 +100,6 @@ inline uint qHash(const QGLRenderState &s)
 Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QGLRenderState &order);
 #endif
 
+QT_END_NAMESPACE
+
 #endif // QGLRENDERSTATE_H
diff --git a/src/threed/scene/qglscenenode_p.h b/src/threed/scene/qglscenenode_p.h
index ce8a6f14b..21028ddbd 100644
--- a/src/threed/scene/qglscenenode_p.h
+++ b/src/threed/scene/qglscenenode_p.h
@@ -62,6 +62,8 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qset.h>
 
+QT_BEGIN_NAMESPACE
+
 class QGLAbstractEffect;
 class QGLPickNode;
 
@@ -138,4 +140,6 @@ public:
     bool culled;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGLSCENENODE_P_H
diff --git a/tests/auto/threed/qglcolladafxeffectfactory/tst_qglcolladafxeffectfactory.cpp b/tests/auto/threed/qglcolladafxeffectfactory/tst_qglcolladafxeffectfactory.cpp
index 7ec91fe63..b60f122b9 100644
--- a/tests/auto/threed/qglcolladafxeffectfactory/tst_qglcolladafxeffectfactory.cpp
+++ b/tests/auto/threed/qglcolladafxeffectfactory/tst_qglcolladafxeffectfactory.cpp
@@ -45,7 +45,9 @@
 #include <QColor>
 #include "qgl.h"
 
+QT_BEGIN_NAMESPACE
 class QGLColladaFxEffect;
+QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QGLColladaFxEffect*)
 
diff --git a/tests/auto/threed/qglpainter/qgltestwidget.h b/tests/auto/threed/qglpainter/qgltestwidget.h
index e4967e058..7fb17e6a3 100644
--- a/tests/auto/threed/qglpainter/qgltestwidget.h
+++ b/tests/auto/threed/qglpainter/qgltestwidget.h
@@ -44,7 +44,9 @@
 
 #include <QtOpenGL/qgl.h>
 
+QT_BEGIN_NAMESPACE
 class QEventLoop;
+QT_END_NAMESPACE
 
 class QGLTestWidget : public QGLWidget
 {
diff --git a/tests/auto/threed/qray3d/tst_qray3d.cpp b/tests/auto/threed/qray3d/tst_qray3d.cpp
index 9380213ed..97263c993 100644
--- a/tests/auto/threed/qray3d/tst_qray3d.cpp
+++ b/tests/auto/threed/qray3d/tst_qray3d.cpp
@@ -41,6 +41,7 @@
 
 #include <QtTest/QtTest>
 #include "qray3d.h"
+#include "../../../shared/qtest_helpers.h"
 
 class tst_QRay3D : public QObject
 {
@@ -99,18 +100,6 @@ static inline bool fuzzyCompare(const QVector3D &lhs, const QVector3D &rhs)
     return false;
 }
 
-// make failed QCOMPARE messages more detailed than "Compared values are not
-// the same"
-namespace QTest {
-
-template <>
-inline char *toString(const QVector3D& vec)
-{
-    return qstrdup(qPrintable(QString::fromLatin1("(%1, %2, %3)").arg(vec.x()).arg(vec.y()).arg(vec.z())));
-}
-
-};
-
 void tst_QRay3D::create_data()
 {
     QTest::addColumn<QVector3D>("point");
diff --git a/tests/shared/qtest_helpers.h b/tests/shared/qtest_helpers.h
index d7fb67aa5..b32be7a28 100644
--- a/tests/shared/qtest_helpers.h
+++ b/tests/shared/qtest_helpers.h
@@ -59,6 +59,8 @@
 #include <QtGui/qvector2d.h>
 #include "qcolor4ub.h"
 
+QT_BEGIN_NAMESPACE
+
 namespace QTest {
     char *toString(const QVector4D &v)
     {
@@ -152,4 +154,6 @@ namespace QTest {
 
 };
 
+QT_END_NAMESPACE
+
 #endif // QTEST_HELPERS_H
diff --git a/tutorials/qt3d/cube1/cubeview.h b/tutorials/qt3d/cube1/cubeview.h
index 04238f58d..de1156bc5 100644
--- a/tutorials/qt3d/cube1/cubeview.h
+++ b/tutorials/qt3d/cube1/cubeview.h
@@ -43,7 +43,9 @@
 
 #include "qglview.h"
 
+QT_BEGIN_NAMESPACE
 class QGLSceneNode;
+QT_END_NAMESPACE
 
 //! [1]
 class CubeView : public QGLView
diff --git a/tutorials/qt3d/cube2/cubeview.h b/tutorials/qt3d/cube2/cubeview.h
index 04238f58d..de1156bc5 100644
--- a/tutorials/qt3d/cube2/cubeview.h
+++ b/tutorials/qt3d/cube2/cubeview.h
@@ -43,7 +43,9 @@
 
 #include "qglview.h"
 
+QT_BEGIN_NAMESPACE
 class QGLSceneNode;
+QT_END_NAMESPACE
 
 //! [1]
 class CubeView : public QGLView
diff --git a/tutorials/qt3d/cube3/cubeview.h b/tutorials/qt3d/cube3/cubeview.h
index 04238f58d..de1156bc5 100644
--- a/tutorials/qt3d/cube3/cubeview.h
+++ b/tutorials/qt3d/cube3/cubeview.h
@@ -43,7 +43,9 @@
 
 #include "qglview.h"
 
+QT_BEGIN_NAMESPACE
 class QGLSceneNode;
+QT_END_NAMESPACE
 
 //! [1]
 class CubeView : public QGLView
diff --git a/tutorials/qt3d/cube4/cubeview.h b/tutorials/qt3d/cube4/cubeview.h
index 4f00216ca..af8d336de 100644
--- a/tutorials/qt3d/cube4/cubeview.h
+++ b/tutorials/qt3d/cube4/cubeview.h
@@ -44,7 +44,9 @@
 #include "qglview.h"
 #include "qgltexture2d.h"
 
+QT_BEGIN_NAMESPACE
 class QGLSceneNode;
+QT_END_NAMESPACE
 
 //! [1]
 class CubeView : public QGLView
diff --git a/tutorials/qt3d/penguin/modelview.h b/tutorials/qt3d/penguin/modelview.h
index 978b185f8..cb6b87afa 100644
--- a/tutorials/qt3d/penguin/modelview.h
+++ b/tutorials/qt3d/penguin/modelview.h
@@ -44,8 +44,10 @@
 //! [class-defn]
 #include "qglview.h"
 
+QT_BEGIN_NAMESPACE
 class QGLAbstractScene;
 class QGLSceneNode;
+QT_END_NAMESPACE
 
 class ModelView : public QGLView
 {
diff --git a/tutorials/qt3d/penguin_advanced/modelview.h b/tutorials/qt3d/penguin_advanced/modelview.h
index 38b4340cc..3ec5c955f 100644
--- a/tutorials/qt3d/penguin_advanced/modelview.h
+++ b/tutorials/qt3d/penguin_advanced/modelview.h
@@ -43,8 +43,10 @@
 
 #include "qglview.h"
 
+QT_BEGIN_NAMESPACE
 class QGLAbstractScene;
 class QGLSceneNode;
+QT_END_NAMESPACE
 
 class ModelView : public QGLView
 {