More fixes to QtQuick3D namespace compilation.

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

7 files changed, 30 insertions, 2 deletions

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