Fixing compile errors on Mac 10.8/Qt 5.3 beta.

On Mac you need to use the module name when including files from other modules.

Change-Id: I7a70cdeaaa039bd90e3db277eace016fae1efafe
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

4 files changed, 23 insertions, 23 deletions

diff --git a/src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp b/src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp
index 17077c1c4..818a4a58c 100644
--- a/src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp
+++ b/src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp
@@ -175,13 +175,13 @@ namespace boost	{
 		// Get a specific tuple element
 		template <unsigned N>
 		typename detail::type_getter<T0,0,typename very_long::next_type, N>::type& get ()	{
-			return m.get<N>();
+            return m.template get<N>();
 		}
 
 		// ... and the const version
 		template <unsigned N>
 		const typename detail::type_getter<T0,0,typename very_long::next_type, N>::type& get () const	{
-			return m.get<N>();
+            return m.template get<N>();
 		}
 
 
@@ -208,14 +208,14 @@ namespace boost	{
 	template <unsigned N,typename T0,typename T1,typename T2,typename T3,typename T4>
 	inline typename tuple<T0,T1,T2,T3,T4>::very_long::template type_getter<N>::type& get (
 			tuple<T0,T1,T2,T3,T4>& m)	{
-			return m.get<N>();
+            return m.template get<N>();
 		}
 
 	// ... and the const version
 	template <unsigned N,typename T0,typename T1,typename T2,typename T3,typename T4>
 	inline const typename tuple<T0,T1,T2,T3,T4>::very_long::template type_getter<N>::type& get (
 			const tuple<T0,T1,T2,T3,T4>& m)	{
-			return m.get<N>();
+            return m.template get<N>();
 		}
 
 	// Constructs a tuple with 5 elements
@@ -224,11 +224,11 @@ namespace boost	{
 		const T1& t1,const T2& t2,const T3& t3,const T4& t4) {
 
 		tuple <T0,T1,T2,T3,T4> t;
-		t.get<0>() = t0;
-		t.get<1>() = t1;
-		t.get<2>() = t2;
-		t.get<3>() = t3;
-		t.get<4>() = t4;
+        t.template get<0>() = t0;
+        t.template get<1>() = t1;
+        t.template get<2>() = t2;
+        t.template get<3>() = t3;
+        t.template get<4>() = t4;
 		return t;
 	}
 
@@ -237,10 +237,10 @@ namespace boost	{
 	inline tuple <T0,T1,T2,T3> make_tuple (const T0& t0,
 		const T1& t1,const T2& t2,const T3& t3) {
 		tuple <T0,T1,T2,T3> t;
-		t.get<0>() = t0;
-		t.get<1>() = t1;
-		t.get<2>() = t2;
-		t.get<3>() = t3;
+        t.template get<0>() = t0;
+        t.template get<1>() = t1;
+        t.template get<2>() = t2;
+        t.template get<3>() = t3;
 		return t;
 	}
 
@@ -249,9 +249,9 @@ namespace boost	{
 	inline tuple <T0,T1,T2> make_tuple (const T0& t0,
 		const T1& t1,const T2& t2) {
 		tuple <T0,T1,T2> t;
-		t.get<0>() = t0;
-		t.get<1>() = t1;
-		t.get<2>() = t2;
+        t.template get<0>() = t0;
+        t.template get<1>() = t1;
+        t.template get<2>() = t2;
 		return t;
 	}
 
@@ -260,8 +260,8 @@ namespace boost	{
 	inline tuple <T0,T1> make_tuple (const T0& t0,
 		const T1& t1) {
 		tuple <T0,T1> t;
-		t.get<0>() = t0;
-		t.get<1>() = t1;
+        t.template get<0>() = t0;
+        t.template get<1>() = t1;
 		return t;
 	}
 
@@ -269,7 +269,7 @@ namespace boost	{
 	template <typename T0>
 	inline tuple <T0> make_tuple (const T0& t0) {
 		tuple <T0> t;
-		t.get<0>() = t0;
+        t.template get<0>() = t0;
 		return t;
 	}
 
diff --git a/src/3rdparty/assimp/code/STEPFile.h b/src/3rdparty/assimp/code/STEPFile.h
index 98febc9f7..2e0f20b83 100644
--- a/src/3rdparty/assimp/code/STEPFile.h
+++ b/src/3rdparty/assimp/code/STEPFile.h
@@ -195,13 +195,13 @@ namespace STEP {
 			// conversion support.
 			template <typename T>
 			const T& ResolveSelect(const DB& db) const {
-				return Couple<T>(db).MustGetObject(To<EXPRESS::ENTITY>())->To<T>();
+                return Couple<T>(db).MustGetObject(To<EXPRESS::ENTITY>())->template To<T>();
 			}
 
 			template <typename T>
 			const T* ResolveSelectPtr(const DB& db) const {
 				const EXPRESS::ENTITY* e = ToPtr<EXPRESS::ENTITY>();
-				return e?Couple<T>(db).MustGetObject(*e)->ToPtr<T>():(const T*)0;
+                return e?Couple<T>(db).MustGetObject(*e)->template ToPtr<T>():(const T*)0;
 			}
 
 		public:
diff --git a/src/core/render/backend/jobs/loadmeshdatajob.h b/src/core/render/backend/jobs/loadmeshdatajob.h
index e9f155e35..8e5e9d117 100644
--- a/src/core/render/backend/jobs/loadmeshdatajob.h
+++ b/src/core/render/backend/jobs/loadmeshdatajob.h
@@ -42,7 +42,7 @@
 #ifndef QT3D_RENDER_LOADMESHDATAJOB_H
 #define QT3D_RENDER_LOADMESHDATAJOB_H
 
-#include <qjob.h>
+#include <Qt3DCore/qjob.h>
 
 #include <meshdata.h>
 
diff --git a/src/core/render/frontend/technique.h b/src/core/render/frontend/technique.h
index 139831e85..6c16cb9a2 100644
--- a/src/core/render/frontend/technique.h
+++ b/src/core/render/frontend/technique.h
@@ -43,7 +43,7 @@
 #define TECHNIQUE_H
 
 #include <qt3drenderer_global.h>
-#include <node.h>
+#include <Qt3DCore/node.h>
 
 #include "tag.h"
 #include "renderpass.h"