131 files changed, 9 insertions, 9 deletions
diff --git a/qt3d.pro b/qt3d.pro
index f08a6eb95..23480b26f 100644
--- 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
index 1be199f58..3b824d311 100644
--- 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,7 +52,6 @@
 #include <node.h>
 #include <entity.h>
 #include <camera.h>
-#include <scene.h>
 #include <matrixtransform.h>
 #include <rotatetransform.h>
 #include <translatetransform.h>
@@ -60,13 +59,10 @@
 #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 b/src/render/backend/drawable.cpp
index 5a5c5e36e..5a5c5e36e 100644
--- a/src/core/render/backend/drawable.cpp
+++ b/src/render/backend/drawable.cpp
diff --git a/src/core/render/backend/drawable.h b/src/render/backend/drawable.h
index e4eca598e..e4eca598e 100644
--- a/src/core/render/backend/drawable.h
+++ b/src/render/backend/drawable.h
diff --git a/src/core/render/backend/drawstate.cpp b/src/render/backend/drawstate.cpp
index e779b53f0..e779b53f0 100644
--- a/src/core/render/backend/drawstate.cpp
+++ b/src/render/backend/drawstate.cpp
diff --git a/src/core/render/backend/drawstate.h b/src/render/backend/drawstate.h
index c3281cc18..c3281cc18 100644
--- a/src/core/render/backend/drawstate.h
+++ b/src/render/backend/drawstate.h
diff --git a/src/core/render/backend/framegraph/cameraselectornode.cpp b/src/render/backend/framegraph/cameraselectornode.cpp
index d1d1bfac0..d1d1bfac0 100644
--- a/src/core/render/backend/framegraph/cameraselectornode.cpp
+++ b/src/render/backend/framegraph/cameraselectornode.cpp
diff --git a/src/core/render/backend/framegraph/cameraselectornode.h b/src/render/backend/framegraph/cameraselectornode.h
index 326ba600b..326ba600b 100644
--- a/src/core/render/backend/framegraph/cameraselectornode.h
+++ b/src/render/backend/framegraph/cameraselectornode.h
diff --git a/src/core/render/backend/framegraph/framegraph.pri b/src/render/backend/framegraph/framegraph.pri
index c04191dc5..c04191dc5 100644
--- a/src/core/render/backend/framegraph/framegraph.pri
+++ b/src/render/backend/framegraph/framegraph.pri
diff --git a/src/core/render/backend/framegraph/framegraphnode.cpp b/src/render/backend/framegraph/framegraphnode.cpp
index b6b80afce..b6b80afce 100644
--- a/src/core/render/backend/framegraph/framegraphnode.cpp
+++ b/src/render/backend/framegraph/framegraphnode.cpp
diff --git a/src/core/render/backend/framegraph/framegraphnode.h b/src/render/backend/framegraph/framegraphnode.h
index 0fd0a2e3f..0fd0a2e3f 100644
--- a/src/core/render/backend/framegraph/framegraphnode.h
+++ b/src/render/backend/framegraph/framegraphnode.h
diff --git a/src/core/render/backend/framegraph/framegraphvisitor.cpp b/src/render/backend/framegraph/framegraphvisitor.cpp
index b74a77873..b74a77873 100644
--- a/src/core/render/backend/framegraph/framegraphvisitor.cpp
+++ b/src/render/backend/framegraph/framegraphvisitor.cpp
diff --git a/src/core/render/backend/framegraph/framegraphvisitor.h b/src/render/backend/framegraph/framegraphvisitor.h
index 174a90bdf..174a90bdf 100644
--- a/src/core/render/backend/framegraph/framegraphvisitor.h
+++ b/src/render/backend/framegraph/framegraphvisitor.h
diff --git a/src/core/render/backend/framegraph/renderpassfilternode.cpp b/src/render/backend/framegraph/renderpassfilternode.cpp
index 89b3d4e0c..89b3d4e0c 100644
--- a/src/core/render/backend/framegraph/renderpassfilternode.cpp
+++ b/src/render/backend/framegraph/renderpassfilternode.cpp
diff --git a/src/core/render/backend/framegraph/renderpassfilternode.h b/src/render/backend/framegraph/renderpassfilternode.h
index ed05e6b5c..ed05e6b5c 100644
--- a/src/core/render/backend/framegraph/renderpassfilternode.h
+++ b/src/render/backend/framegraph/renderpassfilternode.h
diff --git a/src/core/render/backend/framegraph/techniquefilternode.cpp b/src/render/backend/framegraph/techniquefilternode.cpp
index 3c021c77c..3c021c77c 100644
--- a/src/core/render/backend/framegraph/techniquefilternode.cpp
+++ b/src/render/backend/framegraph/techniquefilternode.cpp
diff --git a/src/core/render/backend/framegraph/techniquefilternode.h b/src/render/backend/framegraph/techniquefilternode.h
index f6c801019..f6c801019 100644
--- a/src/core/render/backend/framegraph/techniquefilternode.h
+++ b/src/render/backend/framegraph/techniquefilternode.h
diff --git a/src/core/render/backend/framegraph/viewportnode.cpp b/src/render/backend/framegraph/viewportnode.cpp
index bac967975..bac967975 100644
--- a/src/core/render/backend/framegraph/viewportnode.cpp
+++ b/src/render/backend/framegraph/viewportnode.cpp
diff --git a/src/core/render/backend/framegraph/viewportnode.h b/src/render/backend/framegraph/viewportnode.h
index 6d1b643a5..6d1b643a5 100644
--- a/src/core/render/backend/framegraph/viewportnode.h
+++ b/src/render/backend/framegraph/viewportnode.h
diff --git a/src/core/render/backend/genericstate.h b/src/render/backend/genericstate.h
index f82c000db..f82c000db 100644
--- a/src/core/render/backend/genericstate.h
+++ b/src/render/backend/genericstate.h
diff --git a/src/core/render/backend/jobs/loadmeshdatajob.cpp b/src/render/backend/jobs/loadmeshdatajob.cpp
index 1bd50fbcd..1bd50fbcd 100644
--- a/src/core/render/backend/jobs/loadmeshdatajob.cpp
+++ b/src/render/backend/jobs/loadmeshdatajob.cpp
diff --git a/src/core/render/backend/jobs/loadmeshdatajob.h b/src/render/backend/jobs/loadmeshdatajob.h
index 8e5e9d117..8e5e9d117 100644
--- a/src/core/render/backend/jobs/loadmeshdatajob.h
+++ b/src/render/backend/jobs/loadmeshdatajob.h
diff --git a/src/core/render/backend/jobs/render-jobs.pri b/src/render/backend/jobs/render-jobs.pri
index 85e350fdd..85e350fdd 100644
--- a/src/core/render/backend/jobs/render-jobs.pri
+++ b/src/render/backend/jobs/render-jobs.pri
diff --git a/src/core/render/backend/jobs/updateboundingvolumejob.cpp b/src/render/backend/jobs/updateboundingvolumejob.cpp
index 0d5752ff1..0d5752ff1 100644
--- a/src/core/render/backend/jobs/updateboundingvolumejob.cpp
+++ b/src/render/backend/jobs/updateboundingvolumejob.cpp
diff --git a/src/core/render/backend/jobs/updateboundingvolumejob.h b/src/render/backend/jobs/updateboundingvolumejob.h
index 81353a6c0..81353a6c0 100644
--- a/src/core/render/backend/jobs/updateboundingvolumejob.h
+++ b/src/render/backend/jobs/updateboundingvolumejob.h
diff --git a/src/core/render/backend/jobs/updateworldtransformjob.cpp b/src/render/backend/jobs/updateworldtransformjob.cpp
index 04f09f9a0..04f09f9a0 100644
--- a/src/core/render/backend/jobs/updateworldtransformjob.cpp
+++ b/src/render/backend/jobs/updateworldtransformjob.cpp
diff --git a/src/core/render/backend/jobs/updateworldtransformjob.h b/src/render/backend/jobs/updateworldtransformjob.h
index 64117e893..64117e893 100644
--- a/src/core/render/backend/jobs/updateworldtransformjob.h
+++ b/src/render/backend/jobs/updateworldtransformjob.h
diff --git a/src/core/render/backend/meshmanager.cpp b/src/render/backend/meshmanager.cpp
index 8c8e2f741..8c8e2f741 100644
--- a/src/core/render/backend/meshmanager.cpp
+++ b/src/render/backend/meshmanager.cpp
diff --git a/src/core/render/backend/meshmanager.h b/src/render/backend/meshmanager.h
index 93379a18e..93379a18e 100644
--- a/src/core/render/backend/meshmanager.h
+++ b/src/render/backend/meshmanager.h
diff --git a/src/core/render/backend/qgraphicscontext.cpp b/src/render/backend/qgraphicscontext.cpp
index 9b94758c4..9b94758c4 100644
--- a/src/core/render/backend/qgraphicscontext.cpp
+++ b/src/render/backend/qgraphicscontext.cpp
diff --git a/src/core/render/backend/qgraphicscontext.h b/src/render/backend/qgraphicscontext.h
index 482765b13..482765b13 100644
--- a/src/core/render/backend/qgraphicscontext.h
+++ b/src/render/backend/qgraphicscontext.h
diff --git a/src/core/render/backend/qgraphicshelperes2.cpp b/src/render/backend/qgraphicshelperes2.cpp
index 4c9becd47..4c9becd47 100644
--- a/src/core/render/backend/qgraphicshelperes2.cpp
+++ b/src/render/backend/qgraphicshelperes2.cpp
diff --git a/src/core/render/backend/qgraphicshelperes2.h b/src/render/backend/qgraphicshelperes2.h
index 7cbdc3d16..7cbdc3d16 100644
--- a/src/core/render/backend/qgraphicshelperes2.h
+++ b/src/render/backend/qgraphicshelperes2.h
diff --git a/src/core/render/backend/qgraphicshelpergl2.cpp b/src/render/backend/qgraphicshelpergl2.cpp
index 4b9998cc2..4b9998cc2 100644
--- a/src/core/render/backend/qgraphicshelpergl2.cpp
+++ b/src/render/backend/qgraphicshelpergl2.cpp
diff --git a/src/core/render/backend/qgraphicshelpergl2.h b/src/render/backend/qgraphicshelpergl2.h
index a08841cde..a08841cde 100644
--- a/src/core/render/backend/qgraphicshelpergl2.h
+++ b/src/render/backend/qgraphicshelpergl2.h
diff --git a/src/core/render/backend/qgraphicshelpergl3.cpp b/src/render/backend/qgraphicshelpergl3.cpp
index 9ccb53530..9ccb53530 100644
--- a/src/core/render/backend/qgraphicshelpergl3.cpp
+++ b/src/render/backend/qgraphicshelpergl3.cpp
diff --git a/src/core/render/backend/qgraphicshelpergl3.h b/src/render/backend/qgraphicshelpergl3.h
index 75fab3316..75fab3316 100644
--- a/src/core/render/backend/qgraphicshelpergl3.h
+++ b/src/render/backend/qgraphicshelpergl3.h
diff --git a/src/core/render/backend/qgraphicshelperinterface.h b/src/render/backend/qgraphicshelperinterface.h
index 967eb28e0..967eb28e0 100644
--- a/src/core/render/backend/qgraphicshelperinterface.h
+++ b/src/render/backend/qgraphicshelperinterface.h
diff --git a/src/core/render/backend/quniformvalue.cpp b/src/render/backend/quniformvalue.cpp
index e52f916f5..e52f916f5 100644
--- a/src/core/render/backend/quniformvalue.cpp
+++ b/src/render/backend/quniformvalue.cpp
diff --git a/src/core/render/backend/quniformvalue.h b/src/render/backend/quniformvalue.h
index c6641afd9..c6641afd9 100644
--- a/src/core/render/backend/quniformvalue.h
+++ b/src/render/backend/quniformvalue.h
diff --git a/src/core/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index 08532fd4a..08532fd4a 100644
--- a/src/core/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
diff --git a/src/core/render/backend/renderbin.cpp b/src/render/backend/renderbin.cpp
index fcd6fec86..fcd6fec86 100644
--- a/src/core/render/backend/renderbin.cpp
+++ b/src/render/backend/renderbin.cpp
diff --git a/src/core/render/backend/renderbin.h b/src/render/backend/renderbin.h
index 2b04aeab2..2b04aeab2 100644
--- a/src/core/render/backend/renderbin.h
+++ b/src/render/backend/renderbin.h
diff --git a/src/core/render/backend/rendercamera.cpp b/src/render/backend/rendercamera.cpp
index d39260c42..d39260c42 100644
--- a/src/core/render/backend/rendercamera.cpp
+++ b/src/render/backend/rendercamera.cpp
diff --git a/src/core/render/backend/rendercamera.h b/src/render/backend/rendercamera.h
index d8af961ad..d8af961ad 100644
--- a/src/core/render/backend/rendercamera.h
+++ b/src/render/backend/rendercamera.h
diff --git a/src/core/render/backend/renderconfiguration.cpp b/src/render/backend/renderconfiguration.cpp
index ae2437461..ae2437461 100644
--- a/src/core/render/backend/renderconfiguration.cpp
+++ b/src/render/backend/renderconfiguration.cpp
diff --git a/src/core/render/backend/renderconfiguration.h b/src/render/backend/renderconfiguration.h
index 76a47f760..76a47f760 100644
--- a/src/core/render/backend/renderconfiguration.h
+++ b/src/render/backend/renderconfiguration.h
diff --git a/src/core/render/backend/renderdevice.cpp b/src/render/backend/renderdevice.cpp
index 4648932e7..4648932e7 100644
--- a/src/core/render/backend/renderdevice.cpp
+++ b/src/render/backend/renderdevice.cpp
diff --git a/src/core/render/backend/renderdevice.h b/src/render/backend/renderdevice.h
index c854eee29..c854eee29 100644
--- a/src/core/render/backend/renderdevice.h
+++ b/src/render/backend/renderdevice.h
diff --git a/src/core/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index 598c77e45..598c77e45 100644
--- a/src/core/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
diff --git a/src/core/render/backend/renderer.h b/src/render/backend/renderer.h
index 225c338f8..225c338f8 100644
--- a/src/core/render/backend/renderer.h
+++ b/src/render/backend/renderer.h
diff --git a/src/core/render/backend/rendereraspect.cpp b/src/render/backend/rendereraspect.cpp
index 88114fc98..88114fc98 100644
--- a/src/core/render/backend/rendereraspect.cpp
+++ b/src/render/backend/rendereraspect.cpp
diff --git a/src/core/render/backend/rendereraspect.h b/src/render/backend/rendereraspect.h
index f1a31fdaa..f1a31fdaa 100644
--- a/src/core/render/backend/rendereraspect.h
+++ b/src/render/backend/rendereraspect.h
diff --git a/src/core/render/backend/rendermaterial.cpp b/src/render/backend/rendermaterial.cpp
index 49c39c43d..49c39c43d 100644
--- a/src/core/render/backend/rendermaterial.cpp
+++ b/src/render/backend/rendermaterial.cpp
diff --git a/src/core/render/backend/rendermaterial.h b/src/render/backend/rendermaterial.h
index 79e17990d..79e17990d 100644
--- a/src/core/render/backend/rendermaterial.h
+++ b/src/render/backend/rendermaterial.h
diff --git a/src/core/render/backend/rendermesh.cpp b/src/render/backend/rendermesh.cpp
index f1c548248..f1c548248 100644
--- a/src/core/render/backend/rendermesh.cpp
+++ b/src/render/backend/rendermesh.cpp
diff --git a/src/core/render/backend/rendermesh.h b/src/render/backend/rendermesh.h
index 9a39582a3..9a39582a3 100644
--- a/src/core/render/backend/rendermesh.h
+++ b/src/render/backend/rendermesh.h
diff --git a/src/core/render/backend/rendernode.cpp b/src/render/backend/rendernode.cpp
index 41cdf0a30..41cdf0a30 100644
--- a/src/core/render/backend/rendernode.cpp
+++ b/src/render/backend/rendernode.cpp
diff --git a/src/core/render/backend/rendernode.h b/src/render/backend/rendernode.h
index 6cce361d3..6cce361d3 100644
--- a/src/core/render/backend/rendernode.h
+++ b/src/render/backend/rendernode.h
diff --git a/src/core/render/backend/renderscenebuilder.cpp b/src/render/backend/renderscenebuilder.cpp
index 9e861d65f..9e861d65f 100644
--- a/src/core/render/backend/renderscenebuilder.cpp
+++ b/src/render/backend/renderscenebuilder.cpp
diff --git a/src/core/render/backend/renderscenebuilder.h b/src/render/backend/renderscenebuilder.h
index 2f3812f26..2f3812f26 100644
--- a/src/core/render/backend/renderscenebuilder.h
+++ b/src/render/backend/renderscenebuilder.h
diff --git a/src/core/render/backend/rendershader.cpp b/src/render/backend/rendershader.cpp
index c137ccaca..c137ccaca 100644
--- a/src/core/render/backend/rendershader.cpp
+++ b/src/render/backend/rendershader.cpp
diff --git a/src/core/render/backend/rendershader.h b/src/render/backend/rendershader.h
index b87aefc12..b87aefc12 100644
--- a/src/core/render/backend/rendershader.h
+++ b/src/render/backend/rendershader.h
diff --git a/src/core/render/backend/rendertechnique.cpp b/src/render/backend/rendertechnique.cpp
index 63b9c8da5..63b9c8da5 100644
--- a/src/core/render/backend/rendertechnique.cpp
+++ b/src/render/backend/rendertechnique.cpp
diff --git a/src/core/render/backend/rendertechnique.h b/src/render/backend/rendertechnique.h
index c1f0cc03a..c1f0cc03a 100644
--- a/src/core/render/backend/rendertechnique.h
+++ b/src/render/backend/rendertechnique.h
diff --git a/src/core/render/backend/rendertexture.cpp b/src/render/backend/rendertexture.cpp
index b6176001f..b6176001f 100644
--- a/src/core/render/backend/rendertexture.cpp
+++ b/src/render/backend/rendertexture.cpp
diff --git a/src/core/render/backend/rendertexture.h b/src/render/backend/rendertexture.h
index 8391c3934..8391c3934 100644
--- a/src/core/render/backend/rendertexture.h
+++ b/src/render/backend/rendertexture.h
diff --git a/src/core/render/backend/rendertextureprovider.cpp b/src/render/backend/rendertextureprovider.cpp
index c07076519..c07076519 100644
--- a/src/core/render/backend/rendertextureprovider.cpp
+++ b/src/render/backend/rendertextureprovider.cpp
diff --git a/src/core/render/backend/rendertextureprovider.h b/src/render/backend/rendertextureprovider.h
index 8664c7a52..8664c7a52 100644
--- a/src/core/render/backend/rendertextureprovider.h
+++ b/src/render/backend/rendertextureprovider.h
diff --git a/src/core/render/backend/renderthread.cpp b/src/render/backend/renderthread.cpp
index f679bc2f6..f679bc2f6 100644
--- a/src/core/render/backend/renderthread.cpp
+++ b/src/render/backend/renderthread.cpp
diff --git a/src/core/render/backend/renderthread.h b/src/render/backend/renderthread.h
index c1471921e..c1471921e 100644
--- a/src/core/render/backend/renderthread.h
+++ b/src/render/backend/renderthread.h
diff --git a/src/core/render/backend/states/blendstate.cpp b/src/render/backend/states/blendstate.cpp
index 3193e7141..3193e7141 100644
--- a/src/core/render/backend/states/blendstate.cpp
+++ b/src/render/backend/states/blendstate.cpp
diff --git a/src/core/render/backend/states/blendstate.h b/src/render/backend/states/blendstate.h
index c4725ea75..c4725ea75 100644
--- a/src/core/render/backend/states/blendstate.h
+++ b/src/render/backend/states/blendstate.h
diff --git a/src/core/render/frontend/cameraselector.cpp b/src/render/frontend/cameraselector.cpp
index 091327646..091327646 100644
--- a/src/core/render/frontend/cameraselector.cpp
+++ b/src/render/frontend/cameraselector.cpp
diff --git a/src/core/render/frontend/cameraselector.h b/src/render/frontend/cameraselector.h
index e5efa37a5..e5efa37a5 100644
--- a/src/core/render/frontend/cameraselector.h
+++ b/src/render/frontend/cameraselector.h
diff --git a/src/core/render/frontend/effect.cpp b/src/render/frontend/effect.cpp
index e10932fa4..e10932fa4 100644
--- a/src/core/render/frontend/effect.cpp
+++ b/src/render/frontend/effect.cpp
diff --git a/src/core/render/frontend/effect.h b/src/render/frontend/effect.h
index 0459b67ef..0459b67ef 100644
--- a/src/core/render/frontend/effect.h
+++ b/src/render/frontend/effect.h
diff --git a/src/core/render/frontend/material.cpp b/src/render/frontend/material.cpp
index 4ed1154ca..4ed1154ca 100644
--- a/src/core/render/frontend/material.cpp
+++ b/src/render/frontend/material.cpp
diff --git a/src/core/render/frontend/material.h b/src/render/frontend/material.h
index b7a4c19fc..b7a4c19fc 100644
--- a/src/core/render/frontend/material.h
+++ b/src/render/frontend/material.h
diff --git a/src/core/render/frontend/mesh.cpp b/src/render/frontend/mesh.cpp
index 379cb8cbb..379cb8cbb 100644
--- a/src/core/render/frontend/mesh.cpp
+++ b/src/render/frontend/mesh.cpp
diff --git a/src/core/render/frontend/mesh.h b/src/render/frontend/mesh.h
index 0db09462c..0db09462c 100644
--- a/src/core/render/frontend/mesh.h
+++ b/src/render/frontend/mesh.h
diff --git a/src/core/render/frontend/qitemmodelbuffer.cpp b/src/render/frontend/qitemmodelbuffer.cpp
index 0b7ff2c39..0b7ff2c39 100644
--- a/src/core/render/frontend/qitemmodelbuffer.cpp
+++ b/src/render/frontend/qitemmodelbuffer.cpp
diff --git a/src/core/render/frontend/qitemmodelbuffer.h b/src/render/frontend/qitemmodelbuffer.h
index 6d8d03680..6d8d03680 100644
--- a/src/core/render/frontend/qitemmodelbuffer.h
+++ b/src/render/frontend/qitemmodelbuffer.h
diff --git a/src/core/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri
index cad7e8a26..cad7e8a26 100644
--- a/src/core/render/frontend/render-frontend.pri
+++ b/src/render/frontend/render-frontend.pri
diff --git a/src/core/render/frontend/renderpass.cpp b/src/render/frontend/renderpass.cpp
index edca8076c..edca8076c 100644
--- a/src/core/render/frontend/renderpass.cpp
+++ b/src/render/frontend/renderpass.cpp
diff --git a/src/core/render/frontend/renderpass.h b/src/render/frontend/renderpass.h
index 526d2ddc3..526d2ddc3 100644
--- a/src/core/render/frontend/renderpass.h
+++ b/src/render/frontend/renderpass.h
diff --git a/src/core/render/frontend/renderpassfilter.cpp b/src/render/frontend/renderpassfilter.cpp
index 8b25fe239..8b25fe239 100644
--- a/src/core/render/frontend/renderpassfilter.cpp
+++ b/src/render/frontend/renderpassfilter.cpp
diff --git a/src/core/render/frontend/renderpassfilter.h b/src/render/frontend/renderpassfilter.h
index 01de80b3f..01de80b3f 100644
--- a/src/core/render/frontend/renderpassfilter.h
+++ b/src/render/frontend/renderpassfilter.h
diff --git a/src/core/render/frontend/scene.cpp b/src/render/frontend/scene.cpp
index ccfcc3b79..ccfcc3b79 100644
--- a/src/core/render/frontend/scene.cpp
+++ b/src/render/frontend/scene.cpp
diff --git a/src/core/render/frontend/scene.h b/src/render/frontend/scene.h
index be3745a0b..be3745a0b 100644
--- a/src/core/render/frontend/scene.h
+++ b/src/render/frontend/scene.h
diff --git a/src/core/render/frontend/shaderprogram.cpp b/src/render/frontend/shaderprogram.cpp
index 813db01d5..813db01d5 100644
--- a/src/core/render/frontend/shaderprogram.cpp
+++ b/src/render/frontend/shaderprogram.cpp
diff --git a/src/core/render/frontend/shaderprogram.h b/src/render/frontend/shaderprogram.h
index 2ecc1c623..2ecc1c623 100644
--- a/src/core/render/frontend/shaderprogram.h
+++ b/src/render/frontend/shaderprogram.h
diff --git a/src/core/render/frontend/shape.cpp b/src/render/frontend/shape.cpp
index 0493ea6a9..0493ea6a9 100644
--- a/src/core/render/frontend/shape.cpp
+++ b/src/render/frontend/shape.cpp
diff --git a/src/core/render/frontend/shape.h b/src/render/frontend/shape.h
index 271d4002c..271d4002c 100644
--- a/src/core/render/frontend/shape.h
+++ b/src/render/frontend/shape.h
diff --git a/src/core/render/frontend/sphere.cpp b/src/render/frontend/sphere.cpp
index 3daf3804b..3daf3804b 100644
--- a/src/core/render/frontend/sphere.cpp
+++ b/src/render/frontend/sphere.cpp
diff --git a/src/core/render/frontend/sphere.h b/src/render/frontend/sphere.h
index 7ca203723..7ca203723 100644
--- a/src/core/render/frontend/sphere.h
+++ b/src/render/frontend/sphere.h
diff --git a/src/core/render/frontend/tag.h b/src/render/frontend/tag.h
index 2ef8785cb..2ef8785cb 100644
--- a/src/core/render/frontend/tag.h
+++ b/src/render/frontend/tag.h
diff --git a/src/core/render/frontend/technique.cpp b/src/render/frontend/technique.cpp
index 5ef7c46ff..5ef7c46ff 100644
--- a/src/core/render/frontend/technique.cpp
+++ b/src/render/frontend/technique.cpp
diff --git a/src/core/render/frontend/technique.h b/src/render/frontend/technique.h
index 6c16cb9a2..6c16cb9a2 100644
--- a/src/core/render/frontend/technique.h
+++ b/src/render/frontend/technique.h
diff --git a/src/core/render/frontend/techniquefilter.cpp b/src/render/frontend/techniquefilter.cpp
index 038fa51f1..038fa51f1 100644
--- a/src/core/render/frontend/techniquefilter.cpp
+++ b/src/render/frontend/techniquefilter.cpp
diff --git a/src/core/render/frontend/techniquefilter.h b/src/render/frontend/techniquefilter.h
index cbdfe1661..cbdfe1661 100644
--- a/src/core/render/frontend/techniquefilter.h
+++ b/src/render/frontend/techniquefilter.h
diff --git a/src/core/render/frontend/texture.cpp b/src/render/frontend/texture.cpp
index 81c1be5f9..81c1be5f9 100644
--- a/src/core/render/frontend/texture.cpp
+++ b/src/render/frontend/texture.cpp
diff --git a/src/core/render/frontend/texture.h b/src/render/frontend/texture.h
index 22646beac..22646beac 100644
--- a/src/core/render/frontend/texture.h
+++ b/src/render/frontend/texture.h
diff --git a/src/core/render/frontend/transform.cpp b/src/render/frontend/transform.cpp
index 5ac195dc3..5ac195dc3 100644
--- a/src/core/render/frontend/transform.cpp
+++ b/src/render/frontend/transform.cpp
diff --git a/src/core/render/frontend/transform.h b/src/render/frontend/transform.h
index 4b4c54023..4b4c54023 100644
--- a/src/core/render/frontend/transform.h
+++ b/src/render/frontend/transform.h
diff --git a/src/core/render/frontend/viewport.cpp b/src/render/frontend/viewport.cpp
index 8c13190a1..8c13190a1 100644
--- a/src/core/render/frontend/viewport.cpp
+++ b/src/render/frontend/viewport.cpp
diff --git a/src/core/render/frontend/viewport.h b/src/render/frontend/viewport.h
index 6b7f5ab07..6b7f5ab07 100644
--- a/src/core/render/frontend/viewport.h
+++ b/src/render/frontend/viewport.h
diff --git a/src/core/render/io/abstractsceneparser.cpp b/src/render/io/abstractsceneparser.cpp
index cf553e2a7..cf553e2a7 100644
--- a/src/core/render/io/abstractsceneparser.cpp
+++ b/src/render/io/abstractsceneparser.cpp
diff --git a/src/core/render/io/abstractsceneparser.h b/src/render/io/abstractsceneparser.h
index 0cc599184..0cc599184 100644
--- a/src/core/render/io/abstractsceneparser.h
+++ b/src/render/io/abstractsceneparser.h
diff --git a/src/core/render/io/assimphelpers.cpp b/src/render/io/assimphelpers.cpp
index 4c6ba35b2..4c6ba35b2 100644
--- a/src/core/render/io/assimphelpers.cpp
+++ b/src/render/io/assimphelpers.cpp
diff --git a/src/core/render/io/assimphelpers.h b/src/render/io/assimphelpers.h
index bcf0ead1c..bcf0ead1c 100644
--- a/src/core/render/io/assimphelpers.h
+++ b/src/render/io/assimphelpers.h
diff --git a/src/core/render/io/assimpparser.cpp b/src/render/io/assimpparser.cpp
index f1249b751..f1249b751 100644
--- a/src/core/render/io/assimpparser.cpp
+++ b/src/render/io/assimpparser.cpp
diff --git a/src/core/render/io/assimpparser.h b/src/render/io/assimpparser.h
index f9bfd6143..f9bfd6143 100644
--- a/src/core/render/io/assimpparser.h
+++ b/src/render/io/assimpparser.h
diff --git a/src/core/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp
index 0cb78417d..0cb78417d 100644
--- a/src/core/render/io/gltfparser.cpp
+++ b/src/render/io/gltfparser.cpp
diff --git a/src/core/render/io/gltfparser.h b/src/render/io/gltfparser.h
index fab20ab52..fab20ab52 100644
--- a/src/core/render/io/gltfparser.h
+++ b/src/render/io/gltfparser.h
diff --git a/src/core/render/io/meshdata.cpp b/src/render/io/meshdata.cpp
index aecf59d0c..aecf59d0c 100644
--- a/src/core/render/io/meshdata.cpp
+++ b/src/render/io/meshdata.cpp
diff --git a/src/core/render/io/meshdata.h b/src/render/io/meshdata.h
index 92a9330bb..92a9330bb 100644
--- a/src/core/render/io/meshdata.h
+++ b/src/render/io/meshdata.h
diff --git a/src/core/render/io/objloader.cpp b/src/render/io/objloader.cpp
index 53d41936b..53d41936b 100644
--- a/src/core/render/io/objloader.cpp
+++ b/src/render/io/objloader.cpp
diff --git a/src/core/render/io/objloader.h b/src/render/io/objloader.h
index 6c7ae93c0..6c7ae93c0 100644
--- a/src/core/render/io/objloader.h
+++ b/src/render/io/objloader.h
diff --git a/src/core/render/io/render-io.pri b/src/render/io/render-io.pri
index ad12b7803..ad12b7803 100644
--- a/src/core/render/io/render-io.pri
+++ b/src/render/io/render-io.pri
diff --git a/src/core/render/io/texturedata.cpp b/src/render/io/texturedata.cpp
index 3a1b8aa8f..3a1b8aa8f 100644
--- a/src/core/render/io/texturedata.cpp
+++ b/src/render/io/texturedata.cpp
diff --git a/src/core/render/io/texturedata.h b/src/render/io/texturedata.h
index 6ce214c26..6ce214c26 100644
--- a/src/core/render/io/texturedata.h
+++ b/src/render/io/texturedata.h
diff --git a/src/core/render/qt3drenderer_global.h b/src/render/qt3drenderer_global.h
index 5f267da3f..5f267da3f 100644
--- a/src/core/render/qt3drenderer_global.h
+++ b/src/render/qt3drenderer_global.h
diff --git a/src/core/render/render.pro b/src/render/render.pro
index 592e0dfec..939c0c51b 100644
--- a/src/core/render/render.pro
+++ b/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 b/src/render/render.qrc
index fde4905a7..fde4905a7 100644
--- a/src/core/render/render.qrc
+++ b/src/render/render.qrc
diff --git a/src/core/render/shaders/basic.frag b/src/render/shaders/basic.frag
index 1cb92d0f6..1cb92d0f6 100755
--- a/src/core/render/shaders/basic.frag
+++ b/src/render/shaders/basic.frag
diff --git a/src/core/render/shaders/basic.vert b/src/render/shaders/basic.vert
index 008f612b6..008f612b6 100755
--- a/src/core/render/shaders/basic.vert
+++ b/src/render/shaders/basic.vert
diff --git a/src/core/render/shaders/diffuse.frag b/src/render/shaders/diffuse.frag
index e9985422a..e9985422a 100644
--- a/src/core/render/shaders/diffuse.frag
+++ b/src/render/shaders/diffuse.frag
diff --git a/src/core/render/shaders/diffuse.vert b/src/render/shaders/diffuse.vert
index 987441ecd..987441ecd 100644
--- a/src/core/render/shaders/diffuse.vert
+++ b/src/render/shaders/diffuse.vert
diff --git a/src/src.pro b/src/src.pro
index b7473a6a6..d5bc9c761 100644
--- 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
index 363fd197b..e0a379ed7 100644
--- 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
 );