Relocate the render aspect outside of core

Change-Id: I636442d2d71342fd248b90674176cede895feab2 Reviewed-by: Sean Harmer <[email protected]>
dignakov · Mar 29, 2014 · 39a3a07 · 39a3a07
1 parent 6b9ff7a
commit 39a3a07
Show file tree

Hide file tree

Showing 131 changed files with 9 additions and 9 deletions.
diff --git a/qt3d.pro b/qt3d.pro
@@ -15,3 +15,6 @@ load(qt_parts)
 contains(QT_CONFIG, opengles1) {
     error("Qt3D does not support OpenGL ES 1!")
 }
+
+OTHER_FILES += \
+    sync.profile
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp
@@ -41,7 +41,7 @@
 
 #include "qaspectmanager.h"
 
-#include "rendereraspect.h"
+#include "abstractaspect.h"
 #include "qchangearbiter.h"
 // TODO Make the kind of job manager configurable (e.g. ThreadWeaver vs Intel TBB)
 #include "qjobmanager.h"
@@ -52,21 +52,17 @@
 #include <node.h>
 #include <entity.h>
 #include <camera.h>
-#include <scene.h>
 #include <matrixtransform.h>
 #include <rotatetransform.h>
 #include <translatetransform.h>
 #include <lookattransform.h>
 #include <scaletransform.h>
 
 #include <QDebug>
-#include <QElapsedTimer>
 #include <QEventLoop>
 #include <QThread>
 #include <QWaitCondition>
 #include <QWindow>
-#include <QPluginLoader>
-#include <QDir>
 #include <QtQml>
 
 namespace Qt3D {

diff --git a/src/core/render/backend/drawable.cpp → src/render/backend/drawable.cpp b/src/core/render/backend/drawable.cpp → src/render/backend/drawable.cpp
diff --git a/src/core/render/backend/drawable.h → src/render/backend/drawable.h b/src/core/render/backend/drawable.h → src/render/backend/drawable.h
diff --git a/src/core/render/backend/drawstate.cpp → src/render/backend/drawstate.cpp b/src/core/render/backend/drawstate.cpp → src/render/backend/drawstate.cpp
diff --git a/src/core/render/backend/drawstate.h → src/render/backend/drawstate.h b/src/core/render/backend/drawstate.h → src/render/backend/drawstate.h
diff --git a/...backend/framegraph/cameraselectornode.cpp → ...backend/framegraph/cameraselectornode.cpp b/...backend/framegraph/cameraselectornode.cpp → ...backend/framegraph/cameraselectornode.cpp
diff --git a/...r/backend/framegraph/cameraselectornode.h → ...r/backend/framegraph/cameraselectornode.h b/...r/backend/framegraph/cameraselectornode.h → ...r/backend/framegraph/cameraselectornode.h
diff --git a/.../render/backend/framegraph/framegraph.pri → src/render/backend/framegraph/framegraph.pri b/.../render/backend/framegraph/framegraph.pri → src/render/backend/framegraph/framegraph.pri
diff --git a/...der/backend/framegraph/framegraphnode.cpp → ...der/backend/framegraph/framegraphnode.cpp b/...der/backend/framegraph/framegraphnode.cpp → ...der/backend/framegraph/framegraphnode.cpp
diff --git a/...ender/backend/framegraph/framegraphnode.h → ...ender/backend/framegraph/framegraphnode.h b/...ender/backend/framegraph/framegraphnode.h → ...ender/backend/framegraph/framegraphnode.h
diff --git a/.../backend/framegraph/framegraphvisitor.cpp → .../backend/framegraph/framegraphvisitor.cpp b/.../backend/framegraph/framegraphvisitor.cpp → .../backend/framegraph/framegraphvisitor.cpp
diff --git a/...er/backend/framegraph/framegraphvisitor.h → ...er/backend/framegraph/framegraphvisitor.h b/...er/backend/framegraph/framegraphvisitor.h → ...er/backend/framegraph/framegraphvisitor.h
diff --git a/...ckend/framegraph/renderpassfilternode.cpp → ...ckend/framegraph/renderpassfilternode.cpp b/...ckend/framegraph/renderpassfilternode.cpp → ...ckend/framegraph/renderpassfilternode.cpp
diff --git a/...backend/framegraph/renderpassfilternode.h → ...backend/framegraph/renderpassfilternode.h b/...backend/framegraph/renderpassfilternode.h → ...backend/framegraph/renderpassfilternode.h
diff --git a/...ackend/framegraph/techniquefilternode.cpp → ...ackend/framegraph/techniquefilternode.cpp b/...ackend/framegraph/techniquefilternode.cpp → ...ackend/framegraph/techniquefilternode.cpp
diff --git a/.../backend/framegraph/techniquefilternode.h → .../backend/framegraph/techniquefilternode.h b/.../backend/framegraph/techniquefilternode.h → .../backend/framegraph/techniquefilternode.h
diff --git a/...ender/backend/framegraph/viewportnode.cpp → ...ender/backend/framegraph/viewportnode.cpp b/...ender/backend/framegraph/viewportnode.cpp → ...ender/backend/framegraph/viewportnode.cpp
diff --git a/.../render/backend/framegraph/viewportnode.h → src/render/backend/framegraph/viewportnode.h b/.../render/backend/framegraph/viewportnode.h → src/render/backend/framegraph/viewportnode.h
diff --git a/src/core/render/backend/genericstate.h → src/render/backend/genericstate.h b/src/core/render/backend/genericstate.h → src/render/backend/genericstate.h
diff --git a/...e/render/backend/jobs/loadmeshdatajob.cpp → src/render/backend/jobs/loadmeshdatajob.cpp b/...e/render/backend/jobs/loadmeshdatajob.cpp → src/render/backend/jobs/loadmeshdatajob.cpp
diff --git a/...ore/render/backend/jobs/loadmeshdatajob.h → src/render/backend/jobs/loadmeshdatajob.h b/...ore/render/backend/jobs/loadmeshdatajob.h → src/render/backend/jobs/loadmeshdatajob.h
diff --git a/src/core/render/backend/jobs/render-jobs.pri → src/render/backend/jobs/render-jobs.pri b/src/core/render/backend/jobs/render-jobs.pri → src/render/backend/jobs/render-jobs.pri
diff --git a/.../backend/jobs/updateboundingvolumejob.cpp → .../backend/jobs/updateboundingvolumejob.cpp b/.../backend/jobs/updateboundingvolumejob.cpp → .../backend/jobs/updateboundingvolumejob.cpp
diff --git a/...er/backend/jobs/updateboundingvolumejob.h → ...er/backend/jobs/updateboundingvolumejob.h b/...er/backend/jobs/updateboundingvolumejob.h → ...er/backend/jobs/updateboundingvolumejob.h
diff --git a/.../backend/jobs/updateworldtransformjob.cpp → .../backend/jobs/updateworldtransformjob.cpp b/.../backend/jobs/updateworldtransformjob.cpp → .../backend/jobs/updateworldtransformjob.cpp
diff --git a/...er/backend/jobs/updateworldtransformjob.h → ...er/backend/jobs/updateworldtransformjob.h b/...er/backend/jobs/updateworldtransformjob.h → ...er/backend/jobs/updateworldtransformjob.h
diff --git a/src/core/render/backend/meshmanager.cpp → src/render/backend/meshmanager.cpp b/src/core/render/backend/meshmanager.cpp → src/render/backend/meshmanager.cpp
diff --git a/src/core/render/backend/meshmanager.h → src/render/backend/meshmanager.h b/src/core/render/backend/meshmanager.h → src/render/backend/meshmanager.h
diff --git a/src/core/render/backend/qgraphicscontext.cpp → src/render/backend/qgraphicscontext.cpp b/src/core/render/backend/qgraphicscontext.cpp → src/render/backend/qgraphicscontext.cpp
diff --git a/src/core/render/backend/qgraphicscontext.h → src/render/backend/qgraphicscontext.h b/src/core/render/backend/qgraphicscontext.h → src/render/backend/qgraphicscontext.h
diff --git a/...ore/render/backend/qgraphicshelperes2.cpp → src/render/backend/qgraphicshelperes2.cpp b/...ore/render/backend/qgraphicshelperes2.cpp → src/render/backend/qgraphicshelperes2.cpp
diff --git a/src/core/render/backend/qgraphicshelperes2.h → src/render/backend/qgraphicshelperes2.h b/src/core/render/backend/qgraphicshelperes2.h → src/render/backend/qgraphicshelperes2.h
diff --git a/...ore/render/backend/qgraphicshelpergl2.cpp → src/render/backend/qgraphicshelpergl2.cpp b/...ore/render/backend/qgraphicshelpergl2.cpp → src/render/backend/qgraphicshelpergl2.cpp
diff --git a/src/core/render/backend/qgraphicshelpergl2.h → src/render/backend/qgraphicshelpergl2.h b/src/core/render/backend/qgraphicshelpergl2.h → src/render/backend/qgraphicshelpergl2.h
diff --git a/...ore/render/backend/qgraphicshelpergl3.cpp → src/render/backend/qgraphicshelpergl3.cpp b/...ore/render/backend/qgraphicshelpergl3.cpp → src/render/backend/qgraphicshelpergl3.cpp
diff --git a/src/core/render/backend/qgraphicshelpergl3.h → src/render/backend/qgraphicshelpergl3.h b/src/core/render/backend/qgraphicshelpergl3.h → src/render/backend/qgraphicshelpergl3.h
diff --git a/...render/backend/qgraphicshelperinterface.h → ...render/backend/qgraphicshelperinterface.h b/...render/backend/qgraphicshelperinterface.h → ...render/backend/qgraphicshelperinterface.h
diff --git a/src/core/render/backend/quniformvalue.cpp → src/render/backend/quniformvalue.cpp b/src/core/render/backend/quniformvalue.cpp → src/render/backend/quniformvalue.cpp
diff --git a/src/core/render/backend/quniformvalue.h → src/render/backend/quniformvalue.h b/src/core/render/backend/quniformvalue.h → src/render/backend/quniformvalue.h
diff --git a/src/core/render/backend/render-backend.pri → src/render/backend/render-backend.pri b/src/core/render/backend/render-backend.pri → src/render/backend/render-backend.pri
diff --git a/src/core/render/backend/renderbin.cpp → src/render/backend/renderbin.cpp b/src/core/render/backend/renderbin.cpp → src/render/backend/renderbin.cpp
diff --git a/src/core/render/backend/renderbin.h → src/render/backend/renderbin.h b/src/core/render/backend/renderbin.h → src/render/backend/renderbin.h
diff --git a/src/core/render/backend/rendercamera.cpp → src/render/backend/rendercamera.cpp b/src/core/render/backend/rendercamera.cpp → src/render/backend/rendercamera.cpp
diff --git a/src/core/render/backend/rendercamera.h → src/render/backend/rendercamera.h b/src/core/render/backend/rendercamera.h → src/render/backend/rendercamera.h
diff --git a/...re/render/backend/renderconfiguration.cpp → src/render/backend/renderconfiguration.cpp b/...re/render/backend/renderconfiguration.cpp → src/render/backend/renderconfiguration.cpp
diff --git a/...core/render/backend/renderconfiguration.h → src/render/backend/renderconfiguration.h b/...core/render/backend/renderconfiguration.h → src/render/backend/renderconfiguration.h
diff --git a/src/core/render/backend/renderdevice.cpp → src/render/backend/renderdevice.cpp b/src/core/render/backend/renderdevice.cpp → src/render/backend/renderdevice.cpp
diff --git a/src/core/render/backend/renderdevice.h → src/render/backend/renderdevice.h b/src/core/render/backend/renderdevice.h → src/render/backend/renderdevice.h
diff --git a/src/core/render/backend/renderer.cpp → src/render/backend/renderer.cpp b/src/core/render/backend/renderer.cpp → src/render/backend/renderer.cpp
diff --git a/src/core/render/backend/renderer.h → src/render/backend/renderer.h b/src/core/render/backend/renderer.h → src/render/backend/renderer.h
diff --git a/src/core/render/backend/rendereraspect.cpp → src/render/backend/rendereraspect.cpp b/src/core/render/backend/rendereraspect.cpp → src/render/backend/rendereraspect.cpp
diff --git a/src/core/render/backend/rendereraspect.h → src/render/backend/rendereraspect.h b/src/core/render/backend/rendereraspect.h → src/render/backend/rendereraspect.h
diff --git a/src/core/render/backend/rendermaterial.cpp → src/render/backend/rendermaterial.cpp b/src/core/render/backend/rendermaterial.cpp → src/render/backend/rendermaterial.cpp
diff --git a/src/core/render/backend/rendermaterial.h → src/render/backend/rendermaterial.h b/src/core/render/backend/rendermaterial.h → src/render/backend/rendermaterial.h
diff --git a/src/core/render/backend/rendermesh.cpp → src/render/backend/rendermesh.cpp b/src/core/render/backend/rendermesh.cpp → src/render/backend/rendermesh.cpp
diff --git a/src/core/render/backend/rendermesh.h → src/render/backend/rendermesh.h b/src/core/render/backend/rendermesh.h → src/render/backend/rendermesh.h
diff --git a/src/core/render/backend/rendernode.cpp → src/render/backend/rendernode.cpp b/src/core/render/backend/rendernode.cpp → src/render/backend/rendernode.cpp
diff --git a/src/core/render/backend/rendernode.h → src/render/backend/rendernode.h b/src/core/render/backend/rendernode.h → src/render/backend/rendernode.h
diff --git a/...ore/render/backend/renderscenebuilder.cpp → src/render/backend/renderscenebuilder.cpp b/...ore/render/backend/renderscenebuilder.cpp → src/render/backend/renderscenebuilder.cpp
diff --git a/src/core/render/backend/renderscenebuilder.h → src/render/backend/renderscenebuilder.h b/src/core/render/backend/renderscenebuilder.h → src/render/backend/renderscenebuilder.h
diff --git a/src/core/render/backend/rendershader.cpp → src/render/backend/rendershader.cpp b/src/core/render/backend/rendershader.cpp → src/render/backend/rendershader.cpp
diff --git a/src/core/render/backend/rendershader.h → src/render/backend/rendershader.h b/src/core/render/backend/rendershader.h → src/render/backend/rendershader.h
diff --git a/src/core/render/backend/rendertechnique.cpp → src/render/backend/rendertechnique.cpp b/src/core/render/backend/rendertechnique.cpp → src/render/backend/rendertechnique.cpp
diff --git a/src/core/render/backend/rendertechnique.h → src/render/backend/rendertechnique.h b/src/core/render/backend/rendertechnique.h → src/render/backend/rendertechnique.h
diff --git a/src/core/render/backend/rendertexture.cpp → src/render/backend/rendertexture.cpp b/src/core/render/backend/rendertexture.cpp → src/render/backend/rendertexture.cpp
diff --git a/src/core/render/backend/rendertexture.h → src/render/backend/rendertexture.h b/src/core/render/backend/rendertexture.h → src/render/backend/rendertexture.h
diff --git a/.../render/backend/rendertextureprovider.cpp → src/render/backend/rendertextureprovider.cpp b/.../render/backend/rendertextureprovider.cpp → src/render/backend/rendertextureprovider.cpp
diff --git a/...re/render/backend/rendertextureprovider.h → src/render/backend/rendertextureprovider.h b/...re/render/backend/rendertextureprovider.h → src/render/backend/rendertextureprovider.h
diff --git a/src/core/render/backend/renderthread.cpp → src/render/backend/renderthread.cpp b/src/core/render/backend/renderthread.cpp → src/render/backend/renderthread.cpp
diff --git a/src/core/render/backend/renderthread.h → src/render/backend/renderthread.h b/src/core/render/backend/renderthread.h → src/render/backend/renderthread.h
diff --git a/...core/render/backend/states/blendstate.cpp → src/render/backend/states/blendstate.cpp b/...core/render/backend/states/blendstate.cpp → src/render/backend/states/blendstate.cpp
diff --git a/src/core/render/backend/states/blendstate.h → src/render/backend/states/blendstate.h b/src/core/render/backend/states/blendstate.h → src/render/backend/states/blendstate.h
diff --git a/src/core/render/frontend/cameraselector.cpp → src/render/frontend/cameraselector.cpp b/src/core/render/frontend/cameraselector.cpp → src/render/frontend/cameraselector.cpp
diff --git a/src/core/render/frontend/cameraselector.h → src/render/frontend/cameraselector.h b/src/core/render/frontend/cameraselector.h → src/render/frontend/cameraselector.h
diff --git a/src/core/render/frontend/effect.cpp → src/render/frontend/effect.cpp b/src/core/render/frontend/effect.cpp → src/render/frontend/effect.cpp
diff --git a/src/core/render/frontend/effect.h → src/render/frontend/effect.h b/src/core/render/frontend/effect.h → src/render/frontend/effect.h
diff --git a/src/core/render/frontend/material.cpp → src/render/frontend/material.cpp b/src/core/render/frontend/material.cpp → src/render/frontend/material.cpp
diff --git a/src/core/render/frontend/material.h → src/render/frontend/material.h b/src/core/render/frontend/material.h → src/render/frontend/material.h
diff --git a/src/core/render/frontend/mesh.cpp → src/render/frontend/mesh.cpp b/src/core/render/frontend/mesh.cpp → src/render/frontend/mesh.cpp
diff --git a/src/core/render/frontend/mesh.h → src/render/frontend/mesh.h b/src/core/render/frontend/mesh.h → src/render/frontend/mesh.h
diff --git a/...core/render/frontend/qitemmodelbuffer.cpp → src/render/frontend/qitemmodelbuffer.cpp b/...core/render/frontend/qitemmodelbuffer.cpp → src/render/frontend/qitemmodelbuffer.cpp
diff --git a/src/core/render/frontend/qitemmodelbuffer.h → src/render/frontend/qitemmodelbuffer.h b/src/core/render/frontend/qitemmodelbuffer.h → src/render/frontend/qitemmodelbuffer.h
diff --git a/src/core/render/frontend/render-frontend.pri → src/render/frontend/render-frontend.pri b/src/core/render/frontend/render-frontend.pri → src/render/frontend/render-frontend.pri
diff --git a/src/core/render/frontend/renderpass.cpp → src/render/frontend/renderpass.cpp b/src/core/render/frontend/renderpass.cpp → src/render/frontend/renderpass.cpp
diff --git a/src/core/render/frontend/renderpass.h → src/render/frontend/renderpass.h b/src/core/render/frontend/renderpass.h → src/render/frontend/renderpass.h
diff --git a/...core/render/frontend/renderpassfilter.cpp → src/render/frontend/renderpassfilter.cpp b/...core/render/frontend/renderpassfilter.cpp → src/render/frontend/renderpassfilter.cpp
diff --git a/src/core/render/frontend/renderpassfilter.h → src/render/frontend/renderpassfilter.h b/src/core/render/frontend/renderpassfilter.h → src/render/frontend/renderpassfilter.h
diff --git a/src/core/render/frontend/scene.cpp → src/render/frontend/scene.cpp b/src/core/render/frontend/scene.cpp → src/render/frontend/scene.cpp
diff --git a/src/core/render/frontend/scene.h → src/render/frontend/scene.h b/src/core/render/frontend/scene.h → src/render/frontend/scene.h
diff --git a/src/core/render/frontend/shaderprogram.cpp → src/render/frontend/shaderprogram.cpp b/src/core/render/frontend/shaderprogram.cpp → src/render/frontend/shaderprogram.cpp
diff --git a/src/core/render/frontend/shaderprogram.h → src/render/frontend/shaderprogram.h b/src/core/render/frontend/shaderprogram.h → src/render/frontend/shaderprogram.h
diff --git a/src/core/render/frontend/shape.cpp → src/render/frontend/shape.cpp b/src/core/render/frontend/shape.cpp → src/render/frontend/shape.cpp
diff --git a/src/core/render/frontend/shape.h → src/render/frontend/shape.h b/src/core/render/frontend/shape.h → src/render/frontend/shape.h
diff --git a/src/core/render/frontend/sphere.cpp → src/render/frontend/sphere.cpp b/src/core/render/frontend/sphere.cpp → src/render/frontend/sphere.cpp
diff --git a/src/core/render/frontend/sphere.h → src/render/frontend/sphere.h b/src/core/render/frontend/sphere.h → src/render/frontend/sphere.h
diff --git a/src/core/render/frontend/tag.h → src/render/frontend/tag.h b/src/core/render/frontend/tag.h → src/render/frontend/tag.h
diff --git a/src/core/render/frontend/technique.cpp → src/render/frontend/technique.cpp b/src/core/render/frontend/technique.cpp → src/render/frontend/technique.cpp
diff --git a/src/core/render/frontend/technique.h → src/render/frontend/technique.h b/src/core/render/frontend/technique.h → src/render/frontend/technique.h
diff --git a/src/core/render/frontend/techniquefilter.cpp → src/render/frontend/techniquefilter.cpp b/src/core/render/frontend/techniquefilter.cpp → src/render/frontend/techniquefilter.cpp
diff --git a/src/core/render/frontend/techniquefilter.h → src/render/frontend/techniquefilter.h b/src/core/render/frontend/techniquefilter.h → src/render/frontend/techniquefilter.h
diff --git a/src/core/render/frontend/texture.cpp → src/render/frontend/texture.cpp b/src/core/render/frontend/texture.cpp → src/render/frontend/texture.cpp
diff --git a/src/core/render/frontend/texture.h → src/render/frontend/texture.h b/src/core/render/frontend/texture.h → src/render/frontend/texture.h
diff --git a/src/core/render/frontend/transform.cpp → src/render/frontend/transform.cpp b/src/core/render/frontend/transform.cpp → src/render/frontend/transform.cpp
diff --git a/src/core/render/frontend/transform.h → src/render/frontend/transform.h b/src/core/render/frontend/transform.h → src/render/frontend/transform.h
diff --git a/src/core/render/frontend/viewport.cpp → src/render/frontend/viewport.cpp b/src/core/render/frontend/viewport.cpp → src/render/frontend/viewport.cpp
diff --git a/src/core/render/frontend/viewport.h → src/render/frontend/viewport.h b/src/core/render/frontend/viewport.h → src/render/frontend/viewport.h
diff --git a/src/core/render/io/abstractsceneparser.cpp → src/render/io/abstractsceneparser.cpp b/src/core/render/io/abstractsceneparser.cpp → src/render/io/abstractsceneparser.cpp
diff --git a/src/core/render/io/abstractsceneparser.h → src/render/io/abstractsceneparser.h b/src/core/render/io/abstractsceneparser.h → src/render/io/abstractsceneparser.h
diff --git a/src/core/render/io/assimphelpers.cpp → src/render/io/assimphelpers.cpp b/src/core/render/io/assimphelpers.cpp → src/render/io/assimphelpers.cpp
diff --git a/src/core/render/io/assimphelpers.h → src/render/io/assimphelpers.h b/src/core/render/io/assimphelpers.h → src/render/io/assimphelpers.h
diff --git a/src/core/render/io/assimpparser.cpp → src/render/io/assimpparser.cpp b/src/core/render/io/assimpparser.cpp → src/render/io/assimpparser.cpp
diff --git a/src/core/render/io/assimpparser.h → src/render/io/assimpparser.h b/src/core/render/io/assimpparser.h → src/render/io/assimpparser.h
diff --git a/src/core/render/io/gltfparser.cpp → src/render/io/gltfparser.cpp b/src/core/render/io/gltfparser.cpp → src/render/io/gltfparser.cpp
diff --git a/src/core/render/io/gltfparser.h → src/render/io/gltfparser.h b/src/core/render/io/gltfparser.h → src/render/io/gltfparser.h
diff --git a/src/core/render/io/meshdata.cpp → src/render/io/meshdata.cpp b/src/core/render/io/meshdata.cpp → src/render/io/meshdata.cpp
diff --git a/src/core/render/io/meshdata.h → src/render/io/meshdata.h b/src/core/render/io/meshdata.h → src/render/io/meshdata.h
diff --git a/src/core/render/io/objloader.cpp → src/render/io/objloader.cpp b/src/core/render/io/objloader.cpp → src/render/io/objloader.cpp
diff --git a/src/core/render/io/objloader.h → src/render/io/objloader.h b/src/core/render/io/objloader.h → src/render/io/objloader.h
diff --git a/src/core/render/io/render-io.pri → src/render/io/render-io.pri b/src/core/render/io/render-io.pri → src/render/io/render-io.pri
diff --git a/src/core/render/io/texturedata.cpp → src/render/io/texturedata.cpp b/src/core/render/io/texturedata.cpp → src/render/io/texturedata.cpp
diff --git a/src/core/render/io/texturedata.h → src/render/io/texturedata.h b/src/core/render/io/texturedata.h → src/render/io/texturedata.h
diff --git a/src/core/render/qt3drenderer_global.h → src/render/qt3drenderer_global.h b/src/core/render/qt3drenderer_global.h → src/render/qt3drenderer_global.h
diff --git a/src/core/render/render.pro → src/render/render.pro b/src/core/render/render.pro → src/render/render.pro
@@ -11,7 +11,7 @@ load(qt_module)
 include (backend/render-backend.pri)
 include (frontend/render-frontend.pri)
 include (io/render-io.pri)
-include(../../3rdparty/assimp/assimp.pri)
+include(../3rdparty/assimp/assimp.pri)
 
 
 RESOURCES += $$PWD/render.qrc

diff --git a/src/core/render/render.qrc → src/render/render.qrc b/src/core/render/render.qrc → src/render/render.qrc
diff --git a/src/core/render/shaders/basic.frag → src/render/shaders/basic.frag b/src/core/render/shaders/basic.frag → src/render/shaders/basic.frag
diff --git a/src/core/render/shaders/basic.vert → src/render/shaders/basic.vert b/src/core/render/shaders/basic.vert → src/render/shaders/basic.vert
diff --git a/src/core/render/shaders/diffuse.frag → src/render/shaders/diffuse.frag b/src/core/render/shaders/diffuse.frag → src/render/shaders/diffuse.frag
diff --git a/src/core/render/shaders/diffuse.vert → src/render/shaders/diffuse.vert b/src/core/render/shaders/diffuse.vert → src/render/shaders/diffuse.vert
diff --git a/src/src.pro b/src/src.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS += core \
-           core/render
+SUBDIRS += \
+    core \
+    render
diff --git a/sync.profile b/sync.profile
@@ -1,6 +1,6 @@
 %modules = ( # path to module name map
     "Qt3DCore" => "$basedir/src/core",
-    "Qt3DRenderer" => "$basedir/src/core/render",
+    "Qt3DRenderer" => "$basedir/src/render",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );