More fixes to QtQuick3D namespace compilation.

Change-Id: Ib648c9fbd613be1548c194fe6afd3d791c1ae368
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

40 files changed, 113 insertions, 27 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 4c7c14a79..260b51492 100644
--- a/demos/qt3d/photobrowser3d/qatlas.h
+++ b/demos/qt3d/photobrowser3d/qatlas.h
@@ -48,12 +48,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 b52b2f36e..293cdb531 100644
--- a/examples/qt3d/basket/basketview.h
+++ b/examples/qt3d/basket/basketview.h
@@ -43,8 +43,10 @@
 
 #include "qglview.h"
 
+QT_BEGIN_NAMESPACE
 class QGLSceneNode;
 class QWindow;
+QT_END_NAMESPACE
 
 //! [1]
 class BasketView : public QGLView
diff --git a/examples/qt3d/builder/builder.h b/examples/qt3d/builder/builder.h
index 1f4e00590..a6735bf26 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 c184ff046..1b94231c3 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 828772d78..356b5511e 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 631d48598..c63ecddce 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 0ce1f4646..bebe8b9ae 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 QOpenGLFramebufferObject;
 class QGLCamera;
+QT_END_NAMESPACE
 
 class CubeView : public QGLView
 {
diff --git a/examples/qt3d/solarsystem/solarsystem.h b/examples/qt3d/solarsystem/solarsystem.h
index 372d1985b..2b2201cf3 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 112598ad2..c26f42889 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 e2ba50b05..f3bb010c7 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/plugins/imageformats/tga/qtgafile.h b/src/plugins/imageformats/tga/qtgafile.h
index 034200eec..1e2bf2ed7 100644
--- a/src/plugins/imageformats/tga/qtgafile.h
+++ b/src/plugins/imageformats/tga/qtgafile.h
@@ -45,6 +45,8 @@
 #include <QtGui/qcolor.h>
 #include <QtGui/qimage.h>
 
+QT_BEGIN_NAMESPACE
+
 class QIODevice;
 
 class QTgaFile
@@ -143,4 +145,6 @@ inline QTgaFile::Compression QTgaFile::compression() const
     return NoCompression;
 }
 
+QT_END_NAMESPACE
+
 #endif // QTGAFILE_H
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 eee2a2f78..769253521 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 QAiLoader
 {
@@ -86,4 +89,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/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/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/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 a05f0f30d..973e393fb 100644
--- a/tests/auto/threed/qglpainter/qgltestwidget.h
+++ b/tests/auto/threed/qglpainter/qgltestwidget.h
@@ -44,7 +44,9 @@
 
 #include "qglview.h"
 
+QT_BEGIN_NAMESPACE
 class QEventLoop;
+QT_END_NAMESPACE
 
 class QGLTestWidget : public QGLView
 {
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 ed918f066..e9040e938 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 77b5d2b9a..303497142 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 77b5d2b9a..303497142 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 77b5d2b9a..303497142 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 fd5937b25..fc9ff813d 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 dc1f75a51..dd8da1abd 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 c6a23ed13..24ab9962d 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
 {