Fix namespace compilation.

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

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

12 files changed, 36 insertions, 11 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
 {