Flatten OpenGL source directory hierarchy

Flatten Source,Include and PrivateInclude directories away. Replace
camelcase directory names with lowercase names. Remove random Qt3DS
prefixes from directory names.

Task-number: QT3DS-16
Change-Id: I5b23349232c760afa9a8efcc5e8945ee19d2e31a
Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>

727 files changed, 674 insertions, 683 deletions

diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
index d224c975..237f0413 100644
--- a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
@@ -85,7 +85,7 @@
 #include <QtQml/qqmlcomponent.h>
 #include <QtCore/qdir.h>
 #include <unordered_set>
-#include "Runtime/Include/q3dsqmlbehavior.h"
+#include "runtime/q3dsqmlbehavior.h"
 #include "Qt3DSFileToolsSeekableMeshBufIOStream.h"
 #include "IObjectReferenceHelper.h"
 #include "StudioProjectSettings.h"
diff --git a/src/Authoring/Common/Common.pro b/src/Authoring/Common/Common.pro
index 805329ed..40afde5c 100644
--- a/src/Authoring/Common/Common.pro
+++ b/src/Authoring/Common/Common.pro
@@ -27,8 +27,7 @@ INCLUDEPATH += \
     ../QT3DSDM \
     ../QT3DSDM/Systems \
     ../Studio/Utils \
-    ../../Runtime/Source/Qt3DSFoundation/Include \
-    ../../Runtime/Source/Qt3DSFoundation/Include/foundation \
+    ../../Runtime/Source/foundation \
     ../../3rdparty/EASTL/UnknownVersion/include \
     ../../3rdparty/color \
     ..
diff --git a/src/Authoring/CoreLib/CoreLib.pro b/src/Authoring/CoreLib/CoreLib.pro
index a2ae1af0..49392d4d 100644
--- a/src/Authoring/CoreLib/CoreLib.pro
+++ b/src/Authoring/CoreLib/CoreLib.pro
@@ -53,14 +53,13 @@ INCLUDEPATH += \
     ../Common/Code/Graph \
     ../Common/Code/EulerAngles \
     ../Common/Code/Serialize \
-    ../../Runtime/Source/DataModel/Include \
-    ../../Runtime/Source/Qt3DSRender/Include \
-    ../../Runtime/Source/Qt3DSFoundation/Include \
-    ../../Runtime/Source/Qt3DSFoundation/Include/foundation \
-    ../../Runtime/Source/Qt3DSRuntimeRender/Include \
-    ../../Runtime/Source/Qt3DSRuntimeRender/GraphObjects \
-    ../../Runtime/Source/Qt3DSRuntimeRender/ResourceManager \
-    ../../Runtime/Source/Qt3DSStateApplication/Application \
+    ../../Runtime/Source/datamodel \
+    ../../Runtime/Source/render \
+    ../../Runtime/Source/foundation \
+    ../../Runtime/Source/runtimerender \
+    ../../Runtime/Source/runtimerender/graphobjects \
+    ../../Runtime/Source/runtimerender/resourcemanager \
+    ../../Runtime/Source/stateapplication \
     ../../3rdparty/EASTL/UnknownVersion/include \
     $$QMAKE_INCDIR_FBX \
     ../../3rdparty/ColladaDOM/2.4.0/dom/include \
diff --git a/src/Authoring/FBXLineExporter/FBXLineExporter.pro b/src/Authoring/FBXLineExporter/FBXLineExporter.pro
index 995feb41..5ae46df8 100644
--- a/src/Authoring/FBXLineExporter/FBXLineExporter.pro
+++ b/src/Authoring/FBXLineExporter/FBXLineExporter.pro
@@ -9,7 +9,7 @@ QT -= gui
 DEFINES += _UNICODE QT3DS_AUTHORING _AFXDLL PCRE_STATIC
 
 INCLUDEPATH += \
-    ../../Runtime/Source/Qt3DSFoundation/Include \
+    ../../Runtime/Source/foundation \
     $$QMAKE_INCDIR_FBX \
     ../../3rdparty/EASTL/UnknownVersion/include
 
diff --git a/src/Authoring/MorphLines/MorphLines.pro b/src/Authoring/MorphLines/MorphLines.pro
index 9cab8160..9cdace66 100644
--- a/src/Authoring/MorphLines/MorphLines.pro
+++ b/src/Authoring/MorphLines/MorphLines.pro
@@ -10,8 +10,8 @@ DEFINES += _UNICODE QT3DS_AUTHORING _AFXDLL PCRE_STATIC
 
 INCLUDEPATH += \
     ../QT3DSIMP/Qt3DSImportLib \
-    ../../Runtime/Source/Qt3DSRender/Include \
-    ../../Runtime/Source/Qt3DSFoundation/Include \
+    ../../Runtime/Source/render \
+    ../../Runtime/Source/foundation \
     ../../3rdparty/EASTL/UnknownVersion/include
 
 LIBS += \
diff --git a/src/Authoring/QT3DSDM/QT3DSDM.pro b/src/Authoring/QT3DSDM/QT3DSDM.pro
index 3e2cc68e..ca35f825 100644
--- a/src/Authoring/QT3DSDM/QT3DSDM.pro
+++ b/src/Authoring/QT3DSDM/QT3DSDM.pro
@@ -13,11 +13,11 @@ INCLUDEPATH += \
     \
     Systems \
     Systems/Cores \
-    ../../Runtime/Source/System/Include \
-    ../../Runtime/Source/Qt3DSFoundation/Include \
-    ../../Runtime/Source/Qt3DSRuntimeRender/Include \
-    ../../Runtime/Source/DataModel/Include \
-    ../../Runtime/Source/Qt3DSRender/Include \
+    ../../Runtime/Source/system \
+    ../../Runtime/Source/foundation \
+    ../../Runtime/Source/runtimerender \
+    ../../Runtime/Source/datamodel \
+    ../../Runtime/Source/render \
     ../../3rdparty/EASTL/UnknownVersion/include \
     ../../3rdparty/utf8cpp/2.3.2/source \
     ../../3rdparty/color \
diff --git a/src/Authoring/Studio/Qt3DStudio.pro b/src/Authoring/Studio/Qt3DStudio.pro
index 722ee49c..c1272d3e 100644
--- a/src/Authoring/Studio/Qt3DStudio.pro
+++ b/src/Authoring/Studio/Qt3DStudio.pro
@@ -72,14 +72,13 @@ INCLUDEPATH += \
     ../Client/Code/Core/Doc/ClientDataModelBridge \
     ../Client/Code/Shared \
     ../Client/Code/Shared/Log \
-    ../../Runtime/Source/Qt3DSRender/Include \
-    ../../Runtime/Source/Qt3DSFoundation/Include \
-    ../../Runtime/Source/Qt3DSFoundation/Include/foundation \
-    ../../Runtime/Source/Qt3DSRuntimeRender/Include \
-    ../../Runtime/Source/Qt3DSRuntimeRender/GraphObjects \
-    ../../Runtime/Source/Qt3DSRuntimeRender/ResourceManager \
-    ../../Runtime/Source/Qt3DSStateApplication/Application \
-    ../../Runtime/Source/Qt3DSEvent/InternalInclude \
+    ../../Runtime/Source/render \
+    ../../Runtime/Source/foundation \
+    ../../Runtime/Source/runtimerender \
+    ../../Runtime/Source/runtimerender/graphobjects \
+    ../../Runtime/Source/runtimerender/resourcemanager \
+    ../../Runtime/Source/stateapplication \
+    ../../Runtime/Source/event \
     ../../3rdparty/EASTL/UnknownVersion/include \
     ../../3rdparty/color \
     ../../QtExtras/qmlstreamer
diff --git a/src/Authoring/commoninclude.pri b/src/Authoring/commoninclude.pri
index 07f5d77b..889deb49 100644
--- a/src/Authoring/commoninclude.pri
+++ b/src/Authoring/commoninclude.pri
@@ -21,30 +21,27 @@ INCLUDEPATH += $$PWD/../Runtime/Source
 
 win32 {
 INCLUDEPATH += \
-    $$PWD/../Runtime/Source/PlatformSpecific/Windows/PlatformLibs \
+    $$PWD/../Runtime/Source/platformspecific/windows/libs \
     $$PWD/../3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs \
-    $$PWD/../Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs \
     $$PWD/../3rdparty/RuntimePlatformSpecific/Windows/Qt3DSLibs
 }
 
 linux {
 INCLUDEPATH += \
-    $$PWD/../Runtime/Source/PlatformSpecific/Linux/PlatformLibs \
     $$PWD/../3rdparty/RuntimePlatformSpecific/Linux/PlatformLibs \
-    $$PWD/../Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs \
+    $$PWD/../Runtime/Source/platformspecific/Linux/libs \
     $$PWD/../3rdparty/RuntimePlatformSpecific/Linux/Qt3DSLibs
 }
 
 macos {
 INCLUDEPATH += \
-    $$PWD/../Runtime/Source/PlatformSpecific/Macos/PlatformLibs \
     $$PWD/../3rdparty/RuntimePlatformSpecific/Macos/PlatformLibs \
-    $$PWD/../Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs \
+    $$PWD/../Runtime/Source/platformspecific/macos/libs \
     $$PWD/../3rdparty/RuntimePlatformSpecific/Macos/Qt3DSLibs
 
 }
 android {
 INCLUDEPATH += \
-    $$PWD/../Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs
-    $$PWD/../Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_thread
+    $$PWD/../Runtime/Source/platformspecific/Android/jni/libs
+    $$PWD/../Runtime/Source/platformspecific/Android/jni/libs/nv_thread
 }
diff --git a/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro b/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro
index 0e675518..ac5a3936 100644
--- a/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro
+++ b/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro
@@ -18,14 +18,14 @@ integrity|ios {
 }
 
 SOURCES += \
-    ../Source/Viewer/Qt3DSAudioPlayerImpl.cpp \
-    ../Source/Viewer/Qt3DSViewerApp.cpp
+    ../Source/viewer/Qt3DSAudioPlayerImpl.cpp \
+    ../Source/viewer/Qt3DSViewerApp.cpp
 
 HEADERS += \
-    ../Source/Viewer/qt3dsruntimeglobal.h \
-    ../Source/Viewer/Qt3DSAudioPlayerImpl.h \
-    ../Source/Viewer/Qt3DSViewerApp.h \
-    ../Source/Viewer/Qt3DSViewerTimer.h
+    ../Source/viewer/qt3dsruntimeglobal.h \
+    ../Source/viewer/Qt3DSAudioPlayerImpl.h \
+    ../Source/viewer/Qt3DSViewerApp.h \
+    ../Source/viewer/Qt3DSViewerTimer.h
 
 linux|qnx|mingw {
     BEGIN_ARCHIVE = -Wl,--whole-archive
diff --git a/src/Runtime/Qt3DSRuntimeStatic/Qt3DSRuntimeStatic.pro b/src/Runtime/Qt3DSRuntimeStatic/Qt3DSRuntimeStatic.pro
index c1986ce0..7020f79e 100644
--- a/src/Runtime/Qt3DSRuntimeStatic/Qt3DSRuntimeStatic.pro
+++ b/src/Runtime/Qt3DSRuntimeStatic/Qt3DSRuntimeStatic.pro
@@ -18,599 +18,599 @@ QT += qml
 
 # Foundation
 SOURCES += \
-    ../Source/Qt3DSFoundation/Source/foundation/ConvertUTF.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/EASTL_new.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/FileTools.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/IOStreams.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/Qt3DSLogging.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/Qt3DSFoundation.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/Qt3DSMathUtils.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/Qt3DSPerfTimer.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/Qt3DSSystem.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/Socket.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/StringTable.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/XML.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/TrackingAllocator.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/q3dsqmlrender.cpp \
-    ../Source/Engine/Source/Qt3DSRenderRuntimeBinding.cpp \
-    ../Source/Engine/Source/Qt3DSRenderRuntimeBindingImplRenderer.cpp \
-    ../Source/Engine/Source/Qt3DSRenderRuntimeBindingImplTranslation.cpp \
-    ../Source/Engine/Source/Qt3DSTegraApplication.cpp \
-    ../Source/Engine/Source/Qt3DSTegraInputEngine.cpp \
-    ../Source/Runtime/Source/Qt3DSActivationManager.cpp \
-    ../Source/Runtime/Source/Qt3DSAnimationSystem.cpp \
-    ../Source/Runtime/Source/Qt3DSApplication.cpp \
-    ../Source/Runtime/Source/Qt3DSAttributeHashes.cpp \
-    ../Source/Runtime/Source/Qt3DSComponentManager.cpp \
-    ../Source/Runtime/Source/Qt3DSElementSystem.cpp \
-    ../Source/Runtime/Source/Qt3DSEventCallbacks.cpp \
-    ../Source/Runtime/Source/Qt3DSInputEngine.cpp \
-    ../Source/Runtime/Source/Qt3DSLogicSystem.cpp \
-    ../Source/Runtime/Source/Qt3DSCommandHelper.cpp \
-    ../Source/Runtime/Source/Qt3DSElementHelper.cpp \
-    ../Source/Runtime/Source/Qt3DSOutputMemoryStream.cpp \
-    ../Source/Runtime/Source/Qt3DSParametersSystem.cpp \
-    ../Source/Runtime/Source/Qt3DSPresentation.cpp \
-    ../Source/Runtime/Source/Qt3DSPresentationFrameData.cpp \
-    ../Source/Runtime/Source/Qt3DSQmlElementHelper.cpp \
-    ../Source/Runtime/Source/Qt3DSQmlEngine.cpp \
-    ../Source/Runtime/Source/Qt3DSSlideSystem.cpp \
-    ../Source/Runtime/Source/Qt3DSTimePolicy.cpp \
-    ../Source/Runtime/Source/q3dsvariantconfig.cpp \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.cpp \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.cpp \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.cpp \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.cpp \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.cpp \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.cpp \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLight.cpp \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLightmaps.cpp \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderModel.cpp \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.cpp \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPath.cpp \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.cpp \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.cpp \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderText.cpp \
-    ../Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.cpp \
-    ../Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.cpp \
-    ../Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.cpp \
-    ../Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderHelper.cpp \
-    ../Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp \
-    ../Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.cpp \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferLoader.cpp \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.cpp \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderImageBatchLoader.cpp \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.cpp \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureBMP.cpp \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.cpp \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureGIF.cpp \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureHDR.cpp \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.cpp \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceBufferObjects.cpp \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceManager.cpp \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceTexture2D.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSOffscreenRenderManager.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSOldNBustedRenderPlugin.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSOnscreenTextRenderer.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSQtTextRenderer.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderClippingFrustum.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialShaderGenerator.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialSystem.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDefaultMaterialShaderGenerator.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDynamicObjectSystem.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderEffectSystem.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRendererUtil.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderEulerAngles.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGpuProfiler.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGraphObjectSerializer.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderImageScaler.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderInputStreamFactory.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPathManager.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPixelGraphicsRenderer.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPixelGraphicsTypes.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPlugin.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderRay.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderRenderList.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCache.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCodeGenerator.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCodeGeneratorV2.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShadowMap.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderSubpresentation.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextTextureAtlas.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextTextureCache.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextureAtlas.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderThreadPool.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderUIPLoader.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderUIPSharedTranslation.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderWidgets.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSTextRenderer.cpp \
-    ../Source/System/Source/Qt3DSAssert.cpp \
-    ../Source/System/Source/Qt3DSBoundingBox.cpp \
-    ../Source/System/Source/Qt3DSColor.cpp \
-    ../Source/System/Source/Qt3DSCubicRoots.cpp \
-    ../Source/System/Source/Qt3DSDataLogger.cpp \
-    ../Source/System/Source/Qt3DSDLLManager.cpp \
-    ../Source/System/Source/Qt3DSEulerAngles.cpp \
-    ../Source/System/Source/Qt3DSFile.cpp \
-    ../Source/System/Source/Qt3DSFileStream.cpp \
-    ../Source/System/Source/Qt3DSFunctionWrappers.cpp \
-    ../Source/System/Source/Qt3DSMatrix.cpp \
-    ../Source/System/Source/Qt3DSMemory.cpp \
-    ../Source/System/Source/Qt3DSMemoryFilter.cpp \
-    ../Source/System/Source/Qt3DSMemoryHeap.cpp \
-    ../Source/System/Source/Qt3DSMemoryManager.cpp \
-    ../Source/System/Source/Qt3DSMemoryPool.cpp \
-    ../Source/System/Source/Qt3DSMemoryProbe.cpp \
-    ../Source/System/Source/Qt3DSMemoryStatistics.cpp \
-    ../Source/System/Source/Qt3DSMemoryTracker.cpp \
-    ../Source/System/Source/Qt3DSTimer.cpp \
-    ../Source/System/Source/Qt3DSTypes.cpp \
-    ../Source/System/Source/Qt3DSVector3.cpp \
-    ../Source/Qt3DSStateApplication/Application/Qt3DSStateApplication.cpp \
-    ../Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphRuntimeDebugger.cpp \
-    ../Source/Qt3DSStateApplication/Debugger/Qt3DSStateDataTest.cpp \
-    ../Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggedInterpreter.cpp \
-    ../Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugger.cpp \
-    ../Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerListener.cpp \
-    ../Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugStreams.cpp \
-    ../Source/Qt3DSStateApplication/Source/Qt3DSStateContext.cpp \
-    ../Source/Qt3DSStateApplication/Source/Qt3DSStateExecutionContext.cpp \
-    ../Source/Qt3DSStateApplication/Source/Qt3DSStateInterpreter.cpp \
-    ../Source/Qt3DSStateApplication/Source/Qt3DSStateVisualBindingContext.cpp \
-    ../Source/Qt3DSStateApplication/Source/Qt3DSStateXMLIO.cpp \
-    ../Source/UIPParser/Source/Qt3DSUIPParserActionHelper.cpp \
-    ../Source/UIPParser/Source/Qt3DSUIPParserImpl.cpp \
-    ../Source/UIPParser/Source/Qt3DSUIPParserObjectRefHelper.cpp \
-    ../Source/Qt3DSRuntimeRender/Source/Qt3DSRenderContextCore.cpp \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureKTX.cpp
+    ../Source/foundation/ConvertUTF.cpp \
+    ../Source/foundation/EASTL_new.cpp \
+    ../Source/foundation/FileTools.cpp \
+    ../Source/foundation/IOStreams.cpp \
+    ../Source/foundation/Qt3DSLogging.cpp \
+    ../Source/foundation/Qt3DSFoundation.cpp \
+    ../Source/foundation/Qt3DSMathUtils.cpp \
+    ../Source/foundation/Qt3DSPerfTimer.cpp \
+    ../Source/foundation/Qt3DSSystem.cpp \
+    ../Source/foundation/Socket.cpp \
+    ../Source/foundation/StringTable.cpp \
+    ../Source/foundation/XML.cpp \
+    ../Source/foundation/TrackingAllocator.cpp \
+    ../Source/runtimerender/q3dsqmlrender.cpp \
+    ../Source/engine/Qt3DSRenderRuntimeBinding.cpp \
+    ../Source/engine/Qt3DSRenderRuntimeBindingImplRenderer.cpp \
+    ../Source/engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp \
+    ../Source/engine/Qt3DSTegraApplication.cpp \
+    ../Source/engine/Qt3DSTegraInputEngine.cpp \
+    ../Source/runtime/Qt3DSActivationManager.cpp \
+    ../Source/runtime/Qt3DSAnimationSystem.cpp \
+    ../Source/runtime/Qt3DSApplication.cpp \
+    ../Source/runtime/Qt3DSAttributeHashes.cpp \
+    ../Source/runtime/Qt3DSComponentManager.cpp \
+    ../Source/runtime/Qt3DSElementSystem.cpp \
+    ../Source/runtime/Qt3DSEventCallbacks.cpp \
+    ../Source/runtime/Qt3DSInputEngine.cpp \
+    ../Source/runtime/Qt3DSLogicSystem.cpp \
+    ../Source/runtime/Qt3DSCommandHelper.cpp \
+    ../Source/runtime/Qt3DSElementHelper.cpp \
+    ../Source/runtime/Qt3DSOutputMemoryStream.cpp \
+    ../Source/runtime/Qt3DSParametersSystem.cpp \
+    ../Source/runtime/Qt3DSPresentation.cpp \
+    ../Source/runtime/Qt3DSPresentationFrameData.cpp \
+    ../Source/runtime/Qt3DSQmlElementHelper.cpp \
+    ../Source/runtime/Qt3DSQmlEngine.cpp \
+    ../Source/runtime/Qt3DSSlideSystem.cpp \
+    ../Source/runtime/Qt3DSTimePolicy.cpp \
+    ../Source/runtime/q3dsvariantconfig.cpp \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderCamera.cpp \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.cpp \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderDynamicObject.cpp \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderEffect.cpp \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderImage.cpp \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderLayer.cpp \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderLight.cpp \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderLightmaps.cpp \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderModel.cpp \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderNode.cpp \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderPath.cpp \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderPresentation.cpp \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderScene.cpp \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderText.cpp \
+    ../Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.cpp \
+    ../Source/runtimerender/rendererimpl/Qt3DSRendererImpl.cpp \
+    ../Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.cpp \
+    ../Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderHelper.cpp \
+    ../Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.cpp \
+    ../Source/runtimerender/rendererimpl/Qt3DSRendererImplShaders.cpp \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderBufferLoader.cpp \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderImageBatchLoader.cpp \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.cpp \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureBMP.cpp \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureDDS.cpp \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureGIF.cpp \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureHDR.cpp \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderPrefilterTexture.cpp \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderResourceBufferObjects.cpp \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderResourceManager.cpp \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderResourceTexture2D.cpp \
+    ../Source/runtimerender/Qt3DSOffscreenRenderManager.cpp \
+    ../Source/runtimerender/Qt3DSOldNBustedRenderPlugin.cpp \
+    ../Source/runtimerender/Qt3DSOnscreenTextRenderer.cpp \
+    ../Source/runtimerender/Qt3DSQtTextRenderer.cpp \
+    ../Source/runtimerender/Qt3DSRenderClippingFrustum.cpp \
+    ../Source/runtimerender/Qt3DSRenderCustomMaterialShaderGenerator.cpp \
+    ../Source/runtimerender/Qt3DSRenderCustomMaterialSystem.cpp \
+    ../Source/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.cpp \
+    ../Source/runtimerender/Qt3DSRenderDynamicObjectSystem.cpp \
+    ../Source/runtimerender/Qt3DSRenderEffectSystem.cpp \
+    ../Source/runtimerender/Qt3DSRendererUtil.cpp \
+    ../Source/runtimerender/Qt3DSRenderEulerAngles.cpp \
+    ../Source/runtimerender/Qt3DSRenderGpuProfiler.cpp \
+    ../Source/runtimerender/Qt3DSRenderGraphObjectSerializer.cpp \
+    ../Source/runtimerender/Qt3DSRenderImageScaler.cpp \
+    ../Source/runtimerender/Qt3DSRenderInputStreamFactory.cpp \
+    ../Source/runtimerender/Qt3DSRenderPathManager.cpp \
+    ../Source/runtimerender/Qt3DSRenderPixelGraphicsRenderer.cpp \
+    ../Source/runtimerender/Qt3DSRenderPixelGraphicsTypes.cpp \
+    ../Source/runtimerender/Qt3DSRenderPlugin.cpp \
+    ../Source/runtimerender/Qt3DSRenderRay.cpp \
+    ../Source/runtimerender/Qt3DSRenderRenderList.cpp \
+    ../Source/runtimerender/Qt3DSRenderShaderCache.cpp \
+    ../Source/runtimerender/Qt3DSRenderShaderCodeGenerator.cpp \
+    ../Source/runtimerender/Qt3DSRenderShaderCodeGeneratorV2.cpp \
+    ../Source/runtimerender/Qt3DSRenderShadowMap.cpp \
+    ../Source/runtimerender/Qt3DSRenderSubpresentation.cpp \
+    ../Source/runtimerender/Qt3DSRenderTextTextureAtlas.cpp \
+    ../Source/runtimerender/Qt3DSRenderTextTextureCache.cpp \
+    ../Source/runtimerender/Qt3DSRenderTextureAtlas.cpp \
+    ../Source/runtimerender/Qt3DSRenderThreadPool.cpp \
+    ../Source/runtimerender/Qt3DSRenderUIPLoader.cpp \
+    ../Source/runtimerender/Qt3DSRenderUIPSharedTranslation.cpp \
+    ../Source/runtimerender/Qt3DSRenderWidgets.cpp \
+    ../Source/runtimerender/Qt3DSTextRenderer.cpp \
+    ../Source/system/Qt3DSAssert.cpp \
+    ../Source/system/Qt3DSBoundingBox.cpp \
+    ../Source/system/Qt3DSColor.cpp \
+    ../Source/system/Qt3DSCubicRoots.cpp \
+    ../Source/system/Qt3DSDataLogger.cpp \
+    ../Source/system/Qt3DSDLLManager.cpp \
+    ../Source/system/Qt3DSEulerAngles.cpp \
+    ../Source/system/Qt3DSFile.cpp \
+    ../Source/system/Qt3DSFileStream.cpp \
+    ../Source/system/Qt3DSFunctionWrappers.cpp \
+    ../Source/system/Qt3DSMatrix.cpp \
+    ../Source/system/Qt3DSMemory.cpp \
+    ../Source/system/Qt3DSMemoryFilter.cpp \
+    ../Source/system/Qt3DSMemoryHeap.cpp \
+    ../Source/system/Qt3DSMemoryManager.cpp \
+    ../Source/system/Qt3DSMemoryPool.cpp \
+    ../Source/system/Qt3DSMemoryProbe.cpp \
+    ../Source/system/Qt3DSMemoryStatistics.cpp \
+    ../Source/system/Qt3DSMemoryTracker.cpp \
+    ../Source/system/Qt3DSTimer.cpp \
+    ../Source/system/Qt3DSTypes.cpp \
+    ../Source/system/Qt3DSVector3.cpp \
+    ../Source/stateapplication/Qt3DSStateApplication.cpp \
+    ../Source/stateapplication/debugger/Qt3DSSceneGraphRuntimeDebugger.cpp \
+    ../Source/stateapplication/debugger/Qt3DSStateDataTest.cpp \
+    ../Source/stateapplication/debugger/Qt3DSStateDebuggedInterpreter.cpp \
+    ../Source/stateapplication/debugger/Qt3DSStateDebugger.cpp \
+    ../Source/stateapplication/debugger/Qt3DSStateDebuggerListener.cpp \
+    ../Source/stateapplication/debugger/Qt3DSStateDebugStreams.cpp \
+    ../Source/stateapplication/Qt3DSStateContext.cpp \
+    ../Source/stateapplication/Qt3DSStateExecutionContext.cpp \
+    ../Source/stateapplication/Qt3DSStateInterpreter.cpp \
+    ../Source/stateapplication/Qt3DSStateVisualBindingContext.cpp \
+    ../Source/stateapplication/Qt3DSStateXMLIO.cpp \
+    ../Source/uipparser/Qt3DSUIPParserActionHelper.cpp \
+    ../Source/uipparser/Qt3DSUIPParserImpl.cpp \
+    ../Source/uipparser/Qt3DSUIPParserObjectRefHelper.cpp \
+    ../Source/runtimerender/Qt3DSRenderContextCore.cpp \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.cpp
 
 HEADERS += \
-    ../Source/Qt3DSFoundation/Include/foundation/ConvertUTF.h \
-    ../Source/Qt3DSFoundation/Include/foundation/FileTools.h \
-    ../Source/Qt3DSFoundation/Include/foundation/IOStreams.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSLogging.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSFoundation.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSMathUtils.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSPerfTimer.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSSystem.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Socket.h \
-    ../Source/Qt3DSFoundation/Include/foundation/StringTable.h \
-    ../Source/Qt3DSFoundation/Include/foundation/XML.h \
-    ../Source/Qt3DSFoundation/Include/foundation/AutoDeallocatorAllocator.h \
-    ../Source/Qt3DSFoundation/Include/foundation/FastAllocator.h \
-    ../Source/Qt3DSFoundation/Include/foundation/PoolingAllocator.h \
-    ../Source/Qt3DSFoundation/Include/foundation/PreAllocatedAllocator.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DS.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSAllocator.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSAllocatorCallback.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSAssert.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSAtomic.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSBasicTemplates.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSBounds3.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSBroadcastingAllocator.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSContainers.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSDataRef.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSDiscriminatedUnion.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSFastIPC.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSFlags.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSFPU.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSIndexableLinkedList.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSIntrinsics.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSInvasiveLinkedList.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSInvasiveSet.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSIPC.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSMat33.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSMat44.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSMath.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSMemoryBuffer.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSMutex.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSNoCopy.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSOption.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSPlane.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSPool.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSPreprocessor.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSQuat.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSRefCounted.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSSemaphore.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSSimpleTypes.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSStringTokenizer.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSSync.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSThread.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSTime.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSTransform.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSUnionCast.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSUtilities.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSVec2.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSVec3.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSVec4.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Qt3DSVersionNumber.h \
-    ../Source/Qt3DSFoundation/Include/foundation/SerializationTypes.h \
-    ../Source/Qt3DSFoundation/Include/foundation/StrConvertUTF.h \
-    ../Source/Qt3DSFoundation/Include/foundation/StringConversion.h \
-    ../Source/Qt3DSFoundation/Include/foundation/StringConversionImpl.h \
-    ../Source/Qt3DSFoundation/Include/foundation/TaggedPointer.h \
-    ../Source/Qt3DSFoundation/Include/foundation/ThreadSafeQueue.h \
-    ../Source/Qt3DSFoundation/Include/foundation/TrackingAllocator.h \
-    ../Source/Qt3DSFoundation/Include/foundation/Utils.h \
-    ../Source/Qt3DSRuntimeRender/Include/q3dsqmlrender.h \
-    ../Source/Engine/Include/Qt3DSRenderRuntimeBinding.h \
-    ../Source/Engine/Include/Qt3DSRenderRuntimeBindingImpl.h \
-    ../Source/Engine/Include/Qt3DSTegraApplication.h \
-    ../Source/Engine/Include/Qt3DSTegraInputEngine.h \
-    ../Source/Runtime/Include/Qt3DSActivationManager.h \
-    ../Source/Runtime/Include/Qt3DSAnimationSystem.h \
-    ../Source/Runtime/Include/Qt3DSApplication.h \
-    ../Source/Runtime/Include/Qt3DSAttributeHashes.h \
-    ../Source/Runtime/Include/Qt3DSComponentManager.h \
-    ../Source/Runtime/Include/Qt3DSElementSystem.h \
-    ../Source/Runtime/Include/Qt3DSEventCallbacks.h \
-    ../Source/Runtime/Include/Qt3DSInputEngine.h \
-    ../Source/Runtime/Include/Qt3DSLogicSystem.h \
-    ../Source/Runtime/Include/Qt3DSCommandHelper.h \
-    ../Source/Runtime/Include/Qt3DSElementHelper.h \
-    ../Source/Runtime/Include/Qt3DSOutputMemoryStream.h \
-    ../Source/Runtime/Include/Qt3DSParametersSystem.h \
-    ../Source/Runtime/Include/Qt3DSPresentation.h \
-    ../Source/Runtime/Include/Qt3DSPresentationFrameData.h \
-    ../Source/Runtime/Include/Qt3DSQmlElementHelper.h \
-    ../Source/Runtime/Include/Qt3DSQmlEngine.h \
-    ../Source/Runtime/Include/Qt3DSSlideSystem.h \
-    ../Source/Runtime/Include/Qt3DSTimePolicy.h \
-    ../Source/Runtime/Include/Qt3DSApplicationValues.h \
-    ../Source/Runtime/Include/Qt3DSIComponentManager.h \
-    ../Source/Runtime/Include/Qt3DSIInputSystem.h \
-    ../Source/Runtime/Include/Qt3DSInputDefs.h \
-    ../Source/Runtime/Include/Qt3DSInputEventTypes.h \
-    ../Source/Runtime/Include/Qt3DSIStateful.h \
-    ../Source/Runtime/Include/Qt3DSIText.h \
-    ../Source/Runtime/Include/Qt3DSKernelTypes.h \
-    ../Source/Runtime/Include/q3dsvariantconfig_p.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCustomMaterial.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderGraphObject.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLight.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLightmaps.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderMaterialDirty.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderModel.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPath.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPathSubPath.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderReferencedMaterial.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.h \
-    ../Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderText.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderKey.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderManager.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSOldNBustedRenderPlugin.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRender.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderableImage.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderClippingFrustum.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialRenderContext.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialShaderGenerator.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialSystem.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDefaultMaterialShaderGenerator.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystem.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemCommands.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemUtil.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEffectSystem.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderer.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRendererUtil.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEulerAngles.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectPickQuery.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectSerializer.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectTypes.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageScaler.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageTextureData.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderInputStreamFactory.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialHelpers.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialShaderGenerator.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMesh.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathManager.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathMath.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathRenderContext.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsRenderer.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsTypes.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPlugin.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginCInterface.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginGraphObject.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginPropertyValue.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderProfiler.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRay.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRenderList.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRotationHelper.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCache.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGenerator.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGeneratorV2.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderKeys.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShadowMap.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderString.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubpresentation.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubPresentationHelper.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTaggedPointer.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTessModeValues.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureAtlas.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureCache.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTypes.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextureAtlas.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderThreadPool.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPLoader.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWidgets.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSTextRenderer.h \
-    ../Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.h \
-    ../Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.h \
-    ../Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.h \
-    ../Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderHelper.h \
-    ../Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.h \
-    ../Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.h \
-    ../Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSVertexPipelineImpl.h \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferLoader.h \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.h \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderImageBatchLoader.h \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.h \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.h \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureFreeImageCompat.h \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.h \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceBufferObjects.h \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceManager.h \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceTexture2D.h \
-    ../Source/System/Include/Qt3DSArray.h \
-    ../Source/System/Include/Qt3DSAssert.h \
-    ../Source/System/Include/Qt3DSAudioPlayer.h \
-    ../Source/System/Include/Qt3DSBasicPluginDLL.h \
-    ../Source/System/Include/Qt3DSBezierEval.h \
-    ../Source/System/Include/Qt3DSBoundingBox.h \
-    ../Source/System/Include/Qt3DSCircularArray.h \
-    ../Source/System/Include/Qt3DSColor.h \
-    ../Source/System/Include/Qt3DSConfig.h \
-    ../Source/System/Include/Qt3DSCubicRoots.h \
-    ../Source/System/Include/Qt3DSCubicRootsImpl.h \
-    ../Source/System/Include/Qt3DSDataLogger.h \
-    ../Source/System/Include/Qt3DSDataLogger.hpp \
-    ../Source/System/Include/Qt3DSDataLoggerEnums.h \
-    ../Source/System/Include/Qt3DSDataLoggerViewer.h \
-    ../Source/System/Include/Qt3DSDLLManager.h \
-    ../Source/System/Include/Qt3DSEGLTimer.h \
-    ../Source/System/Include/Qt3DSEndian.h \
-    ../Source/System/Include/Qt3DSEulerAngles.h \
-    ../Source/System/Include/Qt3DSFile.h \
-    ../Source/System/Include/Qt3DSFileStream.h \
-    ../Source/System/Include/Qt3DSFixedArray.h \
-    ../Source/System/Include/Qt3DSFNDTimer.h \
-    ../Source/System/Include/Qt3DSFunctionWrappers.h \
-    ../Source/System/Include/Qt3DSHash.h \
-    ../Source/System/Include/Qt3DSIFileStream.h \
-    ../Source/System/Include/Qt3DSIStream.h \
-    ../Source/System/Include/Qt3DSITimer.h \
-    ../Source/System/Include/Qt3DSMacros.h \
-    ../Source/System/Include/Qt3DSMatrix.h \
-    ../Source/System/Include/Qt3DSMemory.h \
-    ../Source/System/Include/Qt3DSMemoryFilter.h \
-    ../Source/System/Include/Qt3DSMemoryHeap.h \
-    ../Source/System/Include/Qt3DSMemoryManager.h \
-    ../Source/System/Include/Qt3DSMemoryPool.h \
-    ../Source/System/Include/Qt3DSMemoryProbe.h \
-    ../Source/System/Include/Qt3DSMemorySettings.h \
-    ../Source/System/Include/Qt3DSMemoryStatistics.h \
-    ../Source/System/Include/Qt3DSMemoryTracker.h \
-    ../Source/System/Include/Qt3DSPlatformSpecific.h \
-    ../Source/System/Include/Qt3DSTimer.h \
-    ../Source/System/Include/Qt3DSTypes.h \
-    ../Source/System/Include/Qt3DSVector3.h \
-    ../Source/System/Include/Qt3DSArray.inl \
-    ../Source/System/Include/Qt3DSCircularArray.inl \
-    ../Source/System/Include/Qt3DSFixedArray.inl \
-    ../Source/Qt3DSStateApplication/Application/Qt3DSStateApplication.h \
-    ../Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebugger.h \
-    ../Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerProtocol.h \
-    ../Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerValue.h \
-    ../Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugger.h \
-    ../Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerProtocol.h \
-    ../Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerValues.h \
-    ../Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugStreams.h \
-    ../Source/Qt3DSStateApplication/Debugger/Qt3DSStateTest.h \
-    ../Source/Qt3DSStateApplication/Include/Qt3DSState.h \
-    ../Source/Qt3DSStateApplication/Include/Qt3DSStateContext.h \
-    ../Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionContext.h \
-    ../Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionTypes.h \
-    ../Source/Qt3DSStateApplication/Include/Qt3DSStateIdValue.h \
-    ../Source/Qt3DSStateApplication/Include/Qt3DSStateInterpreter.h \
-    ../Source/Qt3DSStateApplication/Include/Qt3DSStateScriptContext.h \
-    ../Source/Qt3DSStateApplication/Include/Qt3DSStateSharedImpl.h \
-    ../Source/Qt3DSStateApplication/Include/Qt3DSStateSignalConnection.h \
-    ../Source/Qt3DSStateApplication/Include/Qt3DSStateTypes.h \
-    ../Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContext.h \
-    ../Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextCommands.h \
-    ../Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextValues.h \
-    ../Source/Qt3DSStateApplication/Include/Qt3DSStateXMLIO.h \
-    ../Source/UIPParser/Include/Qt3DSIPresentation.h \
-    ../Source/UIPParser/Include/Qt3DSUIPParser.h \
-    ../Source/UIPParser/Include/Qt3DSUIPParserActionHelper.h \
-    ../Source/UIPParser/Include/Qt3DSUIPParserImpl.h \
-    ../Source/UIPParser/Include/Qt3DSUIPParserObjectRefHelper.h \
-    ../Source/Runtime/Include/Qt3DSCommandEventTypes.h \
-    ../Source/Runtime/Include/Qt3DSEvent.h \
-    ../Source/Runtime/Include/Qt3DSFrameworkTypes.h \
-    ../Source/Runtime/Include/Qt3DSInputFrame.h \
-    ../Source/Runtime/Include/Qt3DSIScene.h \
-    ../Source/Runtime/Include/Qt3DSIScriptBridge.h \
-    ../Source/Runtime/Include/Qt3DSPickFrame.h \
-    ../Source/Runtime/Include/Qt3DSRuntimeFactory.h \
-    ../Source/Runtime/Include/Qt3DSSceneManager.h \
-    ../Source/Engine/Include/Qt3DSEGLInfo.h \
-    ../Source/Engine/Include/Qt3DSEGLWindowSystem.h \
-    ../Source/Engine/Include/Qt3DSPluginDLL.h \
-    ../Source/Engine/Include/Qt3DSWindowSystem.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderContextCore.h \
-    ../Source/Qt3DSRuntimeRender/Include/Qt3DSRenderLightConstantProperties.h \
-    ../Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureKTX.h
+    ../Source/foundation/ConvertUTF.h \
+    ../Source/foundation/FileTools.h \
+    ../Source/foundation/IOStreams.h \
+    ../Source/foundation/Qt3DSLogging.h \
+    ../Source/foundation/Qt3DSFoundation.h \
+    ../Source/foundation/Qt3DSMathUtils.h \
+    ../Source/foundation/Qt3DSPerfTimer.h \
+    ../Source/foundation/Qt3DSSystem.h \
+    ../Source/foundation/Socket.h \
+    ../Source/foundation/StringTable.h \
+    ../Source/foundation/XML.h \
+    ../Source/foundation/AutoDeallocatorAllocator.h \
+    ../Source/foundation/FastAllocator.h \
+    ../Source/foundation/PoolingAllocator.h \
+    ../Source/foundation/PreAllocatedAllocator.h \
+    ../Source/foundation/Qt3DS.h \
+    ../Source/foundation/Qt3DSAllocator.h \
+    ../Source/foundation/Qt3DSAllocatorCallback.h \
+    ../Source/foundation/Qt3DSAssert.h \
+    ../Source/foundation/Qt3DSAtomic.h \
+    ../Source/foundation/Qt3DSBasicTemplates.h \
+    ../Source/foundation/Qt3DSBounds3.h \
+    ../Source/foundation/Qt3DSBroadcastingAllocator.h \
+    ../Source/foundation/Qt3DSContainers.h \
+    ../Source/foundation/Qt3DSDataRef.h \
+    ../Source/foundation/Qt3DSDiscriminatedUnion.h \
+    ../Source/foundation/Qt3DSFastIPC.h \
+    ../Source/foundation/Qt3DSFlags.h \
+    ../Source/foundation/Qt3DSFPU.h \
+    ../Source/foundation/Qt3DSIndexableLinkedList.h \
+    ../Source/foundation/Qt3DSIntrinsics.h \
+    ../Source/foundation/Qt3DSInvasiveLinkedList.h \
+    ../Source/foundation/Qt3DSInvasiveSet.h \
+    ../Source/foundation/Qt3DSIPC.h \
+    ../Source/foundation/Qt3DSMat33.h \
+    ../Source/foundation/Qt3DSMat44.h \
+    ../Source/foundation/Qt3DSMath.h \
+    ../Source/foundation/Qt3DSMemoryBuffer.h \
+    ../Source/foundation/Qt3DSMutex.h \
+    ../Source/foundation/Qt3DSNoCopy.h \
+    ../Source/foundation/Qt3DSOption.h \
+    ../Source/foundation/Qt3DSPlane.h \
+    ../Source/foundation/Qt3DSPool.h \
+    ../Source/foundation/Qt3DSPreprocessor.h \
+    ../Source/foundation/Qt3DSQuat.h \
+    ../Source/foundation/Qt3DSRefCounted.h \
+    ../Source/foundation/Qt3DSSemaphore.h \
+    ../Source/foundation/Qt3DSSimpleTypes.h \
+    ../Source/foundation/Qt3DSStringTokenizer.h \
+    ../Source/foundation/Qt3DSSync.h \
+    ../Source/foundation/Qt3DSThread.h \
+    ../Source/foundation/Qt3DSTime.h \
+    ../Source/foundation/Qt3DSTransform.h \
+    ../Source/foundation/Qt3DSUnionCast.h \
+    ../Source/foundation/Qt3DSUtilities.h \
+    ../Source/foundation/Qt3DSVec2.h \
+    ../Source/foundation/Qt3DSVec3.h \
+    ../Source/foundation/Qt3DSVec4.h \
+    ../Source/foundation/Qt3DSVersionNumber.h \
+    ../Source/foundation/SerializationTypes.h \
+    ../Source/foundation/StrConvertUTF.h \
+    ../Source/foundation/StringConversion.h \
+    ../Source/foundation/StringConversionImpl.h \
+    ../Source/foundation/TaggedPointer.h \
+    ../Source/foundation/ThreadSafeQueue.h \
+    ../Source/foundation/TrackingAllocator.h \
+    ../Source/foundation/Utils.h \
+    ../Source/runtimerender/q3dsqmlrender.h \
+    ../Source/engine/Qt3DSRenderRuntimeBinding.h \
+    ../Source/engine/Qt3DSRenderRuntimeBindingImpl.h \
+    ../Source/engine/Qt3DSTegraApplication.h \
+    ../Source/engine/Qt3DSTegraInputEngine.h \
+    ../Source/runtime/Qt3DSActivationManager.h \
+    ../Source/runtime/Qt3DSAnimationSystem.h \
+    ../Source/runtime/Qt3DSApplication.h \
+    ../Source/runtime/Qt3DSAttributeHashes.h \
+    ../Source/runtime/Qt3DSComponentManager.h \
+    ../Source/runtime/Qt3DSElementSystem.h \
+    ../Source/runtime/Qt3DSEventCallbacks.h \
+    ../Source/runtime/Qt3DSInputEngine.h \
+    ../Source/runtime/Qt3DSLogicSystem.h \
+    ../Source/runtime/Qt3DSCommandHelper.h \
+    ../Source/runtime/Qt3DSElementHelper.h \
+    ../Source/runtime/Qt3DSOutputMemoryStream.h \
+    ../Source/runtime/Qt3DSParametersSystem.h \
+    ../Source/runtime/Qt3DSPresentation.h \
+    ../Source/runtime/Qt3DSPresentationFrameData.h \
+    ../Source/runtime/Qt3DSQmlElementHelper.h \
+    ../Source/runtime/Qt3DSQmlEngine.h \
+    ../Source/runtime/Qt3DSSlideSystem.h \
+    ../Source/runtime/Qt3DSTimePolicy.h \
+    ../Source/runtime/Qt3DSApplicationValues.h \
+    ../Source/runtime/Qt3DSIComponentManager.h \
+    ../Source/runtime/Qt3DSIInputSystem.h \
+    ../Source/runtime/Qt3DSInputDefs.h \
+    ../Source/runtime/Qt3DSInputEventTypes.h \
+    ../Source/runtime/Qt3DSIStateful.h \
+    ../Source/runtime/Qt3DSIText.h \
+    ../Source/runtime/Qt3DSKernelTypes.h \
+    ../Source/runtime/q3dsvariantconfig_p.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderCamera.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderCustomMaterial.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderDynamicObject.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderEffect.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderGraphObject.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderImage.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderLayer.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderLight.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderLightmaps.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderMaterialDirty.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderModel.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderNode.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderPath.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderPathSubPath.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderPresentation.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderReferencedMaterial.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderScene.h \
+    ../Source/runtimerender/graphobjects/Qt3DSRenderText.h \
+    ../Source/runtimerender/Qt3DSOffscreenRenderKey.h \
+    ../Source/runtimerender/Qt3DSOffscreenRenderManager.h \
+    ../Source/runtimerender/Qt3DSOldNBustedRenderPlugin.h \
+    ../Source/runtimerender/Qt3DSRender.h \
+    ../Source/runtimerender/Qt3DSRenderableImage.h \
+    ../Source/runtimerender/Qt3DSRenderClippingFrustum.h \
+    ../Source/runtimerender/Qt3DSRenderCustomMaterialRenderContext.h \
+    ../Source/runtimerender/Qt3DSRenderCustomMaterialShaderGenerator.h \
+    ../Source/runtimerender/Qt3DSRenderCustomMaterialSystem.h \
+    ../Source/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.h \
+    ../Source/runtimerender/Qt3DSRenderDynamicObjectSystem.h \
+    ../Source/runtimerender/Qt3DSRenderDynamicObjectSystemCommands.h \
+    ../Source/runtimerender/Qt3DSRenderDynamicObjectSystemUtil.h \
+    ../Source/runtimerender/Qt3DSRenderEffectSystem.h \
+    ../Source/runtimerender/Qt3DSRenderer.h \
+    ../Source/runtimerender/Qt3DSRendererUtil.h \
+    ../Source/runtimerender/Qt3DSRenderEulerAngles.h \
+    ../Source/runtimerender/Qt3DSRenderGraphObjectPickQuery.h \
+    ../Source/runtimerender/Qt3DSRenderGraphObjectSerializer.h \
+    ../Source/runtimerender/Qt3DSRenderGraphObjectTypes.h \
+    ../Source/runtimerender/Qt3DSRenderImageScaler.h \
+    ../Source/runtimerender/Qt3DSRenderImageTextureData.h \
+    ../Source/runtimerender/Qt3DSRenderInputStreamFactory.h \
+    ../Source/runtimerender/Qt3DSRenderMaterialHelpers.h \
+    ../Source/runtimerender/Qt3DSRenderMaterialShaderGenerator.h \
+    ../Source/runtimerender/Qt3DSRenderMesh.h \
+    ../Source/runtimerender/Qt3DSRenderPathManager.h \
+    ../Source/runtimerender/Qt3DSRenderPathMath.h \
+    ../Source/runtimerender/Qt3DSRenderPathRenderContext.h \
+    ../Source/runtimerender/Qt3DSRenderPixelGraphicsRenderer.h \
+    ../Source/runtimerender/Qt3DSRenderPixelGraphicsTypes.h \
+    ../Source/runtimerender/Qt3DSRenderPlugin.h \
+    ../Source/runtimerender/Qt3DSRenderPluginCInterface.h \
+    ../Source/runtimerender/Qt3DSRenderPluginGraphObject.h \
+    ../Source/runtimerender/Qt3DSRenderPluginPropertyValue.h \
+    ../Source/runtimerender/Qt3DSRenderProfiler.h \
+    ../Source/runtimerender/Qt3DSRenderRay.h \
+    ../Source/runtimerender/Qt3DSRenderRenderList.h \
+    ../Source/runtimerender/Qt3DSRenderRotationHelper.h \
+    ../Source/runtimerender/Qt3DSRenderShaderCache.h \
+    ../Source/runtimerender/Qt3DSRenderShaderCodeGenerator.h \
+    ../Source/runtimerender/Qt3DSRenderShaderCodeGeneratorV2.h \
+    ../Source/runtimerender/Qt3DSRenderShaderKeys.h \
+    ../Source/runtimerender/Qt3DSRenderShadowMap.h \
+    ../Source/runtimerender/Qt3DSRenderString.h \
+    ../Source/runtimerender/Qt3DSRenderSubpresentation.h \
+    ../Source/runtimerender/Qt3DSRenderSubPresentationHelper.h \
+    ../Source/runtimerender/Qt3DSRenderTaggedPointer.h \
+    ../Source/runtimerender/Qt3DSRenderTessModeValues.h \
+    ../Source/runtimerender/Qt3DSRenderTextTextureAtlas.h \
+    ../Source/runtimerender/Qt3DSRenderTextTextureCache.h \
+    ../Source/runtimerender/Qt3DSRenderTextTypes.h \
+    ../Source/runtimerender/Qt3DSRenderTextureAtlas.h \
+    ../Source/runtimerender/Qt3DSRenderThreadPool.h \
+    ../Source/runtimerender/Qt3DSRenderUIPLoader.h \
+    ../Source/runtimerender/Qt3DSRenderUIPSharedTranslation.h \
+    ../Source/runtimerender/Qt3DSRenderWidgets.h \
+    ../Source/runtimerender/Qt3DSTextRenderer.h \
+    ../Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.h \
+    ../Source/runtimerender/rendererimpl/Qt3DSRendererImpl.h \
+    ../Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.h \
+    ../Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderHelper.h \
+    ../Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.h \
+    ../Source/runtimerender/rendererimpl/Qt3DSRendererImplShaders.h \
+    ../Source/runtimerender/rendererimpl/Qt3DSVertexPipelineImpl.h \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderBufferLoader.h \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderBufferManager.h \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderImageBatchLoader.h \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.h \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureDDS.h \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureFreeImageCompat.h \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderPrefilterTexture.h \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderResourceBufferObjects.h \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderResourceManager.h \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderResourceTexture2D.h \
+    ../Source/system/Qt3DSArray.h \
+    ../Source/system/Qt3DSAssert.h \
+    ../Source/system/Qt3DSAudioPlayer.h \
+    ../Source/system/Qt3DSBasicPluginDLL.h \
+    ../Source/system/Qt3DSBezierEval.h \
+    ../Source/system/Qt3DSBoundingBox.h \
+    ../Source/system/Qt3DSCircularArray.h \
+    ../Source/system/Qt3DSColor.h \
+    ../Source/system/Qt3DSConfig.h \
+    ../Source/system/Qt3DSCubicRoots.h \
+    ../Source/system/Qt3DSCubicRootsImpl.h \
+    ../Source/system/Qt3DSDataLogger.h \
+    ../Source/system/Qt3DSDataLogger.hpp \
+    ../Source/system/Qt3DSDataLoggerEnums.h \
+    ../Source/system/Qt3DSDataLoggerViewer.h \
+    ../Source/system/Qt3DSDLLManager.h \
+    ../Source/system/Qt3DSEGLTimer.h \
+    ../Source/system/Qt3DSEndian.h \
+    ../Source/system/Qt3DSEulerAngles.h \
+    ../Source/system/Qt3DSFile.h \
+    ../Source/system/Qt3DSFileStream.h \
+    ../Source/system/Qt3DSFixedArray.h \
+    ../Source/system/Qt3DSFNDTimer.h \
+    ../Source/system/Qt3DSFunctionWrappers.h \
+    ../Source/system/Qt3DSHash.h \
+    ../Source/system/Qt3DSIFileStream.h \
+    ../Source/system/Qt3DSIStream.h \
+    ../Source/system/Qt3DSITimer.h \
+    ../Source/system/Qt3DSMacros.h \
+    ../Source/system/Qt3DSMatrix.h \
+    ../Source/system/Qt3DSMemory.h \
+    ../Source/system/Qt3DSMemoryFilter.h \
+    ../Source/system/Qt3DSMemoryHeap.h \
+    ../Source/system/Qt3DSMemoryManager.h \
+    ../Source/system/Qt3DSMemoryPool.h \
+    ../Source/system/Qt3DSMemoryProbe.h \
+    ../Source/system/Qt3DSMemorySettings.h \
+    ../Source/system/Qt3DSMemoryStatistics.h \
+    ../Source/system/Qt3DSMemoryTracker.h \
+    ../Source/system/Qt3DSPlatformSpecific.h \
+    ../Source/system/Qt3DSTimer.h \
+    ../Source/system/Qt3DSTypes.h \
+    ../Source/system/Qt3DSVector3.h \
+    ../Source/system/Qt3DSArray.inl \
+    ../Source/system/Qt3DSCircularArray.inl \
+    ../Source/system/Qt3DSFixedArray.inl \
+    ../Source/stateapplication/Qt3DSStateApplication.h \
+    ../Source/stateapplication/debugger/Qt3DSSceneGraphDebugger.h \
+    ../Source/stateapplication/debugger/Qt3DSSceneGraphDebuggerProtocol.h \
+    ../Source/stateapplication/debugger/Qt3DSSceneGraphDebuggerValue.h \
+    ../Source/stateapplication/debugger/Qt3DSStateDebugger.h \
+    ../Source/stateapplication/debugger/Qt3DSStateDebuggerProtocol.h \
+    ../Source/stateapplication/debugger/Qt3DSStateDebuggerValues.h \
+    ../Source/stateapplication/debugger/Qt3DSStateDebugStreams.h \
+    ../Source/stateapplication/debugger/Qt3DSStateTest.h \
+    ../Source/stateapplication/Qt3DSState.h \
+    ../Source/stateapplication/Qt3DSStateContext.h \
+    ../Source/stateapplication/Qt3DSStateExecutionContext.h \
+    ../Source/stateapplication/Qt3DSStateExecutionTypes.h \
+    ../Source/stateapplication/Qt3DSStateIdValue.h \
+    ../Source/stateapplication/Qt3DSStateInterpreter.h \
+    ../Source/stateapplication/Qt3DSStateScriptContext.h \
+    ../Source/stateapplication/Qt3DSStateSharedImpl.h \
+    ../Source/stateapplication/Qt3DSStateSignalConnection.h \
+    ../Source/stateapplication/Qt3DSStateTypes.h \
+    ../Source/stateapplication/Qt3DSStateVisualBindingContext.h \
+    ../Source/stateapplication/Qt3DSStateVisualBindingContextCommands.h \
+    ../Source/stateapplication/Qt3DSStateVisualBindingContextValues.h \
+    ../Source/stateapplication/Qt3DSStateXMLIO.h \
+    ../Source/uipparser/Qt3DSIPresentation.h \
+    ../Source/uipparser/Qt3DSUIPParser.h \
+    ../Source/uipparser/Qt3DSUIPParserActionHelper.h \
+    ../Source/uipparser/Qt3DSUIPParserImpl.h \
+    ../Source/uipparser/Qt3DSUIPParserObjectRefHelper.h \
+    ../Source/runtime/Qt3DSCommandEventTypes.h \
+    ../Source/runtime/Qt3DSEvent.h \
+    ../Source/runtime/Qt3DSFrameworkTypes.h \
+    ../Source/runtime/Qt3DSInputFrame.h \
+    ../Source/runtime/Qt3DSIScene.h \
+    ../Source/runtime/Qt3DSIScriptBridge.h \
+    ../Source/runtime/Qt3DSPickFrame.h \
+    ../Source/runtime/Qt3DSRuntimeFactory.h \
+    ../Source/runtime/Qt3DSSceneManager.h \
+    ../Source/engine/Qt3DSEGLInfo.h \
+    ../Source/engine/Qt3DSEGLWindowSystem.h \
+    ../Source/engine/Qt3DSPluginDLL.h \
+    ../Source/engine/Qt3DSWindowSystem.h \
+    ../Source/runtimerender/Qt3DSRenderContextCore.h \
+    ../Source/runtimerender/Qt3DSRenderLightConstantProperties.h \
+    ../Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.h
 
 win32 {
 SOURCES += \
-    ../Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsAtomic.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsFPU.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsMutex.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsSemaphore.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsSync.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsThread.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsTime.cpp
+    ../Source/foundation/windows/Qt3DSWindowsAtomic.cpp \
+    ../Source/foundation/windows/Qt3DSWindowsFPU.cpp \
+    ../Source/foundation/windows/Qt3DSWindowsMutex.cpp \
+    ../Source/foundation/windows/Qt3DSWindowsSemaphore.cpp \
+    ../Source/foundation/windows/Qt3DSWindowsSync.cpp \
+    ../Source/foundation/windows/Qt3DSWindowsThread.cpp \
+    ../Source/foundation/windows/Qt3DSWindowsTime.cpp
 
 HEADERS += \
-    ../Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsAoS.h \
-    ../Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsFile.h \
-    ../Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsInclude.h \
-    ../Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsInlineAoS.h \
-    ../Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsIntrinsics.h \
-    ../Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsString.h \
-    ../Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsTrigConstants.h
+    ../Source/foundation/windows/Qt3DSWindowsAoS.h \
+    ../Source/foundation/windows/Qt3DSWindowsFile.h \
+    ../Source/foundation/windows/Qt3DSWindowsInclude.h \
+    ../Source/foundation/windows/Qt3DSWindowsInlineAoS.h \
+    ../Source/foundation/windows/Qt3DSWindowsIntrinsics.h \
+    ../Source/foundation/windows/Qt3DSWindowsString.h \
+    ../Source/foundation/windows/Qt3DSWindowsTrigConstants.h
 }
 
 macos: SOURCES += \
-    ../Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixAtomic.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixFPU.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixMutex.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixSemaphore.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixSync.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxThread.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixTime.cpp
+    ../Source/foundation/macos/Qt3DSUnixAtomic.cpp \
+    ../Source/foundation/macos/Qt3DSUnixFPU.cpp \
+    ../Source/foundation/macos/Qt3DSUnixMutex.cpp \
+    ../Source/foundation/macos/Qt3DSUnixSemaphore.cpp \
+    ../Source/foundation/macos/Qt3DSUnixSync.cpp \
+    ../Source/foundation/linux/Qt3DSLinuxThread.cpp \
+    ../Source/foundation/macos/Qt3DSUnixTime.cpp
 
 linux|integrity|qnx {
 SOURCES += \
-    ../Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxAtomic.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxFPU.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxMutex.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxSemaphore.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxSync.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxThread.cpp \
-    ../Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxTime.cpp
+    ../Source/foundation/linux/Qt3DSLinuxAtomic.cpp \
+    ../Source/foundation/linux/Qt3DSLinuxFPU.cpp \
+    ../Source/foundation/linux/Qt3DSLinuxMutex.cpp \
+    ../Source/foundation/linux/Qt3DSLinuxSemaphore.cpp \
+    ../Source/foundation/linux/Qt3DSLinuxSync.cpp \
+    ../Source/foundation/linux/Qt3DSLinuxThread.cpp \
+    ../Source/foundation/linux/Qt3DSLinuxTime.cpp
 
 HEADERS += \
-    ../Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxAoS.h \
-    ../Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxFile.h \
-    ../Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxInlineAoS.h \
-    ../Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxIntrinsics.h \
-    ../Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxString.h \
-    ../Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxTrigConstants.h
+    ../Source/foundation/linux/Qt3DSLinuxAoS.h \
+    ../Source/foundation/linux/Qt3DSLinuxFile.h \
+    ../Source/foundation/linux/Qt3DSLinuxInlineAoS.h \
+    ../Source/foundation/linux/Qt3DSLinuxIntrinsics.h \
+    ../Source/foundation/linux/Qt3DSLinuxString.h \
+    ../Source/foundation/linux/Qt3DSLinuxTrigConstants.h
 }
 
 # Libs
 SOURCES += \
-    ../Source/PlatformSpecific/$$PlatformSpecificDir/Qt3DSLibs/nv_math/nv_math.cpp \
-    ../Source/PlatformSpecific/$$PlatformSpecificDir/Qt3DSLibs/nv_math/nv_matrix.cpp \
-    ../Source/PlatformSpecific/$$PlatformSpecificDir/Qt3DSLibs/nv_math/nv_quat.cpp
+    ../Source/platformspecific/$$PlatformSpecificDir/libs/nv_math/nv_math.cpp \
+    ../Source/platformspecific/$$PlatformSpecificDir/libs/nv_math/nv_matrix.cpp \
+    ../Source/platformspecific/$$PlatformSpecificDir/libs/nv_math/nv_quat.cpp
 
 # RenderBase
 SOURCES += \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderAtomicCounterBuffer.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderAttribLayout.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderComputeShader.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderConstantBuffer.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderContext.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderDataBuffer.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderDepthStencilState.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderDrawIndirectBuffer.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderFragmentShader.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderFrameBuffer.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderGeometryShader.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderImageTexture.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderIndexBuffer.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderInputAssembler.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderOcclusionQuery.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderPathFontSpecification.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderPathFontText.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderPathRender.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderPathSpecification.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderProgramPipeline.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderQueryBase.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderRasterizerState.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderRenderBuffer.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderSampler.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderShaderProgram.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderStorageBuffer.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderSync.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderTessellationShader.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderTexture2D.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderTexture2DArray.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderTextureBase.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderTextureCube.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderTimerQuery.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderVertexBuffer.cpp \
-    ../Source/Qt3DSRender/Source/Qt3DSRenderVertexShader.cpp
+    ../Source/render/Qt3DSRenderAtomicCounterBuffer.cpp \
+    ../Source/render/Qt3DSRenderAttribLayout.cpp \
+    ../Source/render/Qt3DSRenderComputeShader.cpp \
+    ../Source/render/Qt3DSRenderConstantBuffer.cpp \
+    ../Source/render/Qt3DSRenderContext.cpp \
+    ../Source/render/Qt3DSRenderDataBuffer.cpp \
+    ../Source/render/Qt3DSRenderDepthStencilState.cpp \
+    ../Source/render/Qt3DSRenderDrawIndirectBuffer.cpp \
+    ../Source/render/Qt3DSRenderFragmentShader.cpp \
+    ../Source/render/Qt3DSRenderFrameBuffer.cpp \
+    ../Source/render/Qt3DSRenderGeometryShader.cpp \
+    ../Source/render/Qt3DSRenderImageTexture.cpp \
+    ../Source/render/Qt3DSRenderIndexBuffer.cpp \
+    ../Source/render/Qt3DSRenderInputAssembler.cpp \
+    ../Source/render/Qt3DSRenderOcclusionQuery.cpp \
+    ../Source/render/Qt3DSRenderPathFontSpecification.cpp \
+    ../Source/render/Qt3DSRenderPathFontText.cpp \
+    ../Source/render/Qt3DSRenderPathRender.cpp \
+    ../Source/render/Qt3DSRenderPathSpecification.cpp \
+    ../Source/render/Qt3DSRenderProgramPipeline.cpp \
+    ../Source/render/Qt3DSRenderQueryBase.cpp \
+    ../Source/render/Qt3DSRenderRasterizerState.cpp \
+    ../Source/render/Qt3DSRenderRenderBuffer.cpp \
+    ../Source/render/Qt3DSRenderSampler.cpp \
+    ../Source/render/Qt3DSRenderShaderProgram.cpp \
+    ../Source/render/Qt3DSRenderStorageBuffer.cpp \
+    ../Source/render/Qt3DSRenderSync.cpp \
+    ../Source/render/Qt3DSRenderTessellationShader.cpp \
+    ../Source/render/Qt3DSRenderTexture2D.cpp \
+    ../Source/render/Qt3DSRenderTexture2DArray.cpp \
+    ../Source/render/Qt3DSRenderTextureBase.cpp \
+    ../Source/render/Qt3DSRenderTextureCube.cpp \
+    ../Source/render/Qt3DSRenderTimerQuery.cpp \
+    ../Source/render/Qt3DSRenderVertexBuffer.cpp \
+    ../Source/render/Qt3DSRenderVertexShader.cpp
 
 HEADERS += \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderAtomicCounterBuffer.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderAttribLayout.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderBaseTypes.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderComputeShader.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderConstantBuffer.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderContext.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderDataBuffer.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderDepthStencilState.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderDrawable.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderDrawIndirectBuffer.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderFragmentShader.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderFrameBuffer.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderGeometryShader.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderImageTexture.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderIndexBuffer.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderInputAssembler.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderOcclusionQuery.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderPathFontSpecification.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderPathFontText.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderPathRender.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderPathSpecification.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderProgramPipeline.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderQueryBase.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderRasterizerState.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderRenderBuffer.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderSampler.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderShader.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderShaderConstant.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderShaderProgram.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderStorageBuffer.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderSync.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderTessellationShader.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderTexture2D.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderTexture2DArray.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderTextureBase.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderTextureCube.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderTimerQuery.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderVertexBuffer.h \
-    ../Source/Qt3DSRender/Include/render/Qt3DSRenderVertexShader.h \
-    ../Source/Qt3DSRender/Include/render/glg/Qt3DSGLImplObjects.h
+    ../Source/render/Qt3DSRenderAtomicCounterBuffer.h \
+    ../Source/render/Qt3DSRenderAttribLayout.h \
+    ../Source/render/Qt3DSRenderBaseTypes.h \
+    ../Source/render/Qt3DSRenderComputeShader.h \
+    ../Source/render/Qt3DSRenderConstantBuffer.h \
+    ../Source/render/Qt3DSRenderContext.h \
+    ../Source/render/Qt3DSRenderDataBuffer.h \
+    ../Source/render/Qt3DSRenderDepthStencilState.h \
+    ../Source/render/Qt3DSRenderDrawable.h \
+    ../Source/render/Qt3DSRenderDrawIndirectBuffer.h \
+    ../Source/render/Qt3DSRenderFragmentShader.h \
+    ../Source/render/Qt3DSRenderFrameBuffer.h \
+    ../Source/render/Qt3DSRenderGeometryShader.h \
+    ../Source/render/Qt3DSRenderImageTexture.h \
+    ../Source/render/Qt3DSRenderIndexBuffer.h \
+    ../Source/render/Qt3DSRenderInputAssembler.h \
+    ../Source/render/Qt3DSRenderOcclusionQuery.h \
+    ../Source/render/Qt3DSRenderPathFontSpecification.h \
+    ../Source/render/Qt3DSRenderPathFontText.h \
+    ../Source/render/Qt3DSRenderPathRender.h \
+    ../Source/render/Qt3DSRenderPathSpecification.h \
+    ../Source/render/Qt3DSRenderProgramPipeline.h \
+    ../Source/render/Qt3DSRenderQueryBase.h \
+    ../Source/render/Qt3DSRenderRasterizerState.h \
+    ../Source/render/Qt3DSRenderRenderBuffer.h \
+    ../Source/render/Qt3DSRenderSampler.h \
+    ../Source/render/Qt3DSRenderShader.h \
+    ../Source/render/Qt3DSRenderShaderConstant.h \
+    ../Source/render/Qt3DSRenderShaderProgram.h \
+    ../Source/render/Qt3DSRenderStorageBuffer.h \
+    ../Source/render/Qt3DSRenderSync.h \
+    ../Source/render/Qt3DSRenderTessellationShader.h \
+    ../Source/render/Qt3DSRenderTexture2D.h \
+    ../Source/render/Qt3DSRenderTexture2DArray.h \
+    ../Source/render/Qt3DSRenderTextureBase.h \
+    ../Source/render/Qt3DSRenderTextureCube.h \
+    ../Source/render/Qt3DSRenderTimerQuery.h \
+    ../Source/render/Qt3DSRenderVertexBuffer.h \
+    ../Source/render/Qt3DSRenderVertexShader.h \
+    ../Source/render/glg/Qt3DSGLImplObjects.h
 
 # Render
 SOURCES += \
-    ../Source/Qt3DSRender/Source/backends/gl/Qt3DSOpenGLExtensions.cpp \
-    ../Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGL3.cpp \
-    ../Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGL4.cpp \
-    ../Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGLBase.cpp \
-    ../Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderContextGL.cpp \
-    ../Source/Qt3DSRender/Source/backends/software/Qt3DSRenderBackendNULL.cpp \
-    ../Source/Qt3DSRender/Source/backends/gl/Q3DSRenderBackendGLES2.cpp
+    ../Source/render/backends/gl/Qt3DSOpenGLExtensions.cpp \
+    ../Source/render/backends/gl/Qt3DSRenderBackendGL3.cpp \
+    ../Source/render/backends/gl/Qt3DSRenderBackendGL4.cpp \
+    ../Source/render/backends/gl/Qt3DSRenderBackendGLBase.cpp \
+    ../Source/render/backends/gl/Qt3DSRenderContextGL.cpp \
+    ../Source/render/backends/software/Qt3DSRenderBackendNULL.cpp \
+    ../Source/render/backends/gl/Q3DSRenderBackendGLES2.cpp
 
 HEADERS += \
-    ../Source/Qt3DSRender/Include/render/backends/Qt3DSRenderBackend.h \
-    ../Source/Qt3DSRender/Include/render/backends/gl/Qt3DSOpenGLPrefix.h \
-    ../Source/Qt3DSRender/Include/render/backends/gl/Qt3DSOpenGLUtil.h \
-    ../Source/Qt3DSRender/Include/render/backends/gl/Qt3DSOpenGLExtensions.h \
-    ../Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendGL3.h \
-    ../Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendGL4.h \
-    ../Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendGLBase.h \
-    ../Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendInputAssemblerGL.h \
-    ../Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendRenderStatesGL.h \
-    ../Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendShaderProgramGL.h \
-    ../Source/Qt3DSRender/Include/render/backends/software/Qt3DSRenderBackendNULL.h \
-    ../Source/Qt3DSRender/Include/render/backends/gl/Q3DSRenderBackendGLES2.h
+    ../Source/render/backends/Qt3DSRenderBackend.h \
+    ../Source/render/backends/gl/Qt3DSOpenGLPrefix.h \
+    ../Source/render/backends/gl/Qt3DSOpenGLUtil.h \
+    ../Source/render/backends/gl/Qt3DSOpenGLExtensions.h \
+    ../Source/render/backends/gl/Qt3DSRenderBackendGL3.h \
+    ../Source/render/backends/gl/Qt3DSRenderBackendGL4.h \
+    ../Source/render/backends/gl/Qt3DSRenderBackendGLBase.h \
+    ../Source/render/backends/gl/Qt3DSRenderBackendInputAssemblerGL.h \
+    ../Source/render/backends/gl/Qt3DSRenderBackendRenderStatesGL.h \
+    ../Source/render/backends/gl/Qt3DSRenderBackendShaderProgramGL.h \
+    ../Source/render/backends/software/Qt3DSRenderBackendNULL.h \
+    ../Source/render/backends/gl/Q3DSRenderBackendGLES2.h
 
 # DataModel
 SOURCES += \
-    ../Source/DataModel/Source/Qt3DSMetadata.cpp \
+    ../Source/datamodel/Qt3DSMetadata.cpp \
     ../../Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.cpp \
     ../../Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportPath.cpp \
     ../../Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp \
@@ -621,8 +621,8 @@ SOURCES += \
     ../../Authoring/QT3DSDM/Systems/Cores/SimpleDataCore.cpp
 
 HEADERS += \
-    ../Source/DataModel/Include/Qt3DSMetadata.h \
-    ../Source/DataModel/Include/DocumentResourceManagerScriptParser.h \
+    ../Source/datamodel/Qt3DSMetadata.h \
+    ../Source/datamodel/DocumentResourceManagerScriptParser.h \
     ../../Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.h \
     ../../Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportPath.h \
     ../../Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.h \
@@ -635,40 +635,40 @@ HEADERS += \
 
 # Engine
 HEADERS += \
-    ../Source/Engine/Include/EnginePrefix.h
+    ../Source/engine/EnginePrefix.h
 
 # Event
 SOURCES += \
-    ../Source/Qt3DSEvent/Source/EventFactory.cpp \
-    ../Source/Qt3DSEvent/Source/EventPoller.cpp \
-    ../Source/Qt3DSEvent/Source/EventSystemC.cpp
+    ../Source/event/EventFactory.cpp \
+    ../Source/event/EventPoller.cpp \
+    ../Source/event/EventSystemC.cpp
 
 HEADERS += \
-    ../Source/Qt3DSEvent/InternalInclude/EventPollingSystem.h \
-    ../Source/Qt3DSEvent/Include/EventSystem.h \
-    ../Source/Qt3DSEvent/Include/EventSystemC.h
+    ../Source/event/EventPollingSystem.h \
+    ../Source/event/EventSystem.h \
+    ../Source/event/EventSystemC.h
 
 # Render
 HEADERS += \
-    ../Source/Qt3DSRuntimeRender/Include/ANDROID/DynamicLibLoader.h \
-    ../Source/Qt3DSRuntimeRender/Include/LINUX/DynamicLibLoader.h \
-    ../Source/Qt3DSRuntimeRender/Include/OSX/DynamicLibLoader.h \
-    ../Source/Qt3DSRuntimeRender/Include/QNX/DynamicLibLoader.h \
-    ../Source/Qt3DSRuntimeRender/Include/WINDOWS/DynamicLibLoader.h
+    ../Source/runtimerender/android/DynamicLibLoader.h \
+    ../Source/runtimerender/linux/DynamicLibLoader.h \
+    ../Source/runtimerender/macos/DynamicLibLoader.h \
+    ../Source/runtimerender/qnx/DynamicLibLoader.h \
+    ../Source/runtimerender/windows/DynamicLibLoader.h
 
 # Runtime
 HEADERS += \
-    ../Source/Runtime/Include/RuntimePrefix.h \
-    ../Source/Runtime/Include/q3dsqmlscript.h \
-    ../Source/Runtime/Include/q3dsqmlbehavior.h
+    ../Source/runtime/RuntimePrefix.h \
+    ../Source/runtime/q3dsqmlscript.h \
+    ../Source/runtime/q3dsqmlbehavior.h
 
 SOURCES += \
-    ../Source/Runtime/Source/q3dsqmlscript.cpp \
-    ../Source/Runtime/Source/q3dsqmlbehavior.cpp
+    ../Source/runtime/q3dsqmlscript.cpp \
+    ../Source/runtime/q3dsqmlbehavior.cpp
 
 # System
 HEADERS += \
-    ../Source/System/Include/SystemPrefix.h
+    ../Source/system/SystemPrefix.h
 
 DISTFILES += \
-    ../Source/Runtime/Include/Qt3DSAttributeHashes.txt
+    ../Source/runtime/Qt3DSAttributeHashes.txt
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/qt_attribution.json b/src/Runtime/Source/Qt3DSFoundation/Include/foundation/qt_attribution.json
deleted file mode 100644
index 067cced8..00000000
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/qt_attribution.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "Id": "convertutf",
-    "Name": "ConvertUTF",
-    "QDocModule": "qt3dstudio",
-    "QtUsage": "Used by Qt3DStudio, Studio and Runtime components.",
-
-    "License": "Other",
-    "LicenseFile": "LICENSE_CONVERTUTF.TXT",
-    "Copyright": "Copyright 2001-2004 Unicode, Inc."
-}
diff --git a/src/Runtime/Source/DataModel/Include/DocumentResourceManagerCustomMaterialParser.h b/src/Runtime/Source/datamodel/DocumentResourceManagerCustomMaterialParser.h
index 47a8092d..47a8092d 100644
--- a/src/Runtime/Source/DataModel/Include/DocumentResourceManagerCustomMaterialParser.h
+++ b/src/Runtime/Source/datamodel/DocumentResourceManagerCustomMaterialParser.h
diff --git a/src/Runtime/Source/DataModel/Include/DocumentResourceManagerRenderPluginParser.h b/src/Runtime/Source/datamodel/DocumentResourceManagerRenderPluginParser.h
index e3eee1cf..e3eee1cf 100644
--- a/src/Runtime/Source/DataModel/Include/DocumentResourceManagerRenderPluginParser.h
+++ b/src/Runtime/Source/datamodel/DocumentResourceManagerRenderPluginParser.h
diff --git a/src/Runtime/Source/DataModel/Include/DocumentResourceManagerScriptParser.h b/src/Runtime/Source/datamodel/DocumentResourceManagerScriptParser.h
index 4c2ce437..4c2ce437 100644
--- a/src/Runtime/Source/DataModel/Include/DocumentResourceManagerScriptParser.h
+++ b/src/Runtime/Source/datamodel/DocumentResourceManagerScriptParser.h
diff --git a/src/Runtime/Source/DataModel/Source/Qt3DSMetadata.cpp b/src/Runtime/Source/datamodel/Qt3DSMetadata.cpp
index 99d7cb8e..99d7cb8e 100644
--- a/src/Runtime/Source/DataModel/Source/Qt3DSMetadata.cpp
+++ b/src/Runtime/Source/datamodel/Qt3DSMetadata.cpp
diff --git a/src/Runtime/Source/DataModel/Include/Qt3DSMetadata.h b/src/Runtime/Source/datamodel/Qt3DSMetadata.h
index a90d4fd6..a90d4fd6 100644
--- a/src/Runtime/Source/DataModel/Include/Qt3DSMetadata.h
+++ b/src/Runtime/Source/datamodel/Qt3DSMetadata.h
diff --git a/src/Runtime/Source/Engine/Include/EnginePrefix.h b/src/Runtime/Source/engine/EnginePrefix.h
index d9017850..d9017850 100644
--- a/src/Runtime/Source/Engine/Include/EnginePrefix.h
+++ b/src/Runtime/Source/engine/EnginePrefix.h
diff --git a/src/Runtime/Source/Engine/Include/NVImageScaler.h b/src/Runtime/Source/engine/NVImageScaler.h
index 069604a6..069604a6 100644
--- a/src/Runtime/Source/Engine/Include/NVImageScaler.h
+++ b/src/Runtime/Source/engine/NVImageScaler.h
diff --git a/src/Runtime/Source/Engine/Include/OpenKodeInclude.h b/src/Runtime/Source/engine/OpenKodeInclude.h
index 06bdf006..06bdf006 100644
--- a/src/Runtime/Source/Engine/Include/OpenKodeInclude.h
+++ b/src/Runtime/Source/engine/OpenKodeInclude.h
diff --git a/src/Runtime/Source/Engine/Include/Qt3DSEGLInfo.h b/src/Runtime/Source/engine/Qt3DSEGLInfo.h
index 7be2c09e..7be2c09e 100644
--- a/src/Runtime/Source/Engine/Include/Qt3DSEGLInfo.h
+++ b/src/Runtime/Source/engine/Qt3DSEGLInfo.h
diff --git a/src/Runtime/Source/Engine/Include/Qt3DSEGLWindowSystem.h b/src/Runtime/Source/engine/Qt3DSEGLWindowSystem.h
index 770f5c9f..770f5c9f 100644
--- a/src/Runtime/Source/Engine/Include/Qt3DSEGLWindowSystem.h
+++ b/src/Runtime/Source/engine/Qt3DSEGLWindowSystem.h
diff --git a/src/Runtime/Source/Engine/Include/Qt3DSPluginDLL.h b/src/Runtime/Source/engine/Qt3DSPluginDLL.h
index 1ba7cf08..1ba7cf08 100644
--- a/src/Runtime/Source/Engine/Include/Qt3DSPluginDLL.h
+++ b/src/Runtime/Source/engine/Qt3DSPluginDLL.h
diff --git a/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBinding.cpp b/src/Runtime/Source/engine/Qt3DSRenderRuntimeBinding.cpp
index 8fa75792..8fa75792 100644
--- a/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBinding.cpp
+++ b/src/Runtime/Source/engine/Qt3DSRenderRuntimeBinding.cpp
diff --git a/src/Runtime/Source/Engine/Include/Qt3DSRenderRuntimeBinding.h b/src/Runtime/Source/engine/Qt3DSRenderRuntimeBinding.h
index ea95b943..ea95b943 100644
--- a/src/Runtime/Source/Engine/Include/Qt3DSRenderRuntimeBinding.h
+++ b/src/Runtime/Source/engine/Qt3DSRenderRuntimeBinding.h
diff --git a/src/Runtime/Source/Engine/Include/Qt3DSRenderRuntimeBindingImpl.h b/src/Runtime/Source/engine/Qt3DSRenderRuntimeBindingImpl.h
index 3ffe15ce..3ffe15ce 100644
--- a/src/Runtime/Source/Engine/Include/Qt3DSRenderRuntimeBindingImpl.h
+++ b/src/Runtime/Source/engine/Qt3DSRenderRuntimeBindingImpl.h
diff --git a/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplRenderer.cpp b/src/Runtime/Source/engine/Qt3DSRenderRuntimeBindingImplRenderer.cpp
index eff57579..eff57579 100644
--- a/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplRenderer.cpp
+++ b/src/Runtime/Source/engine/Qt3DSRenderRuntimeBindingImplRenderer.cpp
diff --git a/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplTranslation.cpp b/src/Runtime/Source/engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp
index daf6c0f1..daf6c0f1 100644
--- a/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplTranslation.cpp
+++ b/src/Runtime/Source/engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp
diff --git a/src/Runtime/Source/Engine/Source/Qt3DSTegraApplication.cpp b/src/Runtime/Source/engine/Qt3DSTegraApplication.cpp
index 92c7f6cc..92c7f6cc 100644
--- a/src/Runtime/Source/Engine/Source/Qt3DSTegraApplication.cpp
+++ b/src/Runtime/Source/engine/Qt3DSTegraApplication.cpp
diff --git a/src/Runtime/Source/Engine/Include/Qt3DSTegraApplication.h b/src/Runtime/Source/engine/Qt3DSTegraApplication.h
index 91233355..91233355 100644
--- a/src/Runtime/Source/Engine/Include/Qt3DSTegraApplication.h
+++ b/src/Runtime/Source/engine/Qt3DSTegraApplication.h
diff --git a/src/Runtime/Source/Engine/Source/Qt3DSTegraInputEngine.cpp b/src/Runtime/Source/engine/Qt3DSTegraInputEngine.cpp
index bb9a7f95..bb9a7f95 100644
--- a/src/Runtime/Source/Engine/Source/Qt3DSTegraInputEngine.cpp
+++ b/src/Runtime/Source/engine/Qt3DSTegraInputEngine.cpp
diff --git a/src/Runtime/Source/Engine/Include/Qt3DSTegraInputEngine.h b/src/Runtime/Source/engine/Qt3DSTegraInputEngine.h
index 14047f16..14047f16 100644
--- a/src/Runtime/Source/Engine/Include/Qt3DSTegraInputEngine.h
+++ b/src/Runtime/Source/engine/Qt3DSTegraInputEngine.h
diff --git a/src/Runtime/Source/Engine/Include/Qt3DSWindowSystem.h b/src/Runtime/Source/engine/Qt3DSWindowSystem.h
index 173dd837..173dd837 100644
--- a/src/Runtime/Source/Engine/Include/Qt3DSWindowSystem.h
+++ b/src/Runtime/Source/engine/Qt3DSWindowSystem.h
diff --git a/src/Runtime/Source/Qt3DSEvent/Source/EventFactory.cpp b/src/Runtime/Source/event/EventFactory.cpp
index 4bf776c6..4bf776c6 100644
--- a/src/Runtime/Source/Qt3DSEvent/Source/EventFactory.cpp
+++ b/src/Runtime/Source/event/EventFactory.cpp
diff --git a/src/Runtime/Source/Qt3DSEvent/Source/EventFactory.h b/src/Runtime/Source/event/EventFactory.h
index 10fe6b72..10fe6b72 100644
--- a/src/Runtime/Source/Qt3DSEvent/Source/EventFactory.h
+++ b/src/Runtime/Source/event/EventFactory.h
diff --git a/src/Runtime/Source/Qt3DSEvent/Source/EventPoller.cpp b/src/Runtime/Source/event/EventPoller.cpp
index a8115953..a8115953 100644
--- a/src/Runtime/Source/Qt3DSEvent/Source/EventPoller.cpp
+++ b/src/Runtime/Source/event/EventPoller.cpp
diff --git a/src/Runtime/Source/Qt3DSEvent/Source/EventPoller.h b/src/Runtime/Source/event/EventPoller.h
index 99ac27d6..99ac27d6 100644
--- a/src/Runtime/Source/Qt3DSEvent/Source/EventPoller.h
+++ b/src/Runtime/Source/event/EventPoller.h
diff --git a/src/Runtime/Source/Qt3DSEvent/InternalInclude/EventPollingSystem.h b/src/Runtime/Source/event/EventPollingSystem.h
index 4d414066..4d414066 100644
--- a/src/Runtime/Source/Qt3DSEvent/InternalInclude/EventPollingSystem.h
+++ b/src/Runtime/Source/event/EventPollingSystem.h
diff --git a/src/Runtime/Source/Qt3DSEvent/Include/EventSystem.h b/src/Runtime/Source/event/EventSystem.h
index a9e3dbc5..a9e3dbc5 100644
--- a/src/Runtime/Source/Qt3DSEvent/Include/EventSystem.h
+++ b/src/Runtime/Source/event/EventSystem.h
diff --git a/src/Runtime/Source/Qt3DSEvent/Source/EventSystemC.cpp b/src/Runtime/Source/event/EventSystemC.cpp
index 8bfdb81c..8bfdb81c 100644
--- a/src/Runtime/Source/Qt3DSEvent/Source/EventSystemC.cpp
+++ b/src/Runtime/Source/event/EventSystemC.cpp
diff --git a/src/Runtime/Source/Qt3DSEvent/Include/EventSystemC.h b/src/Runtime/Source/event/EventSystemC.h
index 2517eae4..2517eae4 100644
--- a/src/Runtime/Source/Qt3DSEvent/Include/EventSystemC.h
+++ b/src/Runtime/Source/event/EventSystemC.h
diff --git a/src/Runtime/Source/Qt3DSEvent/Test/CanProviderDemo.cpp b/src/Runtime/Source/event/test/CanProviderDemo.cpp
index dc51e9db..dc51e9db 100644
--- a/src/Runtime/Source/Qt3DSEvent/Test/CanProviderDemo.cpp
+++ b/src/Runtime/Source/event/test/CanProviderDemo.cpp
diff --git a/src/Runtime/Source/Qt3DSEvent/Test/CanProviderDemo.h b/src/Runtime/Source/event/test/CanProviderDemo.h
index 7d6788bc..7d6788bc 100644
--- a/src/Runtime/Source/Qt3DSEvent/Test/CanProviderDemo.h
+++ b/src/Runtime/Source/event/test/CanProviderDemo.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/AutoDeallocatorAllocator.h b/src/Runtime/Source/foundation/AutoDeallocatorAllocator.h
index 5cbbc8bb..5cbbc8bb 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/AutoDeallocatorAllocator.h
+++ b/src/Runtime/Source/foundation/AutoDeallocatorAllocator.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/ConvertUTF.cpp b/src/Runtime/Source/foundation/ConvertUTF.cpp
index a71a3aeb..a71a3aeb 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/ConvertUTF.cpp
+++ b/src/Runtime/Source/foundation/ConvertUTF.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/ConvertUTF.h b/src/Runtime/Source/foundation/ConvertUTF.h
index 93614a0c..93614a0c 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/ConvertUTF.h
+++ b/src/Runtime/Source/foundation/ConvertUTF.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/EASTL_new.cpp b/src/Runtime/Source/foundation/EASTL_new.cpp
index 61e8e0b4..61e8e0b4 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/EASTL_new.cpp
+++ b/src/Runtime/Source/foundation/EASTL_new.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/FastAllocator.h b/src/Runtime/Source/foundation/FastAllocator.h
index c296bcb6..c296bcb6 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/FastAllocator.h
+++ b/src/Runtime/Source/foundation/FastAllocator.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/FileTools.cpp b/src/Runtime/Source/foundation/FileTools.cpp
index aa1e7384..aa1e7384 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/FileTools.cpp
+++ b/src/Runtime/Source/foundation/FileTools.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/FileTools.h b/src/Runtime/Source/foundation/FileTools.h
index 57455256..57455256 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/FileTools.h
+++ b/src/Runtime/Source/foundation/FileTools.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/IOStreams.cpp b/src/Runtime/Source/foundation/IOStreams.cpp
index f1adfbc0..f1adfbc0 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/IOStreams.cpp
+++ b/src/Runtime/Source/foundation/IOStreams.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/IOStreams.h b/src/Runtime/Source/foundation/IOStreams.h
index 855e5209..855e5209 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/IOStreams.h
+++ b/src/Runtime/Source/foundation/IOStreams.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/LICENCE_SOCKET.TXT b/src/Runtime/Source/foundation/LICENCE_SOCKET.TXT
index 9b9ab805..9b9ab805 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/LICENCE_SOCKET.TXT
+++ b/src/Runtime/Source/foundation/LICENCE_SOCKET.TXT
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/LICENSE_CONVERTUTF.TXT b/src/Runtime/Source/foundation/LICENSE_CONVERTUTF.TXT
index 254acdfe..254acdfe 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/LICENSE_CONVERTUTF.TXT
+++ b/src/Runtime/Source/foundation/LICENSE_CONVERTUTF.TXT
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/PoolingAllocator.h b/src/Runtime/Source/foundation/PoolingAllocator.h
index 9d939fdc..9d939fdc 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/PoolingAllocator.h
+++ b/src/Runtime/Source/foundation/PoolingAllocator.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/PreAllocatedAllocator.h b/src/Runtime/Source/foundation/PreAllocatedAllocator.h
index aea03577..aea03577 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/PreAllocatedAllocator.h
+++ b/src/Runtime/Source/foundation/PreAllocatedAllocator.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DS.h b/src/Runtime/Source/foundation/Qt3DS.h
index 041923c3..041923c3 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DS.h
+++ b/src/Runtime/Source/foundation/Qt3DS.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSAllocator.h b/src/Runtime/Source/foundation/Qt3DSAllocator.h
index cdbbe5f9..cdbbe5f9 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSAllocator.h
+++ b/src/Runtime/Source/foundation/Qt3DSAllocator.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSAllocatorCallback.h b/src/Runtime/Source/foundation/Qt3DSAllocatorCallback.h
index ebbf8198..ebbf8198 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSAllocatorCallback.h
+++ b/src/Runtime/Source/foundation/Qt3DSAllocatorCallback.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSAssert.h b/src/Runtime/Source/foundation/Qt3DSAssert.h
index a628159f..a628159f 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSAssert.h
+++ b/src/Runtime/Source/foundation/Qt3DSAssert.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSAtomic.h b/src/Runtime/Source/foundation/Qt3DSAtomic.h
index 69c7d3b4..69c7d3b4 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSAtomic.h
+++ b/src/Runtime/Source/foundation/Qt3DSAtomic.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSBasicTemplates.h b/src/Runtime/Source/foundation/Qt3DSBasicTemplates.h
index f14c7b32..f14c7b32 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSBasicTemplates.h
+++ b/src/Runtime/Source/foundation/Qt3DSBasicTemplates.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSBounds3.h b/src/Runtime/Source/foundation/Qt3DSBounds3.h
index fda4a6d4..fda4a6d4 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSBounds3.h
+++ b/src/Runtime/Source/foundation/Qt3DSBounds3.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSBroadcastingAllocator.h b/src/Runtime/Source/foundation/Qt3DSBroadcastingAllocator.h
index dc6ae7b5..dc6ae7b5 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSBroadcastingAllocator.h
+++ b/src/Runtime/Source/foundation/Qt3DSBroadcastingAllocator.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSContainers.h b/src/Runtime/Source/foundation/Qt3DSContainers.h
index de86d856..de86d856 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSContainers.h
+++ b/src/Runtime/Source/foundation/Qt3DSContainers.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSDataRef.h b/src/Runtime/Source/foundation/Qt3DSDataRef.h
index ad860cef..ad860cef 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSDataRef.h
+++ b/src/Runtime/Source/foundation/Qt3DSDataRef.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSDiscriminatedUnion.h b/src/Runtime/Source/foundation/Qt3DSDiscriminatedUnion.h
index 1957eb23..1957eb23 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSDiscriminatedUnion.h
+++ b/src/Runtime/Source/foundation/Qt3DSDiscriminatedUnion.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSFPU.h b/src/Runtime/Source/foundation/Qt3DSFPU.h
index e4a47f0c..e4a47f0c 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSFPU.h
+++ b/src/Runtime/Source/foundation/Qt3DSFPU.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSFastIPC.h b/src/Runtime/Source/foundation/Qt3DSFastIPC.h
index 800c3dfd..800c3dfd 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSFastIPC.h
+++ b/src/Runtime/Source/foundation/Qt3DSFastIPC.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSFlags.h b/src/Runtime/Source/foundation/Qt3DSFlags.h
index 765f386f..765f386f 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSFlags.h
+++ b/src/Runtime/Source/foundation/Qt3DSFlags.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/Qt3DSFoundation.cpp b/src/Runtime/Source/foundation/Qt3DSFoundation.cpp
index 8687cd69..8687cd69 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/Qt3DSFoundation.cpp
+++ b/src/Runtime/Source/foundation/Qt3DSFoundation.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSFoundation.h b/src/Runtime/Source/foundation/Qt3DSFoundation.h
index 19065d20..19065d20 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSFoundation.h
+++ b/src/Runtime/Source/foundation/Qt3DSFoundation.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSIPC.h b/src/Runtime/Source/foundation/Qt3DSIPC.h
index 9bcea1af..9bcea1af 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSIPC.h
+++ b/src/Runtime/Source/foundation/Qt3DSIPC.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSIndexableLinkedList.h b/src/Runtime/Source/foundation/Qt3DSIndexableLinkedList.h
index ff36b42a..ff36b42a 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSIndexableLinkedList.h
+++ b/src/Runtime/Source/foundation/Qt3DSIndexableLinkedList.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSIntrinsics.h b/src/Runtime/Source/foundation/Qt3DSIntrinsics.h
index 1d6ac7a5..1d6ac7a5 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSIntrinsics.h
+++ b/src/Runtime/Source/foundation/Qt3DSIntrinsics.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSInvasiveLinkedList.h b/src/Runtime/Source/foundation/Qt3DSInvasiveLinkedList.h
index da90e120..da90e120 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSInvasiveLinkedList.h
+++ b/src/Runtime/Source/foundation/Qt3DSInvasiveLinkedList.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSInvasiveSet.h b/src/Runtime/Source/foundation/Qt3DSInvasiveSet.h
index 772a2308..772a2308 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSInvasiveSet.h
+++ b/src/Runtime/Source/foundation/Qt3DSInvasiveSet.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/Qt3DSLogging.cpp b/src/Runtime/Source/foundation/Qt3DSLogging.cpp
index 257b39b2..257b39b2 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/Qt3DSLogging.cpp
+++ b/src/Runtime/Source/foundation/Qt3DSLogging.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSLogging.h b/src/Runtime/Source/foundation/Qt3DSLogging.h
index 4fcb77b5..4fcb77b5 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSLogging.h
+++ b/src/Runtime/Source/foundation/Qt3DSLogging.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSMat33.h b/src/Runtime/Source/foundation/Qt3DSMat33.h
index 6fa69eb5..6fa69eb5 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSMat33.h
+++ b/src/Runtime/Source/foundation/Qt3DSMat33.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSMat44.h b/src/Runtime/Source/foundation/Qt3DSMat44.h
index 53a66e2b..53a66e2b 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSMat44.h
+++ b/src/Runtime/Source/foundation/Qt3DSMat44.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSMath.h b/src/Runtime/Source/foundation/Qt3DSMath.h
index 931852e7..931852e7 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSMath.h
+++ b/src/Runtime/Source/foundation/Qt3DSMath.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/Qt3DSMathUtils.cpp b/src/Runtime/Source/foundation/Qt3DSMathUtils.cpp
index 7eee7405..7eee7405 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/Qt3DSMathUtils.cpp
+++ b/src/Runtime/Source/foundation/Qt3DSMathUtils.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSMathUtils.h b/src/Runtime/Source/foundation/Qt3DSMathUtils.h
index 6d3d0abc..6d3d0abc 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSMathUtils.h
+++ b/src/Runtime/Source/foundation/Qt3DSMathUtils.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSMemoryBuffer.h b/src/Runtime/Source/foundation/Qt3DSMemoryBuffer.h
index bee2f0c2..bee2f0c2 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSMemoryBuffer.h
+++ b/src/Runtime/Source/foundation/Qt3DSMemoryBuffer.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSMutex.h b/src/Runtime/Source/foundation/Qt3DSMutex.h
index 5b717e5c..5b717e5c 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSMutex.h
+++ b/src/Runtime/Source/foundation/Qt3DSMutex.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSNoCopy.h b/src/Runtime/Source/foundation/Qt3DSNoCopy.h
index 817f5e19..817f5e19 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSNoCopy.h
+++ b/src/Runtime/Source/foundation/Qt3DSNoCopy.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSOption.h b/src/Runtime/Source/foundation/Qt3DSOption.h
index 18d6c3b2..18d6c3b2 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSOption.h
+++ b/src/Runtime/Source/foundation/Qt3DSOption.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/Qt3DSPerfTimer.cpp b/src/Runtime/Source/foundation/Qt3DSPerfTimer.cpp
index 06fb5d38..06fb5d38 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/Qt3DSPerfTimer.cpp
+++ b/src/Runtime/Source/foundation/Qt3DSPerfTimer.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSPerfTimer.h b/src/Runtime/Source/foundation/Qt3DSPerfTimer.h
index c63091c0..c63091c0 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSPerfTimer.h
+++ b/src/Runtime/Source/foundation/Qt3DSPerfTimer.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSPlane.h b/src/Runtime/Source/foundation/Qt3DSPlane.h
index 378c3bc9..378c3bc9 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSPlane.h
+++ b/src/Runtime/Source/foundation/Qt3DSPlane.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSPool.h b/src/Runtime/Source/foundation/Qt3DSPool.h
index 5bd07f86..5bd07f86 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSPool.h
+++ b/src/Runtime/Source/foundation/Qt3DSPool.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSPreprocessor.h b/src/Runtime/Source/foundation/Qt3DSPreprocessor.h
index 371d3e67..371d3e67 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSPreprocessor.h
+++ b/src/Runtime/Source/foundation/Qt3DSPreprocessor.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSQuat.h b/src/Runtime/Source/foundation/Qt3DSQuat.h
index 2792f977..2792f977 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSQuat.h
+++ b/src/Runtime/Source/foundation/Qt3DSQuat.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSRefCounted.h b/src/Runtime/Source/foundation/Qt3DSRefCounted.h
index b500b5fc..b500b5fc 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSRefCounted.h
+++ b/src/Runtime/Source/foundation/Qt3DSRefCounted.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSSemaphore.h b/src/Runtime/Source/foundation/Qt3DSSemaphore.h
index f58bb6e0..f58bb6e0 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSSemaphore.h
+++ b/src/Runtime/Source/foundation/Qt3DSSemaphore.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSSimpleTypes.h b/src/Runtime/Source/foundation/Qt3DSSimpleTypes.h
index d73be064..d73be064 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSSimpleTypes.h
+++ b/src/Runtime/Source/foundation/Qt3DSSimpleTypes.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSStringTokenizer.h b/src/Runtime/Source/foundation/Qt3DSStringTokenizer.h
index 5229babd..5229babd 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSStringTokenizer.h
+++ b/src/Runtime/Source/foundation/Qt3DSStringTokenizer.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSSync.h b/src/Runtime/Source/foundation/Qt3DSSync.h
index a36afaeb..a36afaeb 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSSync.h
+++ b/src/Runtime/Source/foundation/Qt3DSSync.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/Qt3DSSystem.cpp b/src/Runtime/Source/foundation/Qt3DSSystem.cpp
index e87a25ea..e87a25ea 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/Qt3DSSystem.cpp
+++ b/src/Runtime/Source/foundation/Qt3DSSystem.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSSystem.h b/src/Runtime/Source/foundation/Qt3DSSystem.h
index 84ca87d1..84ca87d1 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSSystem.h
+++ b/src/Runtime/Source/foundation/Qt3DSSystem.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSThread.h b/src/Runtime/Source/foundation/Qt3DSThread.h
index 84e169d6..84e169d6 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSThread.h
+++ b/src/Runtime/Source/foundation/Qt3DSThread.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSTime.h b/src/Runtime/Source/foundation/Qt3DSTime.h
index 955bd7e0..955bd7e0 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSTime.h
+++ b/src/Runtime/Source/foundation/Qt3DSTime.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSTransform.h b/src/Runtime/Source/foundation/Qt3DSTransform.h
index 0fee0a81..0fee0a81 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSTransform.h
+++ b/src/Runtime/Source/foundation/Qt3DSTransform.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSUnionCast.h b/src/Runtime/Source/foundation/Qt3DSUnionCast.h
index a3d03555..a3d03555 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSUnionCast.h
+++ b/src/Runtime/Source/foundation/Qt3DSUnionCast.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSUtilities.h b/src/Runtime/Source/foundation/Qt3DSUtilities.h
index cb9ae6a2..cb9ae6a2 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSUtilities.h
+++ b/src/Runtime/Source/foundation/Qt3DSUtilities.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSVec2.h b/src/Runtime/Source/foundation/Qt3DSVec2.h
index 0d86c915..0d86c915 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSVec2.h
+++ b/src/Runtime/Source/foundation/Qt3DSVec2.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSVec3.h b/src/Runtime/Source/foundation/Qt3DSVec3.h
index 24ab8231..24ab8231 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSVec3.h
+++ b/src/Runtime/Source/foundation/Qt3DSVec3.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSVec4.h b/src/Runtime/Source/foundation/Qt3DSVec4.h
index acccd48c..acccd48c 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSVec4.h
+++ b/src/Runtime/Source/foundation/Qt3DSVec4.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSVersionNumber.h b/src/Runtime/Source/foundation/Qt3DSVersionNumber.h
index 5942ef72..5942ef72 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Qt3DSVersionNumber.h
+++ b/src/Runtime/Source/foundation/Qt3DSVersionNumber.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/SerializationTypes.h b/src/Runtime/Source/foundation/SerializationTypes.h
index c7fe5ce7..c7fe5ce7 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/SerializationTypes.h
+++ b/src/Runtime/Source/foundation/SerializationTypes.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/Socket.cpp b/src/Runtime/Source/foundation/Socket.cpp
index df00e606..df00e606 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/Socket.cpp
+++ b/src/Runtime/Source/foundation/Socket.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Socket.h b/src/Runtime/Source/foundation/Socket.h
index f561ab83..f561ab83 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Socket.h
+++ b/src/Runtime/Source/foundation/Socket.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/StrConvertUTF.h b/src/Runtime/Source/foundation/StrConvertUTF.h
index 965867c9..965867c9 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/StrConvertUTF.h
+++ b/src/Runtime/Source/foundation/StrConvertUTF.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/StringConversion.h b/src/Runtime/Source/foundation/StringConversion.h
index a55ebb3e..a55ebb3e 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/StringConversion.h
+++ b/src/Runtime/Source/foundation/StringConversion.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/StringConversionImpl.h b/src/Runtime/Source/foundation/StringConversionImpl.h
index c49c14b4..c49c14b4 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/StringConversionImpl.h
+++ b/src/Runtime/Source/foundation/StringConversionImpl.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/StringTable.cpp b/src/Runtime/Source/foundation/StringTable.cpp
index 9e78cfd3..9e78cfd3 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/StringTable.cpp
+++ b/src/Runtime/Source/foundation/StringTable.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/StringTable.h b/src/Runtime/Source/foundation/StringTable.h
index 79529467..79529467 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/StringTable.h
+++ b/src/Runtime/Source/foundation/StringTable.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/TaggedPointer.h b/src/Runtime/Source/foundation/TaggedPointer.h
index aa227250..aa227250 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/TaggedPointer.h
+++ b/src/Runtime/Source/foundation/TaggedPointer.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/ThreadSafeQueue.h b/src/Runtime/Source/foundation/ThreadSafeQueue.h
index 462b6d49..462b6d49 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/ThreadSafeQueue.h
+++ b/src/Runtime/Source/foundation/ThreadSafeQueue.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/TrackingAllocator.cpp b/src/Runtime/Source/foundation/TrackingAllocator.cpp
index 242b0ac0..242b0ac0 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/TrackingAllocator.cpp
+++ b/src/Runtime/Source/foundation/TrackingAllocator.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/TrackingAllocator.h b/src/Runtime/Source/foundation/TrackingAllocator.h
index 4fd58069..4fd58069 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/TrackingAllocator.h
+++ b/src/Runtime/Source/foundation/TrackingAllocator.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Utils.h b/src/Runtime/Source/foundation/Utils.h
index 33c24004..33c24004 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Utils.h
+++ b/src/Runtime/Source/foundation/Utils.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/XML.cpp b/src/Runtime/Source/foundation/XML.cpp
index 34840103..34840103 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/XML.cpp
+++ b/src/Runtime/Source/foundation/XML.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/XML.h b/src/Runtime/Source/foundation/XML.h
index 360bfdd7..360bfdd7 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/XML.h
+++ b/src/Runtime/Source/foundation/XML.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/linux/LICENSE.TXT b/src/Runtime/Source/foundation/linux/LICENSE.TXT
index f40caef8..f40caef8 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/linux/LICENSE.TXT
+++ b/src/Runtime/Source/foundation/linux/LICENSE.TXT
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxAoS.h b/src/Runtime/Source/foundation/linux/Qt3DSLinuxAoS.h
index 6bcb4406..6bcb4406 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxAoS.h
+++ b/src/Runtime/Source/foundation/linux/Qt3DSLinuxAoS.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxAtomic.cpp b/src/Runtime/Source/foundation/linux/Qt3DSLinuxAtomic.cpp
index f0045dd9..f0045dd9 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxAtomic.cpp
+++ b/src/Runtime/Source/foundation/linux/Qt3DSLinuxAtomic.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxFPU.cpp b/src/Runtime/Source/foundation/linux/Qt3DSLinuxFPU.cpp
index c3eae215..c3eae215 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxFPU.cpp
+++ b/src/Runtime/Source/foundation/linux/Qt3DSLinuxFPU.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxFile.h b/src/Runtime/Source/foundation/linux/Qt3DSLinuxFile.h
index 1369735f..1369735f 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxFile.h
+++ b/src/Runtime/Source/foundation/linux/Qt3DSLinuxFile.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxInlineAoS.h b/src/Runtime/Source/foundation/linux/Qt3DSLinuxInlineAoS.h
index 0443ba90..0443ba90 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxInlineAoS.h
+++ b/src/Runtime/Source/foundation/linux/Qt3DSLinuxInlineAoS.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxIntrinsics.h b/src/Runtime/Source/foundation/linux/Qt3DSLinuxIntrinsics.h
index 70974609..70974609 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxIntrinsics.h
+++ b/src/Runtime/Source/foundation/linux/Qt3DSLinuxIntrinsics.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxMutex.cpp b/src/Runtime/Source/foundation/linux/Qt3DSLinuxMutex.cpp
index bbc55829..bbc55829 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxMutex.cpp
+++ b/src/Runtime/Source/foundation/linux/Qt3DSLinuxMutex.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxSemaphore.cpp b/src/Runtime/Source/foundation/linux/Qt3DSLinuxSemaphore.cpp
index 90aab79a..90aab79a 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxSemaphore.cpp
+++ b/src/Runtime/Source/foundation/linux/Qt3DSLinuxSemaphore.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxString.h b/src/Runtime/Source/foundation/linux/Qt3DSLinuxString.h
index a4645f2b..a4645f2b 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxString.h
+++ b/src/Runtime/Source/foundation/linux/Qt3DSLinuxString.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxSync.cpp b/src/Runtime/Source/foundation/linux/Qt3DSLinuxSync.cpp
index 52f9d7ab..52f9d7ab 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxSync.cpp
+++ b/src/Runtime/Source/foundation/linux/Qt3DSLinuxSync.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxThread.cpp b/src/Runtime/Source/foundation/linux/Qt3DSLinuxThread.cpp
index fa6e069e..fa6e069e 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxThread.cpp
+++ b/src/Runtime/Source/foundation/linux/Qt3DSLinuxThread.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxTime.cpp b/src/Runtime/Source/foundation/linux/Qt3DSLinuxTime.cpp
index 6b3e93e4..6b3e93e4 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/linux/Qt3DSLinuxTime.cpp
+++ b/src/Runtime/Source/foundation/linux/Qt3DSLinuxTime.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxTrigConstants.h b/src/Runtime/Source/foundation/linux/Qt3DSLinuxTrigConstants.h
index 120dec78..120dec78 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/linux/Qt3DSLinuxTrigConstants.h
+++ b/src/Runtime/Source/foundation/linux/Qt3DSLinuxTrigConstants.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/linux/SocketImpl.h b/src/Runtime/Source/foundation/linux/SocketImpl.h
index 4c3fcb73..4c3fcb73 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/linux/SocketImpl.h
+++ b/src/Runtime/Source/foundation/linux/SocketImpl.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/linux/qt_attribution.json b/src/Runtime/Source/foundation/linux/qt_attribution.json
index 3c3bed6b..3c3bed6b 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/linux/qt_attribution.json
+++ b/src/Runtime/Source/foundation/linux/qt_attribution.json
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixAtomic.cpp b/src/Runtime/Source/foundation/macos/Qt3DSUnixAtomic.cpp
index c1ac3965..c1ac3965 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixAtomic.cpp
+++ b/src/Runtime/Source/foundation/macos/Qt3DSUnixAtomic.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixFPU.cpp b/src/Runtime/Source/foundation/macos/Qt3DSUnixFPU.cpp
index 59c9850d..59c9850d 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixFPU.cpp
+++ b/src/Runtime/Source/foundation/macos/Qt3DSUnixFPU.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixMutex.cpp b/src/Runtime/Source/foundation/macos/Qt3DSUnixMutex.cpp
index bbc55829..bbc55829 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixMutex.cpp
+++ b/src/Runtime/Source/foundation/macos/Qt3DSUnixMutex.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixSemaphore.cpp b/src/Runtime/Source/foundation/macos/Qt3DSUnixSemaphore.cpp
index 90aab79a..90aab79a 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixSemaphore.cpp
+++ b/src/Runtime/Source/foundation/macos/Qt3DSUnixSemaphore.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixSync.cpp b/src/Runtime/Source/foundation/macos/Qt3DSUnixSync.cpp
index 52f9d7ab..52f9d7ab 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixSync.cpp
+++ b/src/Runtime/Source/foundation/macos/Qt3DSUnixSync.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixTime.cpp b/src/Runtime/Source/foundation/macos/Qt3DSUnixTime.cpp
index 58eadcb6..58eadcb6 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/macosx/Qt3DSUnixTime.cpp
+++ b/src/Runtime/Source/foundation/macos/Qt3DSUnixTime.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/qt_attribution.json b/src/Runtime/Source/foundation/qt_attribution.json
index dd58b0b6..537d8be3 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/qt_attribution.json
+++ b/src/Runtime/Source/foundation/qt_attribution.json
@@ -1,4 +1,15 @@
 {
+    "Id": "convertutf",
+    "Name": "ConvertUTF",
+    "QDocModule": "qt3dstudio",
+    "QtUsage": "Used by Qt3DStudio, Studio and Runtime components.",
+
+    "License": "Other",
+    "LicenseFile": "LICENSE_CONVERTUTF.TXT",
+    "Copyright": "Copyright 2001-2004 Unicode, Inc."
+}
+,
+{
     "Id": "socket",
     "Name": "Socket",
     "QDocModule": "qt3dstudio",
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/LICENSE.TXT b/src/Runtime/Source/foundation/windows/LICENSE.TXT
index f40caef8..f40caef8 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/LICENSE.TXT
+++ b/src/Runtime/Source/foundation/windows/LICENSE.TXT
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsAoS.h b/src/Runtime/Source/foundation/windows/Qt3DSWindowsAoS.h
index c654ec79..c654ec79 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsAoS.h
+++ b/src/Runtime/Source/foundation/windows/Qt3DSWindowsAoS.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsAtomic.cpp b/src/Runtime/Source/foundation/windows/Qt3DSWindowsAtomic.cpp
index 4f95d3dd..4f95d3dd 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsAtomic.cpp
+++ b/src/Runtime/Source/foundation/windows/Qt3DSWindowsAtomic.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsFPU.cpp b/src/Runtime/Source/foundation/windows/Qt3DSWindowsFPU.cpp
index 47242801..47242801 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsFPU.cpp
+++ b/src/Runtime/Source/foundation/windows/Qt3DSWindowsFPU.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsFile.h b/src/Runtime/Source/foundation/windows/Qt3DSWindowsFile.h
index 6c232a54..6c232a54 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsFile.h
+++ b/src/Runtime/Source/foundation/windows/Qt3DSWindowsFile.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsInclude.h b/src/Runtime/Source/foundation/windows/Qt3DSWindowsInclude.h
index f01c9f1a..f01c9f1a 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsInclude.h
+++ b/src/Runtime/Source/foundation/windows/Qt3DSWindowsInclude.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsInlineAoS.h b/src/Runtime/Source/foundation/windows/Qt3DSWindowsInlineAoS.h
index 60c57894..60c57894 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsInlineAoS.h
+++ b/src/Runtime/Source/foundation/windows/Qt3DSWindowsInlineAoS.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsIntrinsics.h b/src/Runtime/Source/foundation/windows/Qt3DSWindowsIntrinsics.h
index 3e0b3e8f..3e0b3e8f 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsIntrinsics.h
+++ b/src/Runtime/Source/foundation/windows/Qt3DSWindowsIntrinsics.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsMutex.cpp b/src/Runtime/Source/foundation/windows/Qt3DSWindowsMutex.cpp
index c5fef09f..c5fef09f 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsMutex.cpp
+++ b/src/Runtime/Source/foundation/windows/Qt3DSWindowsMutex.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsSemaphore.cpp b/src/Runtime/Source/foundation/windows/Qt3DSWindowsSemaphore.cpp
index bb14c104..bb14c104 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsSemaphore.cpp
+++ b/src/Runtime/Source/foundation/windows/Qt3DSWindowsSemaphore.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsString.h b/src/Runtime/Source/foundation/windows/Qt3DSWindowsString.h
index 8d5fcd31..8d5fcd31 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsString.h
+++ b/src/Runtime/Source/foundation/windows/Qt3DSWindowsString.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsSync.cpp b/src/Runtime/Source/foundation/windows/Qt3DSWindowsSync.cpp
index 49667e94..49667e94 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsSync.cpp
+++ b/src/Runtime/Source/foundation/windows/Qt3DSWindowsSync.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsThread.cpp b/src/Runtime/Source/foundation/windows/Qt3DSWindowsThread.cpp
index 3a30de8c..3a30de8c 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsThread.cpp
+++ b/src/Runtime/Source/foundation/windows/Qt3DSWindowsThread.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsTime.cpp b/src/Runtime/Source/foundation/windows/Qt3DSWindowsTime.cpp
index 9215d642..9215d642 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/windows/Qt3DSWindowsTime.cpp
+++ b/src/Runtime/Source/foundation/windows/Qt3DSWindowsTime.cpp
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsTrigConstants.h b/src/Runtime/Source/foundation/windows/Qt3DSWindowsTrigConstants.h
index e3da844c..e3da844c 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/Qt3DSWindowsTrigConstants.h
+++ b/src/Runtime/Source/foundation/windows/Qt3DSWindowsTrigConstants.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/windows/SocketImpl.h b/src/Runtime/Source/foundation/windows/SocketImpl.h
index f72203bd..f72203bd 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/windows/SocketImpl.h
+++ b/src/Runtime/Source/foundation/windows/SocketImpl.h
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/qt_attribution.json b/src/Runtime/Source/foundation/windows/qt_attribution.json
index e0310cfa..e0310cfa 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/windows/qt_attribution.json
+++ b/src/Runtime/Source/foundation/windows/qt_attribution.json
diff --git a/src/Runtime/Source/HDR/Source/CUDABSDFMipmap.cpp b/src/Runtime/Source/hdr/CUDABSDFMipmap.cpp
index 94f6712f..94f6712f 100644
--- a/src/Runtime/Source/HDR/Source/CUDABSDFMipmap.cpp
+++ b/src/Runtime/Source/hdr/CUDABSDFMipmap.cpp
diff --git a/src/Runtime/Source/HDR/Include/CUDABSDFMipmap.h b/src/Runtime/Source/hdr/CUDABSDFMipmap.h
index 33e0b91c..33e0b91c 100644
--- a/src/Runtime/Source/HDR/Include/CUDABSDFMipmap.h
+++ b/src/Runtime/Source/hdr/CUDABSDFMipmap.h
diff --git a/src/Runtime/Source/HDR/Include/GLComputeMipMap.h b/src/Runtime/Source/hdr/GLComputeMipMap.h
index a1a7ce5f..a1a7ce5f 100644
--- a/src/Runtime/Source/HDR/Include/GLComputeMipMap.h
+++ b/src/Runtime/Source/hdr/GLComputeMipMap.h
diff --git a/src/Runtime/Source/HDR/Source/GLComputeMipmap.cpp b/src/Runtime/Source/hdr/GLComputeMipmap.cpp
index 36b550dd..36b550dd 100644
--- a/src/Runtime/Source/HDR/Source/GLComputeMipmap.cpp
+++ b/src/Runtime/Source/hdr/GLComputeMipmap.cpp
diff --git a/src/Runtime/Source/HDR/Source/HDR.cpp b/src/Runtime/Source/hdr/HDR.cpp
index 9abe2b3b..9abe2b3b 100644
--- a/src/Runtime/Source/HDR/Source/HDR.cpp
+++ b/src/Runtime/Source/hdr/HDR.cpp
diff --git a/src/Runtime/Source/HDR/Include/HDR.h b/src/Runtime/Source/hdr/HDR.h
index fbc4ea41..fbc4ea41 100644
--- a/src/Runtime/Source/HDR/Include/HDR.h
+++ b/src/Runtime/Source/hdr/HDR.h
diff --git a/src/Runtime/Source/HDR/Source/MipmapBSDF.cpp b/src/Runtime/Source/hdr/MipmapBSDF.cpp
index fd57015e..fd57015e 100644
--- a/src/Runtime/Source/HDR/Source/MipmapBSDF.cpp
+++ b/src/Runtime/Source/hdr/MipmapBSDF.cpp
diff --git a/src/Runtime/Source/HDR/Source/MipmapBSDF.cu b/src/Runtime/Source/hdr/MipmapBSDF.cu
index 6ddac4be..6ddac4be 100644
--- a/src/Runtime/Source/HDR/Source/MipmapBSDF.cu
+++ b/src/Runtime/Source/hdr/MipmapBSDF.cu
diff --git a/src/Runtime/Source/HDR/Include/MipmapBSDF.h b/src/Runtime/Source/hdr/MipmapBSDF.h
index be8f1366..be8f1366 100644
--- a/src/Runtime/Source/HDR/Include/MipmapBSDF.h
+++ b/src/Runtime/Source/hdr/MipmapBSDF.h
diff --git a/src/Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_math/NvVec.h b/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/NvVec.h
index 4e5b09ce..4e5b09ce 100644
--- a/src/Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_math/NvVec.h
+++ b/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/NvVec.h
diff --git a/src/Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_math/misc.h b/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/misc.h
index 983410f3..983410f3 100644
--- a/src/Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_math/misc.h
+++ b/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/misc.h
diff --git a/src/Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_math/nv_math.cpp b/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_math.cpp
index b83cb39e..b83cb39e 100644
--- a/src/Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_math/nv_math.cpp
+++ b/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_math.cpp
diff --git a/src/Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_math/nv_math.h b/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_math.h
index cf2d8b30..cf2d8b30 100644
--- a/src/Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_math/nv_math.h
+++ b/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_math.h
diff --git a/src/Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_math/nv_matrix.cpp b/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_matrix.cpp
index e208ac31..e208ac31 100644
--- a/src/Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_math/nv_matrix.cpp
+++ b/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_matrix.cpp
diff --git a/src/Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_math/nv_matrix.h b/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_matrix.h
index 2a8e186e..2a8e186e 100644
--- a/src/Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_math/nv_matrix.h
+++ b/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_matrix.h
diff --git a/src/Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_math/nv_quat.cpp b/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_quat.cpp
index 6dc6d1a7..6dc6d1a7 100644
--- a/src/Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_math/nv_quat.cpp
+++ b/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_quat.cpp
diff --git a/src/Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_math/nv_quat.h b/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_quat.h
index 688c30a7..688c30a7 100644
--- a/src/Runtime/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_math/nv_quat.h
+++ b/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_quat.h
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/assets/courier+lucida_256.abc b/src/Runtime/Source/platformspecific/linux/assets/courier+lucida_256.abc
index f7e3c2f6..f7e3c2f6 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/assets/courier+lucida_256.abc
+++ b/src/Runtime/Source/platformspecific/linux/assets/courier+lucida_256.abc
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/assets/courier+lucida_256.dds b/src/Runtime/Source/platformspecific/linux/assets/courier+lucida_256.dds
index 5bde760b..5bde760b 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/assets/courier+lucida_256.dds
+++ b/src/Runtime/Source/platformspecific/linux/assets/courier+lucida_256.dds
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/assets/courier+lucida_512.abc b/src/Runtime/Source/platformspecific/linux/assets/courier+lucida_512.abc
index 2ff78757..2ff78757 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/assets/courier+lucida_512.abc
+++ b/src/Runtime/Source/platformspecific/linux/assets/courier+lucida_512.abc
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/assets/courier+lucida_512.dds b/src/Runtime/Source/platformspecific/linux/assets/courier+lucida_512.dds
index f9e76d94..f9e76d94 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/assets/courier+lucida_512.dds
+++ b/src/Runtime/Source/platformspecific/linux/assets/courier+lucida_512.dds
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/assets/font.frag b/src/Runtime/Source/platformspecific/linux/assets/font.frag
index e4673cf8..e4673cf8 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/assets/font.frag
+++ b/src/Runtime/Source/platformspecific/linux/assets/font.frag
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/assets/font.vert b/src/Runtime/Source/platformspecific/linux/assets/font.vert
index 9f307a2f..9f307a2f 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/assets/font.vert
+++ b/src/Runtime/Source/platformspecific/linux/assets/font.vert
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_color.h b/src/Runtime/Source/platformspecific/linux/libs/nv_color.h
index b9347529..b9347529 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_color.h
+++ b/src/Runtime/Source/platformspecific/linux/libs/nv_color.h
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_debug.h b/src/Runtime/Source/platformspecific/linux/libs/nv_debug.h
index 2559dd6f..2559dd6f 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_debug.h
+++ b/src/Runtime/Source/platformspecific/linux/libs/nv_debug.h
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_global.h b/src/Runtime/Source/platformspecific/linux/libs/nv_global.h
index 9d23d45f..9d23d45f 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_global.h
+++ b/src/Runtime/Source/platformspecific/linux/libs/nv_global.h
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_math/NvVec.h b/src/Runtime/Source/platformspecific/linux/libs/nv_math/NvVec.h
index 4e5b09ce..4e5b09ce 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_math/NvVec.h
+++ b/src/Runtime/Source/platformspecific/linux/libs/nv_math/NvVec.h
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_math/misc.h b/src/Runtime/Source/platformspecific/linux/libs/nv_math/misc.h
index 983410f3..983410f3 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_math/misc.h
+++ b/src/Runtime/Source/platformspecific/linux/libs/nv_math/misc.h
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_math/nv_math.cpp b/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_math.cpp
index b83cb39e..b83cb39e 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_math/nv_math.cpp
+++ b/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_math.cpp
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_math/nv_math.h b/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_math.h
index 2ef7bba0..2ef7bba0 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_math/nv_math.h
+++ b/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_math.h
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_math/nv_matrix.cpp b/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_matrix.cpp
index e208ac31..e208ac31 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_math/nv_matrix.cpp
+++ b/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_matrix.cpp
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_math/nv_matrix.h b/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_matrix.h
index 5f567f06..5f567f06 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_math/nv_matrix.h
+++ b/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_matrix.h
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_math/nv_quat.cpp b/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_quat.cpp
index e66420c6..e66420c6 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_math/nv_quat.cpp
+++ b/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_quat.cpp
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_math/nv_quat.h b/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_quat.h
index 2e97c717..2e97c717 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_math/nv_quat.h
+++ b/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_quat.h
diff --git a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_types.h b/src/Runtime/Source/platformspecific/linux/libs/nv_types.h
index 1d1b0300..1d1b0300 100644
--- a/src/Runtime/Source/PlatformSpecific/Linux/Qt3DSLibs/nv_types.h
+++ b/src/Runtime/Source/platformspecific/linux/libs/nv_types.h
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/assets/courier+lucida_256.abc b/src/Runtime/Source/platformspecific/macos/assets/courier+lucida_256.abc
index f7e3c2f6..f7e3c2f6 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/assets/courier+lucida_256.abc
+++ b/src/Runtime/Source/platformspecific/macos/assets/courier+lucida_256.abc
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/assets/courier+lucida_256.dds b/src/Runtime/Source/platformspecific/macos/assets/courier+lucida_256.dds
index 5bde760b..5bde760b 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/assets/courier+lucida_256.dds
+++ b/src/Runtime/Source/platformspecific/macos/assets/courier+lucida_256.dds
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/assets/courier+lucida_512.abc b/src/Runtime/Source/platformspecific/macos/assets/courier+lucida_512.abc
index 2ff78757..2ff78757 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/assets/courier+lucida_512.abc
+++ b/src/Runtime/Source/platformspecific/macos/assets/courier+lucida_512.abc
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/assets/courier+lucida_512.dds b/src/Runtime/Source/platformspecific/macos/assets/courier+lucida_512.dds
index f9e76d94..f9e76d94 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/assets/courier+lucida_512.dds
+++ b/src/Runtime/Source/platformspecific/macos/assets/courier+lucida_512.dds
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/assets/font.frag b/src/Runtime/Source/platformspecific/macos/assets/font.frag
index e4673cf8..e4673cf8 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/assets/font.frag
+++ b/src/Runtime/Source/platformspecific/macos/assets/font.frag
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/assets/font.vert b/src/Runtime/Source/platformspecific/macos/assets/font.vert
index 9f307a2f..9f307a2f 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/assets/font.vert
+++ b/src/Runtime/Source/platformspecific/macos/assets/font.vert
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_color.h b/src/Runtime/Source/platformspecific/macos/libs/nv_color.h
index b9347529..b9347529 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_color.h
+++ b/src/Runtime/Source/platformspecific/macos/libs/nv_color.h
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_debug.h b/src/Runtime/Source/platformspecific/macos/libs/nv_debug.h
index 2559dd6f..2559dd6f 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_debug.h
+++ b/src/Runtime/Source/platformspecific/macos/libs/nv_debug.h
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_global.h b/src/Runtime/Source/platformspecific/macos/libs/nv_global.h
index 9d23d45f..9d23d45f 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_global.h
+++ b/src/Runtime/Source/platformspecific/macos/libs/nv_global.h
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_math/NvVec.h b/src/Runtime/Source/platformspecific/macos/libs/nv_math/NvVec.h
index 4e5b09ce..4e5b09ce 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_math/NvVec.h
+++ b/src/Runtime/Source/platformspecific/macos/libs/nv_math/NvVec.h
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_math/misc.h b/src/Runtime/Source/platformspecific/macos/libs/nv_math/misc.h
index 983410f3..983410f3 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_math/misc.h
+++ b/src/Runtime/Source/platformspecific/macos/libs/nv_math/misc.h
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_math/nv_math.cpp b/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_math.cpp
index b83cb39e..b83cb39e 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_math/nv_math.cpp
+++ b/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_math.cpp
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_math/nv_math.h b/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_math.h
index e777e409..e777e409 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_math/nv_math.h
+++ b/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_math.h
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_math/nv_matrix.cpp b/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_matrix.cpp
index e208ac31..e208ac31 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_math/nv_matrix.cpp
+++ b/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_matrix.cpp
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_math/nv_matrix.h b/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_matrix.h
index 0709f117..0709f117 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_math/nv_matrix.h
+++ b/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_matrix.h
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_math/nv_quat.cpp b/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_quat.cpp
index ec497941..ec497941 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_math/nv_quat.cpp
+++ b/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_quat.cpp
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_math/nv_quat.h b/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_quat.h
index 2afdcb71..2afdcb71 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_math/nv_quat.h
+++ b/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_quat.h
diff --git a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_types.h b/src/Runtime/Source/platformspecific/macos/libs/nv_types.h
index 1d1b0300..1d1b0300 100644
--- a/src/Runtime/Source/PlatformSpecific/Macos/Qt3DSLibs/nv_types.h
+++ b/src/Runtime/Source/platformspecific/macos/libs/nv_types.h
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/assets/courier+lucida_256.abc b/src/Runtime/Source/platformspecific/windows/assets/courier+lucida_256.abc
index f7e3c2f6..f7e3c2f6 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/assets/courier+lucida_256.abc
+++ b/src/Runtime/Source/platformspecific/windows/assets/courier+lucida_256.abc
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/assets/courier+lucida_256.dds b/src/Runtime/Source/platformspecific/windows/assets/courier+lucida_256.dds
index 5bde760b..5bde760b 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/assets/courier+lucida_256.dds
+++ b/src/Runtime/Source/platformspecific/windows/assets/courier+lucida_256.dds
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/assets/courier+lucida_512.abc b/src/Runtime/Source/platformspecific/windows/assets/courier+lucida_512.abc
index 2ff78757..2ff78757 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/assets/courier+lucida_512.abc
+++ b/src/Runtime/Source/platformspecific/windows/assets/courier+lucida_512.abc
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/assets/courier+lucida_512.dds b/src/Runtime/Source/platformspecific/windows/assets/courier+lucida_512.dds
index f9e76d94..f9e76d94 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/assets/courier+lucida_512.dds
+++ b/src/Runtime/Source/platformspecific/windows/assets/courier+lucida_512.dds
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/assets/font.frag b/src/Runtime/Source/platformspecific/windows/assets/font.frag
index e4673cf8..e4673cf8 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/assets/font.frag
+++ b/src/Runtime/Source/platformspecific/windows/assets/font.frag
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/assets/font.vert b/src/Runtime/Source/platformspecific/windows/assets/font.vert
index 9f307a2f..9f307a2f 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/assets/font.vert
+++ b/src/Runtime/Source/platformspecific/windows/assets/font.vert
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_color.h b/src/Runtime/Source/platformspecific/windows/libs/nv_color.h
index b9347529..b9347529 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_color.h
+++ b/src/Runtime/Source/platformspecific/windows/libs/nv_color.h
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_config/nv_config.h b/src/Runtime/Source/platformspecific/windows/libs/nv_config/nv_config.h
index fb0b88af..fb0b88af 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_config/nv_config.h
+++ b/src/Runtime/Source/platformspecific/windows/libs/nv_config/nv_config.h
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_debug.h b/src/Runtime/Source/platformspecific/windows/libs/nv_debug.h
index 2559dd6f..2559dd6f 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_debug.h
+++ b/src/Runtime/Source/platformspecific/windows/libs/nv_debug.h
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_global.h b/src/Runtime/Source/platformspecific/windows/libs/nv_global.h
index 9d23d45f..9d23d45f 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_global.h
+++ b/src/Runtime/Source/platformspecific/windows/libs/nv_global.h
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_math/NvVec.h b/src/Runtime/Source/platformspecific/windows/libs/nv_math/NvVec.h
index 4e5b09ce..4e5b09ce 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_math/NvVec.h
+++ b/src/Runtime/Source/platformspecific/windows/libs/nv_math/NvVec.h
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_math/misc.h b/src/Runtime/Source/platformspecific/windows/libs/nv_math/misc.h
index 983410f3..983410f3 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_math/misc.h
+++ b/src/Runtime/Source/platformspecific/windows/libs/nv_math/misc.h
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_math/nv_math.cpp b/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_math.cpp
index b83cb39e..b83cb39e 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_math/nv_math.cpp
+++ b/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_math.cpp
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_math/nv_math.h b/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_math.h
index ec729a79..ec729a79 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_math/nv_math.h
+++ b/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_math.h
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_math/nv_matrix.cpp b/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_matrix.cpp
index e208ac31..e208ac31 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_math/nv_matrix.cpp
+++ b/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_matrix.cpp
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_math/nv_matrix.h b/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_matrix.h
index 0e04568e..0e04568e 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_math/nv_matrix.h
+++ b/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_matrix.h
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_math/nv_quat.cpp b/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_quat.cpp
index 9626eb8c..9626eb8c 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_math/nv_quat.cpp
+++ b/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_quat.cpp
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_math/nv_quat.h b/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_quat.h
index 4c65cb9e..4c65cb9e 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_math/nv_quat.h
+++ b/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_quat.h
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_types.h b/src/Runtime/Source/platformspecific/windows/libs/nv_types.h
index 1d1b0300..1d1b0300 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/nv_types.h
+++ b/src/Runtime/Source/platformspecific/windows/libs/nv_types.h
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/qt3ds_launcher_defs.h b/src/Runtime/Source/platformspecific/windows/libs/qt3ds_launcher_defs.h
index 6577fb4a..6577fb4a 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSLibs/qt3ds_launcher_defs.h
+++ b/src/Runtime/Source/platformspecific/windows/libs/qt3ds_launcher_defs.h
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSViewer/Resource.h b/src/Runtime/Source/platformspecific/windows/viewer/Resource.h
index 58c9336e..58c9336e 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSViewer/Resource.h
+++ b/src/Runtime/Source/platformspecific/windows/viewer/Resource.h
diff --git a/src/Runtime/Source/Qt3DSRender/Examples/Qt3DSRenderClearColorExample.cpp b/src/Runtime/Source/render/Examples/Qt3DSRenderClearColorExample.cpp
index f67cf717..f67cf717 100644
--- a/src/Runtime/Source/Qt3DSRender/Examples/Qt3DSRenderClearColorExample.cpp
+++ b/src/Runtime/Source/render/Examples/Qt3DSRenderClearColorExample.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Examples/Qt3DSRenderExample.cpp b/src/Runtime/Source/render/Examples/Qt3DSRenderExample.cpp
index d866cda0..d866cda0 100644
--- a/src/Runtime/Source/Qt3DSRender/Examples/Qt3DSRenderExample.cpp
+++ b/src/Runtime/Source/render/Examples/Qt3DSRenderExample.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Examples/Qt3DSRenderExample.h b/src/Runtime/Source/render/Examples/Qt3DSRenderExample.h
index 79bfd911..79bfd911 100644
--- a/src/Runtime/Source/Qt3DSRender/Examples/Qt3DSRenderExample.h
+++ b/src/Runtime/Source/render/Examples/Qt3DSRenderExample.h
diff --git a/src/Runtime/Source/Qt3DSRender/Examples/Qt3DSRenderExampleTools.cpp b/src/Runtime/Source/render/Examples/Qt3DSRenderExampleTools.cpp
index efae6f5e..efae6f5e 100644
--- a/src/Runtime/Source/Qt3DSRender/Examples/Qt3DSRenderExampleTools.cpp
+++ b/src/Runtime/Source/render/Examples/Qt3DSRenderExampleTools.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Examples/Qt3DSRenderExampleTools.h b/src/Runtime/Source/render/Examples/Qt3DSRenderExampleTools.h
index 5b402868..5b402868 100644
--- a/src/Runtime/Source/Qt3DSRender/Examples/Qt3DSRenderExampleTools.h
+++ b/src/Runtime/Source/render/Examples/Qt3DSRenderExampleTools.h
diff --git a/src/Runtime/Source/Qt3DSRender/Examples/Qt3DSRenderRenderToTextureExample.cpp b/src/Runtime/Source/render/Examples/Qt3DSRenderRenderToTextureExample.cpp
index e2cb4149..e2cb4149 100644
--- a/src/Runtime/Source/Qt3DSRender/Examples/Qt3DSRenderRenderToTextureExample.cpp
+++ b/src/Runtime/Source/render/Examples/Qt3DSRenderRenderToTextureExample.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Examples/Qt3DSRenderSpinningCubeExample.cpp b/src/Runtime/Source/render/Examples/Qt3DSRenderSpinningCubeExample.cpp
index 807f0821..807f0821 100644
--- a/src/Runtime/Source/Qt3DSRender/Examples/Qt3DSRenderSpinningCubeExample.cpp
+++ b/src/Runtime/Source/render/Examples/Qt3DSRenderSpinningCubeExample.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderAtomicCounterBuffer.cpp b/src/Runtime/Source/render/Qt3DSRenderAtomicCounterBuffer.cpp
index 272c3e8c..272c3e8c 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderAtomicCounterBuffer.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderAtomicCounterBuffer.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderAtomicCounterBuffer.h b/src/Runtime/Source/render/Qt3DSRenderAtomicCounterBuffer.h
index 5ff449ea..5ff449ea 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderAtomicCounterBuffer.h
+++ b/src/Runtime/Source/render/Qt3DSRenderAtomicCounterBuffer.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderAttribLayout.cpp b/src/Runtime/Source/render/Qt3DSRenderAttribLayout.cpp
index 42641a04..42641a04 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderAttribLayout.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderAttribLayout.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderAttribLayout.h b/src/Runtime/Source/render/Qt3DSRenderAttribLayout.h
index da801c8e..da801c8e 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderAttribLayout.h
+++ b/src/Runtime/Source/render/Qt3DSRenderAttribLayout.h
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderBaseTypes.h b/src/Runtime/Source/render/Qt3DSRenderBaseTypes.h
index c988b2f1..c988b2f1 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderBaseTypes.h
+++ b/src/Runtime/Source/render/Qt3DSRenderBaseTypes.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderComputeShader.cpp b/src/Runtime/Source/render/Qt3DSRenderComputeShader.cpp
index 01aef473..01aef473 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderComputeShader.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderComputeShader.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderComputeShader.h b/src/Runtime/Source/render/Qt3DSRenderComputeShader.h
index 1ab36bc0..1ab36bc0 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderComputeShader.h
+++ b/src/Runtime/Source/render/Qt3DSRenderComputeShader.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderConstantBuffer.cpp b/src/Runtime/Source/render/Qt3DSRenderConstantBuffer.cpp
index 1b3c43a9..1b3c43a9 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderConstantBuffer.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderConstantBuffer.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderConstantBuffer.h b/src/Runtime/Source/render/Qt3DSRenderConstantBuffer.h
index 5ede23b9..5ede23b9 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderConstantBuffer.h
+++ b/src/Runtime/Source/render/Qt3DSRenderConstantBuffer.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderContext.cpp b/src/Runtime/Source/render/Qt3DSRenderContext.cpp
index aa2cb30f..aa2cb30f 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderContext.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderContext.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderContext.h b/src/Runtime/Source/render/Qt3DSRenderContext.h
index e5b51341..e5b51341 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderContext.h
+++ b/src/Runtime/Source/render/Qt3DSRenderContext.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderDataBuffer.cpp b/src/Runtime/Source/render/Qt3DSRenderDataBuffer.cpp
index b00b0af0..b00b0af0 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderDataBuffer.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderDataBuffer.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderDataBuffer.h b/src/Runtime/Source/render/Qt3DSRenderDataBuffer.h
index 579e2361..579e2361 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderDataBuffer.h
+++ b/src/Runtime/Source/render/Qt3DSRenderDataBuffer.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderDepthStencilState.cpp b/src/Runtime/Source/render/Qt3DSRenderDepthStencilState.cpp
index 3ea47e23..3ea47e23 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderDepthStencilState.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderDepthStencilState.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderDepthStencilState.h b/src/Runtime/Source/render/Qt3DSRenderDepthStencilState.h
index e6b31981..e6b31981 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderDepthStencilState.h
+++ b/src/Runtime/Source/render/Qt3DSRenderDepthStencilState.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderDrawIndirectBuffer.cpp b/src/Runtime/Source/render/Qt3DSRenderDrawIndirectBuffer.cpp
index 9940003f..9940003f 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderDrawIndirectBuffer.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderDrawIndirectBuffer.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderDrawIndirectBuffer.h b/src/Runtime/Source/render/Qt3DSRenderDrawIndirectBuffer.h
index 81cd59d1..81cd59d1 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderDrawIndirectBuffer.h
+++ b/src/Runtime/Source/render/Qt3DSRenderDrawIndirectBuffer.h
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderDrawable.h b/src/Runtime/Source/render/Qt3DSRenderDrawable.h
index 0f78aacc..0f78aacc 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderDrawable.h
+++ b/src/Runtime/Source/render/Qt3DSRenderDrawable.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderFragmentShader.cpp b/src/Runtime/Source/render/Qt3DSRenderFragmentShader.cpp
index e2f31f1b..e2f31f1b 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderFragmentShader.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderFragmentShader.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderFragmentShader.h b/src/Runtime/Source/render/Qt3DSRenderFragmentShader.h
index f661605c..f661605c 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderFragmentShader.h
+++ b/src/Runtime/Source/render/Qt3DSRenderFragmentShader.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderFrameBuffer.cpp b/src/Runtime/Source/render/Qt3DSRenderFrameBuffer.cpp
index 0ab38428..0ab38428 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderFrameBuffer.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderFrameBuffer.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderFrameBuffer.h b/src/Runtime/Source/render/Qt3DSRenderFrameBuffer.h
index 1882a27d..1882a27d 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderFrameBuffer.h
+++ b/src/Runtime/Source/render/Qt3DSRenderFrameBuffer.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderGeometryShader.cpp b/src/Runtime/Source/render/Qt3DSRenderGeometryShader.cpp
index 50567287..50567287 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderGeometryShader.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderGeometryShader.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderGeometryShader.h b/src/Runtime/Source/render/Qt3DSRenderGeometryShader.h
index 2a643cfc..2a643cfc 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderGeometryShader.h
+++ b/src/Runtime/Source/render/Qt3DSRenderGeometryShader.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderImageTexture.cpp b/src/Runtime/Source/render/Qt3DSRenderImageTexture.cpp
index e987cc31..e987cc31 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderImageTexture.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderImageTexture.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderImageTexture.h b/src/Runtime/Source/render/Qt3DSRenderImageTexture.h
index 8b3469b0..8b3469b0 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderImageTexture.h
+++ b/src/Runtime/Source/render/Qt3DSRenderImageTexture.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderIndexBuffer.cpp b/src/Runtime/Source/render/Qt3DSRenderIndexBuffer.cpp
index 37f56bd2..37f56bd2 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderIndexBuffer.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderIndexBuffer.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderIndexBuffer.h b/src/Runtime/Source/render/Qt3DSRenderIndexBuffer.h
index 6b9c4711..6b9c4711 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderIndexBuffer.h
+++ b/src/Runtime/Source/render/Qt3DSRenderIndexBuffer.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderInputAssembler.cpp b/src/Runtime/Source/render/Qt3DSRenderInputAssembler.cpp
index e4d38b9d..e4d38b9d 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderInputAssembler.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderInputAssembler.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderInputAssembler.h b/src/Runtime/Source/render/Qt3DSRenderInputAssembler.h
index adac4c42..adac4c42 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderInputAssembler.h
+++ b/src/Runtime/Source/render/Qt3DSRenderInputAssembler.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderOcclusionQuery.cpp b/src/Runtime/Source/render/Qt3DSRenderOcclusionQuery.cpp
index d1b62d4c..d1b62d4c 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderOcclusionQuery.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderOcclusionQuery.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderOcclusionQuery.h b/src/Runtime/Source/render/Qt3DSRenderOcclusionQuery.h
index 04f64e97..04f64e97 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderOcclusionQuery.h
+++ b/src/Runtime/Source/render/Qt3DSRenderOcclusionQuery.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderPathFontSpecification.cpp b/src/Runtime/Source/render/Qt3DSRenderPathFontSpecification.cpp
index 3e9276aa..3e9276aa 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderPathFontSpecification.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderPathFontSpecification.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderPathFontSpecification.h b/src/Runtime/Source/render/Qt3DSRenderPathFontSpecification.h
index dad3f6bb..dad3f6bb 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderPathFontSpecification.h
+++ b/src/Runtime/Source/render/Qt3DSRenderPathFontSpecification.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderPathFontText.cpp b/src/Runtime/Source/render/Qt3DSRenderPathFontText.cpp
index aeaad13c..aeaad13c 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderPathFontText.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderPathFontText.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderPathFontText.h b/src/Runtime/Source/render/Qt3DSRenderPathFontText.h
index a1d103ac..a1d103ac 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderPathFontText.h
+++ b/src/Runtime/Source/render/Qt3DSRenderPathFontText.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderPathRender.cpp b/src/Runtime/Source/render/Qt3DSRenderPathRender.cpp
index 42982498..42982498 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderPathRender.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderPathRender.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderPathRender.h b/src/Runtime/Source/render/Qt3DSRenderPathRender.h
index c261ca31..c261ca31 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderPathRender.h
+++ b/src/Runtime/Source/render/Qt3DSRenderPathRender.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderPathSpecification.cpp b/src/Runtime/Source/render/Qt3DSRenderPathSpecification.cpp
index f4b26f11..f4b26f11 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderPathSpecification.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderPathSpecification.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderPathSpecification.h b/src/Runtime/Source/render/Qt3DSRenderPathSpecification.h
index 7c6faeda..7c6faeda 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderPathSpecification.h
+++ b/src/Runtime/Source/render/Qt3DSRenderPathSpecification.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderProgramPipeline.cpp b/src/Runtime/Source/render/Qt3DSRenderProgramPipeline.cpp
index b0a9f271..b0a9f271 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderProgramPipeline.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderProgramPipeline.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderProgramPipeline.h b/src/Runtime/Source/render/Qt3DSRenderProgramPipeline.h
index ce47146a..ce47146a 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderProgramPipeline.h
+++ b/src/Runtime/Source/render/Qt3DSRenderProgramPipeline.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderQueryBase.cpp b/src/Runtime/Source/render/Qt3DSRenderQueryBase.cpp
index f13bc499..f13bc499 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderQueryBase.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderQueryBase.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderQueryBase.h b/src/Runtime/Source/render/Qt3DSRenderQueryBase.h
index 7a7ead87..7a7ead87 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderQueryBase.h
+++ b/src/Runtime/Source/render/Qt3DSRenderQueryBase.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderRasterizerState.cpp b/src/Runtime/Source/render/Qt3DSRenderRasterizerState.cpp
index e7daf7f4..e7daf7f4 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderRasterizerState.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderRasterizerState.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderRasterizerState.h b/src/Runtime/Source/render/Qt3DSRenderRasterizerState.h
index 9b71ae42..9b71ae42 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderRasterizerState.h
+++ b/src/Runtime/Source/render/Qt3DSRenderRasterizerState.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderRenderBuffer.cpp b/src/Runtime/Source/render/Qt3DSRenderRenderBuffer.cpp
index b682bc1b..b682bc1b 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderRenderBuffer.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderRenderBuffer.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderRenderBuffer.h b/src/Runtime/Source/render/Qt3DSRenderRenderBuffer.h
index 41f4068a..41f4068a 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderRenderBuffer.h
+++ b/src/Runtime/Source/render/Qt3DSRenderRenderBuffer.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderSampler.cpp b/src/Runtime/Source/render/Qt3DSRenderSampler.cpp
index b02fc615..b02fc615 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderSampler.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderSampler.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderSampler.h b/src/Runtime/Source/render/Qt3DSRenderSampler.h
index 77d3f008..77d3f008 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderSampler.h
+++ b/src/Runtime/Source/render/Qt3DSRenderSampler.h
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderShader.h b/src/Runtime/Source/render/Qt3DSRenderShader.h
index 8d0a62c4..8d0a62c4 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderShader.h
+++ b/src/Runtime/Source/render/Qt3DSRenderShader.h
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderShaderConstant.h b/src/Runtime/Source/render/Qt3DSRenderShaderConstant.h
index 7fb57ffe..7fb57ffe 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderShaderConstant.h
+++ b/src/Runtime/Source/render/Qt3DSRenderShaderConstant.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderShaderProgram.cpp b/src/Runtime/Source/render/Qt3DSRenderShaderProgram.cpp
index 09f1094b..09f1094b 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderShaderProgram.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderShaderProgram.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderShaderProgram.h b/src/Runtime/Source/render/Qt3DSRenderShaderProgram.h
index 054db64b..054db64b 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderShaderProgram.h
+++ b/src/Runtime/Source/render/Qt3DSRenderShaderProgram.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderStorageBuffer.cpp b/src/Runtime/Source/render/Qt3DSRenderStorageBuffer.cpp
index ab632189..ab632189 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderStorageBuffer.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderStorageBuffer.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderStorageBuffer.h b/src/Runtime/Source/render/Qt3DSRenderStorageBuffer.h
index fefe6b08..fefe6b08 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderStorageBuffer.h
+++ b/src/Runtime/Source/render/Qt3DSRenderStorageBuffer.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderSync.cpp b/src/Runtime/Source/render/Qt3DSRenderSync.cpp
index 02d153a6..02d153a6 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderSync.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderSync.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderSync.h b/src/Runtime/Source/render/Qt3DSRenderSync.h
index 9dfeb28a..9dfeb28a 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderSync.h
+++ b/src/Runtime/Source/render/Qt3DSRenderSync.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderTessellationShader.cpp b/src/Runtime/Source/render/Qt3DSRenderTessellationShader.cpp
index 7a0fd897..7a0fd897 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderTessellationShader.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderTessellationShader.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderTessellationShader.h b/src/Runtime/Source/render/Qt3DSRenderTessellationShader.h
index b69e56b1..b69e56b1 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderTessellationShader.h
+++ b/src/Runtime/Source/render/Qt3DSRenderTessellationShader.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderTexture2D.cpp b/src/Runtime/Source/render/Qt3DSRenderTexture2D.cpp
index c5ea4750..c5ea4750 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderTexture2D.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderTexture2D.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderTexture2D.h b/src/Runtime/Source/render/Qt3DSRenderTexture2D.h
index 29c7c1b4..29c7c1b4 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderTexture2D.h
+++ b/src/Runtime/Source/render/Qt3DSRenderTexture2D.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderTexture2DArray.cpp b/src/Runtime/Source/render/Qt3DSRenderTexture2DArray.cpp
index fc0dfa45..fc0dfa45 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderTexture2DArray.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderTexture2DArray.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderTexture2DArray.h b/src/Runtime/Source/render/Qt3DSRenderTexture2DArray.h
index 30ed6dbb..30ed6dbb 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderTexture2DArray.h
+++ b/src/Runtime/Source/render/Qt3DSRenderTexture2DArray.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderTextureBase.cpp b/src/Runtime/Source/render/Qt3DSRenderTextureBase.cpp
index d055d72c..d055d72c 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderTextureBase.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderTextureBase.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderTextureBase.h b/src/Runtime/Source/render/Qt3DSRenderTextureBase.h
index 872a634e..872a634e 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderTextureBase.h
+++ b/src/Runtime/Source/render/Qt3DSRenderTextureBase.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderTextureCube.cpp b/src/Runtime/Source/render/Qt3DSRenderTextureCube.cpp
index 0919daf3..0919daf3 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderTextureCube.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderTextureCube.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderTextureCube.h b/src/Runtime/Source/render/Qt3DSRenderTextureCube.h
index 7310d44d..7310d44d 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderTextureCube.h
+++ b/src/Runtime/Source/render/Qt3DSRenderTextureCube.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderTimerQuery.cpp b/src/Runtime/Source/render/Qt3DSRenderTimerQuery.cpp
index 4184436a..4184436a 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderTimerQuery.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderTimerQuery.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderTimerQuery.h b/src/Runtime/Source/render/Qt3DSRenderTimerQuery.h
index f909f374..f909f374 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderTimerQuery.h
+++ b/src/Runtime/Source/render/Qt3DSRenderTimerQuery.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderVertexBuffer.cpp b/src/Runtime/Source/render/Qt3DSRenderVertexBuffer.cpp
index 89d6204e..89d6204e 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderVertexBuffer.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderVertexBuffer.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderVertexBuffer.h b/src/Runtime/Source/render/Qt3DSRenderVertexBuffer.h
index 914afe27..914afe27 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderVertexBuffer.h
+++ b/src/Runtime/Source/render/Qt3DSRenderVertexBuffer.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderVertexShader.cpp b/src/Runtime/Source/render/Qt3DSRenderVertexShader.cpp
index 3a53ad50..3a53ad50 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderVertexShader.cpp
+++ b/src/Runtime/Source/render/Qt3DSRenderVertexShader.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderVertexShader.h b/src/Runtime/Source/render/Qt3DSRenderVertexShader.h
index 0a96045b..0a96045b 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/Qt3DSRenderVertexShader.h
+++ b/src/Runtime/Source/render/Qt3DSRenderVertexShader.h
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/backends/Qt3DSRenderBackend.h b/src/Runtime/Source/render/backends/Qt3DSRenderBackend.h
index 12de5d88..12de5d88 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/backends/Qt3DSRenderBackend.h
+++ b/src/Runtime/Source/render/backends/Qt3DSRenderBackend.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Q3DSRenderBackendGLES2.cpp b/src/Runtime/Source/render/backends/gl/Q3DSRenderBackendGLES2.cpp
index d38c330c..d38c330c 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Q3DSRenderBackendGLES2.cpp
+++ b/src/Runtime/Source/render/backends/gl/Q3DSRenderBackendGLES2.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Q3DSRenderBackendGLES2.h b/src/Runtime/Source/render/backends/gl/Q3DSRenderBackendGLES2.h
index 4890de0e..4890de0e 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Q3DSRenderBackendGLES2.h
+++ b/src/Runtime/Source/render/backends/gl/Q3DSRenderBackendGLES2.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSOpenGLExtensions.cpp b/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLExtensions.cpp
index 564ecd5a..564ecd5a 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSOpenGLExtensions.cpp
+++ b/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLExtensions.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSOpenGLExtensions.h b/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLExtensions.h
index c9ba76a6..c9ba76a6 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSOpenGLExtensions.h
+++ b/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLExtensions.h
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSOpenGLPrefix.h b/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLPrefix.h
index 0e6dc6d4..0e6dc6d4 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSOpenGLPrefix.h
+++ b/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLPrefix.h
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSOpenGLTokens.h b/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLTokens.h
index 882e2761..882e2761 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSOpenGLTokens.h
+++ b/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLTokens.h
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSOpenGLUtil.h b/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLUtil.h
index 32f7dad7..32f7dad7 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSOpenGLUtil.h
+++ b/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLUtil.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGL3.cpp b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGL3.cpp
index d78c51d9..d78c51d9 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGL3.cpp
+++ b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGL3.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendGL3.h b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGL3.h
index 7147b341..7147b341 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendGL3.h
+++ b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGL3.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGL4.cpp b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGL4.cpp
index 083fc35e..083fc35e 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGL4.cpp
+++ b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGL4.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendGL4.h b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGL4.h
index bfdc03b7..bfdc03b7 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendGL4.h
+++ b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGL4.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGLBase.cpp b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGLBase.cpp
index 940ab094..940ab094 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGLBase.cpp
+++ b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGLBase.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendGLBase.h b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGLBase.h
index 9048a9c4..9048a9c4 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendGLBase.h
+++ b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGLBase.h
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendInputAssemblerGL.h b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendInputAssemblerGL.h
index e14111af..e14111af 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendInputAssemblerGL.h
+++ b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendInputAssemblerGL.h
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendRenderStatesGL.h b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendRenderStatesGL.h
index 3a74a8e3..3a74a8e3 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendRenderStatesGL.h
+++ b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendRenderStatesGL.h
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendShaderProgramGL.h b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendShaderProgramGL.h
index f7caffd8..f7caffd8 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendShaderProgramGL.h
+++ b/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendShaderProgramGL.h
diff --git a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderContextGL.cpp b/src/Runtime/Source/render/backends/gl/Qt3DSRenderContextGL.cpp
index 88670ef7..88670ef7 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderContextGL.cpp
+++ b/src/Runtime/Source/render/backends/gl/Qt3DSRenderContextGL.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Source/backends/software/Qt3DSRenderBackendNULL.cpp b/src/Runtime/Source/render/backends/software/Qt3DSRenderBackendNULL.cpp
index af93e928..af93e928 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/backends/software/Qt3DSRenderBackendNULL.cpp
+++ b/src/Runtime/Source/render/backends/software/Qt3DSRenderBackendNULL.cpp
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/backends/software/Qt3DSRenderBackendNULL.h b/src/Runtime/Source/render/backends/software/Qt3DSRenderBackendNULL.h
index 397ecfb1..397ecfb1 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/backends/software/Qt3DSRenderBackendNULL.h
+++ b/src/Runtime/Source/render/backends/software/Qt3DSRenderBackendNULL.h
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/glg/Qt3DSGLImplObjects.h b/src/Runtime/Source/render/glg/Qt3DSGLImplObjects.h
index 28f246fd..28f246fd 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/glg/Qt3DSGLImplObjects.h
+++ b/src/Runtime/Source/render/glg/Qt3DSGLImplObjects.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSActivationManager.cpp b/src/Runtime/Source/runtime/Qt3DSActivationManager.cpp
index 3d052742..3d052742 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSActivationManager.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSActivationManager.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSActivationManager.h b/src/Runtime/Source/runtime/Qt3DSActivationManager.h
index f343ac9b..f343ac9b 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSActivationManager.h
+++ b/src/Runtime/Source/runtime/Qt3DSActivationManager.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSAnimationSystem.cpp b/src/Runtime/Source/runtime/Qt3DSAnimationSystem.cpp
index 84d1c6db..84d1c6db 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSAnimationSystem.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSAnimationSystem.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSAnimationSystem.h b/src/Runtime/Source/runtime/Qt3DSAnimationSystem.h
index 24542ad9..24542ad9 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSAnimationSystem.h
+++ b/src/Runtime/Source/runtime/Qt3DSAnimationSystem.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSApplication.cpp b/src/Runtime/Source/runtime/Qt3DSApplication.cpp
index 249070c2..249070c2 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSApplication.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSApplication.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSApplication.h b/src/Runtime/Source/runtime/Qt3DSApplication.h
index d825fe0f..d825fe0f 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSApplication.h
+++ b/src/Runtime/Source/runtime/Qt3DSApplication.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSApplicationValues.h b/src/Runtime/Source/runtime/Qt3DSApplicationValues.h
index 80e8f73f..80e8f73f 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSApplicationValues.h
+++ b/src/Runtime/Source/runtime/Qt3DSApplicationValues.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSAttributeHashes.cpp b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.cpp
index 1409901f..1409901f 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSAttributeHashes.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSAttributeHashes.h b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.h
index 02dda069..02dda069 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSAttributeHashes.h
+++ b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSAttributeHashes.txt b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.txt
index 7c38c875..7c38c875 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSAttributeHashes.txt
+++ b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.txt
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSCommandEventTypes.h b/src/Runtime/Source/runtime/Qt3DSCommandEventTypes.h
index 01a12b44..01a12b44 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSCommandEventTypes.h
+++ b/src/Runtime/Source/runtime/Qt3DSCommandEventTypes.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSCommandHelper.cpp b/src/Runtime/Source/runtime/Qt3DSCommandHelper.cpp
index 53c7648a..53c7648a 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSCommandHelper.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSCommandHelper.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSCommandHelper.h b/src/Runtime/Source/runtime/Qt3DSCommandHelper.h
index 412a51a1..412a51a1 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSCommandHelper.h
+++ b/src/Runtime/Source/runtime/Qt3DSCommandHelper.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSComponentManager.cpp b/src/Runtime/Source/runtime/Qt3DSComponentManager.cpp
index 2cfb2311..2cfb2311 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSComponentManager.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSComponentManager.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSComponentManager.h b/src/Runtime/Source/runtime/Qt3DSComponentManager.h
index 865b8aa9..865b8aa9 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSComponentManager.h
+++ b/src/Runtime/Source/runtime/Qt3DSComponentManager.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSElementHelper.cpp b/src/Runtime/Source/runtime/Qt3DSElementHelper.cpp
index acf8849e..acf8849e 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSElementHelper.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSElementHelper.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSElementHelper.h b/src/Runtime/Source/runtime/Qt3DSElementHelper.h
index df2afddb..df2afddb 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSElementHelper.h
+++ b/src/Runtime/Source/runtime/Qt3DSElementHelper.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSElementSystem.cpp b/src/Runtime/Source/runtime/Qt3DSElementSystem.cpp
index 44850859..44850859 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSElementSystem.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSElementSystem.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSElementSystem.h b/src/Runtime/Source/runtime/Qt3DSElementSystem.h
index b9355c55..b9355c55 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSElementSystem.h
+++ b/src/Runtime/Source/runtime/Qt3DSElementSystem.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSEvent.h b/src/Runtime/Source/runtime/Qt3DSEvent.h
index aef317a5..aef317a5 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSEvent.h
+++ b/src/Runtime/Source/runtime/Qt3DSEvent.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSEventCallbacks.cpp b/src/Runtime/Source/runtime/Qt3DSEventCallbacks.cpp
index 25d720ea..25d720ea 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSEventCallbacks.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSEventCallbacks.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSEventCallbacks.h b/src/Runtime/Source/runtime/Qt3DSEventCallbacks.h
index 5c17477d..5c17477d 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSEventCallbacks.h
+++ b/src/Runtime/Source/runtime/Qt3DSEventCallbacks.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSFrameworkTypes.h b/src/Runtime/Source/runtime/Qt3DSFrameworkTypes.h
index 8cb5c3b8..8cb5c3b8 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSFrameworkTypes.h
+++ b/src/Runtime/Source/runtime/Qt3DSFrameworkTypes.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSIComponentManager.h b/src/Runtime/Source/runtime/Qt3DSIComponentManager.h
index 8185da2d..8185da2d 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSIComponentManager.h
+++ b/src/Runtime/Source/runtime/Qt3DSIComponentManager.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSIInputSystem.h b/src/Runtime/Source/runtime/Qt3DSIInputSystem.h
index 6cd201fb..6cd201fb 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSIInputSystem.h
+++ b/src/Runtime/Source/runtime/Qt3DSIInputSystem.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSIScene.h b/src/Runtime/Source/runtime/Qt3DSIScene.h
index 8872b93f..8872b93f 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSIScene.h
+++ b/src/Runtime/Source/runtime/Qt3DSIScene.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSIScriptBridge.h b/src/Runtime/Source/runtime/Qt3DSIScriptBridge.h
index 6dd04074..6dd04074 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSIScriptBridge.h
+++ b/src/Runtime/Source/runtime/Qt3DSIScriptBridge.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSIStateful.h b/src/Runtime/Source/runtime/Qt3DSIStateful.h
index 0eca293e..0eca293e 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSIStateful.h
+++ b/src/Runtime/Source/runtime/Qt3DSIStateful.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSIText.h b/src/Runtime/Source/runtime/Qt3DSIText.h
index c4694fe2..c4694fe2 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSIText.h
+++ b/src/Runtime/Source/runtime/Qt3DSIText.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSInputDefs.h b/src/Runtime/Source/runtime/Qt3DSInputDefs.h
index 447e424b..447e424b 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSInputDefs.h
+++ b/src/Runtime/Source/runtime/Qt3DSInputDefs.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSInputEngine.cpp b/src/Runtime/Source/runtime/Qt3DSInputEngine.cpp
index d3cbe423..d3cbe423 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSInputEngine.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSInputEngine.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSInputEngine.h b/src/Runtime/Source/runtime/Qt3DSInputEngine.h
index bf75e5a1..bf75e5a1 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSInputEngine.h
+++ b/src/Runtime/Source/runtime/Qt3DSInputEngine.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSInputEventTypes.h b/src/Runtime/Source/runtime/Qt3DSInputEventTypes.h
index 0b3c3981..0b3c3981 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSInputEventTypes.h
+++ b/src/Runtime/Source/runtime/Qt3DSInputEventTypes.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSInputFrame.h b/src/Runtime/Source/runtime/Qt3DSInputFrame.h
index f80f3ebc..f80f3ebc 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSInputFrame.h
+++ b/src/Runtime/Source/runtime/Qt3DSInputFrame.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSKernelTypes.h b/src/Runtime/Source/runtime/Qt3DSKernelTypes.h
index db290996..db290996 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSKernelTypes.h
+++ b/src/Runtime/Source/runtime/Qt3DSKernelTypes.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSLogicSystem.cpp b/src/Runtime/Source/runtime/Qt3DSLogicSystem.cpp
index 1aec08f1..1aec08f1 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSLogicSystem.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSLogicSystem.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSLogicSystem.h b/src/Runtime/Source/runtime/Qt3DSLogicSystem.h
index af13c91f..af13c91f 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSLogicSystem.h
+++ b/src/Runtime/Source/runtime/Qt3DSLogicSystem.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSOutputMemoryStream.cpp b/src/Runtime/Source/runtime/Qt3DSOutputMemoryStream.cpp
index 06d0eee6..06d0eee6 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSOutputMemoryStream.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSOutputMemoryStream.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSOutputMemoryStream.h b/src/Runtime/Source/runtime/Qt3DSOutputMemoryStream.h
index da28245f..da28245f 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSOutputMemoryStream.h
+++ b/src/Runtime/Source/runtime/Qt3DSOutputMemoryStream.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSParametersSystem.cpp b/src/Runtime/Source/runtime/Qt3DSParametersSystem.cpp
index 84b642cd..84b642cd 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSParametersSystem.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSParametersSystem.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSParametersSystem.h b/src/Runtime/Source/runtime/Qt3DSParametersSystem.h
index 50a4652d..50a4652d 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSParametersSystem.h
+++ b/src/Runtime/Source/runtime/Qt3DSParametersSystem.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSPickFrame.h b/src/Runtime/Source/runtime/Qt3DSPickFrame.h
index 15da72c9..15da72c9 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSPickFrame.h
+++ b/src/Runtime/Source/runtime/Qt3DSPickFrame.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSPresentation.cpp b/src/Runtime/Source/runtime/Qt3DSPresentation.cpp
index 358b3abb..358b3abb 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSPresentation.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSPresentation.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSPresentation.h b/src/Runtime/Source/runtime/Qt3DSPresentation.h
index 0f0b1b0f..0f0b1b0f 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSPresentation.h
+++ b/src/Runtime/Source/runtime/Qt3DSPresentation.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSPresentationFrameData.cpp b/src/Runtime/Source/runtime/Qt3DSPresentationFrameData.cpp
index 649462aa..649462aa 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSPresentationFrameData.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSPresentationFrameData.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSPresentationFrameData.h b/src/Runtime/Source/runtime/Qt3DSPresentationFrameData.h
index 332cc84a..332cc84a 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSPresentationFrameData.h
+++ b/src/Runtime/Source/runtime/Qt3DSPresentationFrameData.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSQmlElementHelper.cpp b/src/Runtime/Source/runtime/Qt3DSQmlElementHelper.cpp
index f5f42396..f5f42396 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSQmlElementHelper.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSQmlElementHelper.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSQmlElementHelper.h b/src/Runtime/Source/runtime/Qt3DSQmlElementHelper.h
index ec36c8ed..ec36c8ed 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSQmlElementHelper.h
+++ b/src/Runtime/Source/runtime/Qt3DSQmlElementHelper.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSQmlEngine.cpp b/src/Runtime/Source/runtime/Qt3DSQmlEngine.cpp
index 1ba1a5a6..1ba1a5a6 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSQmlEngine.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSQmlEngine.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSQmlEngine.h b/src/Runtime/Source/runtime/Qt3DSQmlEngine.h
index 71ef1b3f..71ef1b3f 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSQmlEngine.h
+++ b/src/Runtime/Source/runtime/Qt3DSQmlEngine.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSRuntimeFactory.h b/src/Runtime/Source/runtime/Qt3DSRuntimeFactory.h
index 1df732a6..1df732a6 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSRuntimeFactory.h
+++ b/src/Runtime/Source/runtime/Qt3DSRuntimeFactory.h
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSSceneManager.h b/src/Runtime/Source/runtime/Qt3DSSceneManager.h
index 7b8a4aab..7b8a4aab 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSSceneManager.h
+++ b/src/Runtime/Source/runtime/Qt3DSSceneManager.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSSlideSystem.cpp b/src/Runtime/Source/runtime/Qt3DSSlideSystem.cpp
index e7cc0983..e7cc0983 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSSlideSystem.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSSlideSystem.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSSlideSystem.h b/src/Runtime/Source/runtime/Qt3DSSlideSystem.h
index de2ddbbc..de2ddbbc 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSSlideSystem.h
+++ b/src/Runtime/Source/runtime/Qt3DSSlideSystem.h
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSTimePolicy.cpp b/src/Runtime/Source/runtime/Qt3DSTimePolicy.cpp
index e1efb8e0..e1efb8e0 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSTimePolicy.cpp
+++ b/src/Runtime/Source/runtime/Qt3DSTimePolicy.cpp
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSTimePolicy.h b/src/Runtime/Source/runtime/Qt3DSTimePolicy.h
index 6a137196..6a137196 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSTimePolicy.h
+++ b/src/Runtime/Source/runtime/Qt3DSTimePolicy.h
diff --git a/src/Runtime/Source/Runtime/Include/RuntimePrefix.h b/src/Runtime/Source/runtime/RuntimePrefix.h
index bf729ebf..bf729ebf 100644
--- a/src/Runtime/Source/Runtime/Include/RuntimePrefix.h
+++ b/src/Runtime/Source/runtime/RuntimePrefix.h
diff --git a/src/Runtime/Source/Runtime/Source/q3dsqmlbehavior.cpp b/src/Runtime/Source/runtime/q3dsqmlbehavior.cpp
index 83b706eb..83b706eb 100644
--- a/src/Runtime/Source/Runtime/Source/q3dsqmlbehavior.cpp
+++ b/src/Runtime/Source/runtime/q3dsqmlbehavior.cpp
diff --git a/src/Runtime/Source/Runtime/Include/q3dsqmlbehavior.h b/src/Runtime/Source/runtime/q3dsqmlbehavior.h
index 76f4a4a0..76f4a4a0 100644
--- a/src/Runtime/Source/Runtime/Include/q3dsqmlbehavior.h
+++ b/src/Runtime/Source/runtime/q3dsqmlbehavior.h
diff --git a/src/Runtime/Source/Runtime/Source/q3dsqmlscript.cpp b/src/Runtime/Source/runtime/q3dsqmlscript.cpp
index 09f18148..09f18148 100644
--- a/src/Runtime/Source/Runtime/Source/q3dsqmlscript.cpp
+++ b/src/Runtime/Source/runtime/q3dsqmlscript.cpp
diff --git a/src/Runtime/Source/Runtime/Include/q3dsqmlscript.h b/src/Runtime/Source/runtime/q3dsqmlscript.h
index 1049bd86..1049bd86 100644
--- a/src/Runtime/Source/Runtime/Include/q3dsqmlscript.h
+++ b/src/Runtime/Source/runtime/q3dsqmlscript.h
diff --git a/src/Runtime/Source/Runtime/Source/q3dsvariantconfig.cpp b/src/Runtime/Source/runtime/q3dsvariantconfig.cpp
index e1fa04c6..e1fa04c6 100644
--- a/src/Runtime/Source/Runtime/Source/q3dsvariantconfig.cpp
+++ b/src/Runtime/Source/runtime/q3dsvariantconfig.cpp
diff --git a/src/Runtime/Source/Runtime/Include/q3dsvariantconfig_p.h b/src/Runtime/Source/runtime/q3dsvariantconfig_p.h
index 1905f44a..1905f44a 100644
--- a/src/Runtime/Source/Runtime/Include/q3dsvariantconfig_p.h
+++ b/src/Runtime/Source/runtime/q3dsvariantconfig_p.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderKey.h b/src/Runtime/Source/runtimerender/Qt3DSOffscreenRenderKey.h
index 555c2689..555c2689 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderKey.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSOffscreenRenderKey.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOffscreenRenderManager.cpp b/src/Runtime/Source/runtimerender/Qt3DSOffscreenRenderManager.cpp
index 7d66c7a3..7d66c7a3 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOffscreenRenderManager.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSOffscreenRenderManager.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderManager.h b/src/Runtime/Source/runtimerender/Qt3DSOffscreenRenderManager.h
index 57dcf430..57dcf430 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderManager.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSOffscreenRenderManager.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOldNBustedRenderPlugin.cpp b/src/Runtime/Source/runtimerender/Qt3DSOldNBustedRenderPlugin.cpp
index 4028373b..4028373b 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOldNBustedRenderPlugin.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSOldNBustedRenderPlugin.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOldNBustedRenderPlugin.h b/src/Runtime/Source/runtimerender/Qt3DSOldNBustedRenderPlugin.h
index 86f20a78..86f20a78 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOldNBustedRenderPlugin.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSOldNBustedRenderPlugin.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOnscreenTextRenderer.cpp b/src/Runtime/Source/runtimerender/Qt3DSOnscreenTextRenderer.cpp
index 4b74c511..4b74c511 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOnscreenTextRenderer.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSOnscreenTextRenderer.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSQtTextRenderer.cpp b/src/Runtime/Source/runtimerender/Qt3DSQtTextRenderer.cpp
index 17539e4a..17539e4a 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSQtTextRenderer.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSQtTextRenderer.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRender.h b/src/Runtime/Source/runtimerender/Qt3DSRender.h
index 44729682..44729682 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRender.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRender.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderClippingFrustum.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderClippingFrustum.cpp
index 86375566..86375566 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderClippingFrustum.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderClippingFrustum.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderClippingFrustum.h b/src/Runtime/Source/runtimerender/Qt3DSRenderClippingFrustum.h
index b788ad24..b788ad24 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderClippingFrustum.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderClippingFrustum.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderContextCore.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderContextCore.cpp
index e0eedfd3..e0eedfd3 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderContextCore.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderContextCore.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderContextCore.h b/src/Runtime/Source/runtimerender/Qt3DSRenderContextCore.h
index be1498b8..be1498b8 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderContextCore.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderContextCore.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialRenderContext.h b/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialRenderContext.h
index 5283660c..5283660c 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialRenderContext.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialRenderContext.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialShaderGenerator.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialShaderGenerator.cpp
index fe6a6dc3..fe6a6dc3 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialShaderGenerator.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialShaderGenerator.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialShaderGenerator.h b/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialShaderGenerator.h
index 44e2c064..44e2c064 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialShaderGenerator.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialShaderGenerator.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialSystem.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialSystem.cpp
index 1ae32bf4..3841dd07 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialSystem.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialSystem.cpp
@@ -49,8 +49,8 @@
 #include "foundation/Qt3DSTime.h"
 #include "Qt3DSRenderDynamicObjectSystemUtil.h"
 #include "Qt3DSRenderableImage.h"
-#include "../RendererImpl/Qt3DSVertexPipelineImpl.h"
-#include "../RendererImpl/Qt3DSRendererImplLayerRenderData.h"
+#include "rendererimpl/Qt3DSVertexPipelineImpl.h"
+#include "rendererimpl/Qt3DSRendererImplLayerRenderData.h"
 #include "Qt3DSRenderCustomMaterialShaderGenerator.h"
 #include "Qt3DSRenderModel.h"
 
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialSystem.h b/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialSystem.h
index 345e7675..cb2a5f7d 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialSystem.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialSystem.h
@@ -33,7 +33,7 @@
 #include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "Qt3DSRenderDynamicObjectSystem.h"
-#include "../RendererImpl/Qt3DSVertexPipelineImpl.h"
+#include "rendererimpl/Qt3DSVertexPipelineImpl.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDefaultMaterialShaderGenerator.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.cpp
index 4dceaca8..4dceaca8 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDefaultMaterialShaderGenerator.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDefaultMaterialShaderGenerator.h b/src/Runtime/Source/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.h
index fc845b51..fc845b51 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDefaultMaterialShaderGenerator.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDynamicObjectSystem.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderDynamicObjectSystem.cpp
index 00de6c3d..00de6c3d 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDynamicObjectSystem.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderDynamicObjectSystem.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystem.h b/src/Runtime/Source/runtimerender/Qt3DSRenderDynamicObjectSystem.h
index b149efc8..b149efc8 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystem.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderDynamicObjectSystem.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemCommands.h b/src/Runtime/Source/runtimerender/Qt3DSRenderDynamicObjectSystemCommands.h
index 857dfa97..857dfa97 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemCommands.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderDynamicObjectSystemCommands.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemUtil.h b/src/Runtime/Source/runtimerender/Qt3DSRenderDynamicObjectSystemUtil.h
index 5d78a4c9..5d78a4c9 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemUtil.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderDynamicObjectSystemUtil.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderEffectSystem.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderEffectSystem.cpp
index d86c100d..d86c100d 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderEffectSystem.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderEffectSystem.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEffectSystem.h b/src/Runtime/Source/runtimerender/Qt3DSRenderEffectSystem.h
index 119564da..119564da 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEffectSystem.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderEffectSystem.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderEulerAngles.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderEulerAngles.cpp
index 2732f031..2732f031 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderEulerAngles.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderEulerAngles.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEulerAngles.h b/src/Runtime/Source/runtimerender/Qt3DSRenderEulerAngles.h
index bf271e29..bf271e29 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEulerAngles.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderEulerAngles.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGpuProfiler.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderGpuProfiler.cpp
index 740d8a71..740d8a71 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGpuProfiler.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderGpuProfiler.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectPickQuery.h b/src/Runtime/Source/runtimerender/Qt3DSRenderGraphObjectPickQuery.h
index e63cad3f..e63cad3f 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectPickQuery.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderGraphObjectPickQuery.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGraphObjectSerializer.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderGraphObjectSerializer.cpp
index 8fc7e5aa..8fc7e5aa 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGraphObjectSerializer.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderGraphObjectSerializer.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectSerializer.h b/src/Runtime/Source/runtimerender/Qt3DSRenderGraphObjectSerializer.h
index 8f8420c1..8f8420c1 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectSerializer.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderGraphObjectSerializer.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectTypes.h b/src/Runtime/Source/runtimerender/Qt3DSRenderGraphObjectTypes.h
index 620f6c5d..620f6c5d 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectTypes.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderGraphObjectTypes.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderImageScaler.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderImageScaler.cpp
index d699179f..d699179f 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderImageScaler.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderImageScaler.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageScaler.h b/src/Runtime/Source/runtimerender/Qt3DSRenderImageScaler.h
index 27b51770..27b51770 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageScaler.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderImageScaler.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageTextureData.h b/src/Runtime/Source/runtimerender/Qt3DSRenderImageTextureData.h
index d3698032..d3698032 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageTextureData.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderImageTextureData.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderInputStreamFactory.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderInputStreamFactory.cpp
index 1a418b1e..1a418b1e 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderInputStreamFactory.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderInputStreamFactory.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderInputStreamFactory.h b/src/Runtime/Source/runtimerender/Qt3DSRenderInputStreamFactory.h
index e82134b8..e82134b8 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderInputStreamFactory.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderInputStreamFactory.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderLightConstantProperties.h b/src/Runtime/Source/runtimerender/Qt3DSRenderLightConstantProperties.h
index 4dcd62c5..4dcd62c5 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderLightConstantProperties.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderLightConstantProperties.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialHelpers.h b/src/Runtime/Source/runtimerender/Qt3DSRenderMaterialHelpers.h
index afb799e7..afb799e7 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialHelpers.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderMaterialHelpers.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialShaderGenerator.h b/src/Runtime/Source/runtimerender/Qt3DSRenderMaterialShaderGenerator.h
index e8b9880d..e8b9880d 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialShaderGenerator.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderMaterialShaderGenerator.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMesh.h b/src/Runtime/Source/runtimerender/Qt3DSRenderMesh.h
index d6959ec8..d6959ec8 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMesh.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderMesh.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPathManager.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderPathManager.cpp
index 44e06681..9953dcf2 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPathManager.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderPathManager.cpp
@@ -54,7 +54,7 @@
 #include "Qt3DSRenderCustomMaterial.h"
 #include "Qt3DSRenderCustomMaterialSystem.h"
 #include "render/Qt3DSRenderShaderProgram.h"
-#include "../RendererImpl/Qt3DSVertexPipelineImpl.h"
+#include "rendererimpl/Qt3DSVertexPipelineImpl.h"
 #include "foundation/Qt3DSMathUtils.h"
 #include "render/Qt3DSRenderPathRender.h"
 #include "render/Qt3DSRenderPathSpecification.h"
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathManager.h b/src/Runtime/Source/runtimerender/Qt3DSRenderPathManager.h
index fc7e05f1..fc7e05f1 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathManager.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderPathManager.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathMath.h b/src/Runtime/Source/runtimerender/Qt3DSRenderPathMath.h
index e9eb2220..e9eb2220 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathMath.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderPathMath.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathRenderContext.h b/src/Runtime/Source/runtimerender/Qt3DSRenderPathRenderContext.h
index deeea281..deeea281 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathRenderContext.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderPathRenderContext.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPixelGraphicsRenderer.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderPixelGraphicsRenderer.cpp
index 43f7c0b4..43f7c0b4 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPixelGraphicsRenderer.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderPixelGraphicsRenderer.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsRenderer.h b/src/Runtime/Source/runtimerender/Qt3DSRenderPixelGraphicsRenderer.h
index b37cb26b..b37cb26b 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsRenderer.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderPixelGraphicsRenderer.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPixelGraphicsTypes.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderPixelGraphicsTypes.cpp
index fe32437f..fe32437f 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPixelGraphicsTypes.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderPixelGraphicsTypes.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsTypes.h b/src/Runtime/Source/runtimerender/Qt3DSRenderPixelGraphicsTypes.h
index 2c154c18..2c154c18 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsTypes.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderPixelGraphicsTypes.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPlugin.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderPlugin.cpp
index aca90ce3..046f1b1b 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPlugin.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderPlugin.cpp
@@ -41,15 +41,15 @@
 #include "Qt3DSRenderInputStreamFactory.h"
 
 #if defined(QT3DS_WINDOWS)
-#include "WINDOWS/DynamicLibLoader.h"
+#include "windows/DynamicLibLoader.h"
 #elif defined(QT3DS_ANDROID)
-#include "ANDROID/DynamicLibLoader.h"
+#include "android/DynamicLibLoader.h"
 #elif defined(QT3DS_LINUX)
-#include "LINUX/DynamicLibLoader.h"
+#include "linux/DynamicLibLoader.h"
 #elif defined(QT3DS_APPLE)
-#include "OSX/DynamicLibLoader.h"
+#include "macos/DynamicLibLoader.h"
 #elif defined(QT3DS_QNX)
-#include "QNX/DynamicLibLoader.h"
+#include "qnx/DynamicLibLoader.h"
 #else
 #error "Must define an operating system type (QT3DS_WINDOWS, QT3DS_ANDROID, QT3DS_LINUX, QT3DS_APPLE, QT3DS_QNX)"
 #endif
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPlugin.h b/src/Runtime/Source/runtimerender/Qt3DSRenderPlugin.h
index eb71f846..eb71f846 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPlugin.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderPlugin.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginCInterface.h b/src/Runtime/Source/runtimerender/Qt3DSRenderPluginCInterface.h
index ec7481a0..ec7481a0 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginCInterface.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderPluginCInterface.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginGraphObject.h b/src/Runtime/Source/runtimerender/Qt3DSRenderPluginGraphObject.h
index c0ea66b4..c0ea66b4 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginGraphObject.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderPluginGraphObject.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginPropertyValue.h b/src/Runtime/Source/runtimerender/Qt3DSRenderPluginPropertyValue.h
index a266e8d3..a266e8d3 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginPropertyValue.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderPluginPropertyValue.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderProfiler.h b/src/Runtime/Source/runtimerender/Qt3DSRenderProfiler.h
index a5941c03..a5941c03 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderProfiler.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderProfiler.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderRay.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderRay.cpp
index 5376b8b9..5376b8b9 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderRay.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderRay.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRay.h b/src/Runtime/Source/runtimerender/Qt3DSRenderRay.h
index 705f7089..705f7089 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRay.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderRay.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderRenderList.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderRenderList.cpp
index 118c855d..118c855d 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderRenderList.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderRenderList.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRenderList.h b/src/Runtime/Source/runtimerender/Qt3DSRenderRenderList.h
index dce9a95a..dce9a95a 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRenderList.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderRenderList.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRotationHelper.h b/src/Runtime/Source/runtimerender/Qt3DSRenderRotationHelper.h
index 19ba8eb7..19ba8eb7 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRotationHelper.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderRotationHelper.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCache.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCache.cpp
index 0c7c4997..0c7c4997 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCache.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCache.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCache.h b/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCache.h
index 47e76f36..47e76f36 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCache.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCache.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCodeGenerator.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCodeGenerator.cpp
index 1cc9e9c7..1cc9e9c7 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCodeGenerator.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCodeGenerator.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGenerator.h b/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCodeGenerator.h
index 80cbaaae..80cbaaae 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGenerator.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCodeGenerator.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCodeGeneratorV2.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCodeGeneratorV2.cpp
index 173ba431..173ba431 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCodeGeneratorV2.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCodeGeneratorV2.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGeneratorV2.h b/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCodeGeneratorV2.h
index 23892c5c..23892c5c 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGeneratorV2.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCodeGeneratorV2.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderKeys.h b/src/Runtime/Source/runtimerender/Qt3DSRenderShaderKeys.h
index 5d02e414..5d02e414 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderKeys.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderShaderKeys.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShadowMap.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderShadowMap.cpp
index cfc49d61..983af55c 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShadowMap.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderShadowMap.cpp
@@ -31,7 +31,7 @@
 #include "Qt3DSRenderLayer.h"
 #include "Qt3DSRenderShadowMap.h"
 #include "Qt3DSRenderResourceManager.h"
-#include "../RendererImpl/Qt3DSRendererImplLayerRenderData.h"
+#include "rendererimpl/Qt3DSRendererImplLayerRenderData.h"
 #include "render/Qt3DSRenderShaderConstant.h"
 #include "render/Qt3DSRenderShaderProgram.h"
 
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShadowMap.h b/src/Runtime/Source/runtimerender/Qt3DSRenderShadowMap.h
index c5ba2eaa..c5ba2eaa 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShadowMap.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderShadowMap.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderString.h b/src/Runtime/Source/runtimerender/Qt3DSRenderString.h
index 8d831c20..8d831c20 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderString.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderString.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubPresentationHelper.h b/src/Runtime/Source/runtimerender/Qt3DSRenderSubPresentationHelper.h
index d77c7a7f..d77c7a7f 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubPresentationHelper.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderSubPresentationHelper.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderSubpresentation.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderSubpresentation.cpp
index cd83f036..cd83f036 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderSubpresentation.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderSubpresentation.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubpresentation.h b/src/Runtime/Source/runtimerender/Qt3DSRenderSubpresentation.h
index 9eb51450..9eb51450 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubpresentation.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderSubpresentation.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTaggedPointer.h b/src/Runtime/Source/runtimerender/Qt3DSRenderTaggedPointer.h
index 8dd8bdd0..8dd8bdd0 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTaggedPointer.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderTaggedPointer.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTessModeValues.h b/src/Runtime/Source/runtimerender/Qt3DSRenderTessModeValues.h
index 15ea03c9..15ea03c9 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTessModeValues.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderTessModeValues.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextTextureAtlas.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureAtlas.cpp
index 81c1d232..81c1d232 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextTextureAtlas.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureAtlas.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureAtlas.h b/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureAtlas.h
index 7a3f1215..7a3f1215 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureAtlas.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureAtlas.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextTextureCache.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureCache.cpp
index 304e64b6..304e64b6 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextTextureCache.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureCache.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureCache.h b/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureCache.h
index 45d40217..45d40217 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureCache.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureCache.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTypes.h b/src/Runtime/Source/runtimerender/Qt3DSRenderTextTypes.h
index 72ea9c15..72ea9c15 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTypes.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderTextTypes.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextureAtlas.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderTextureAtlas.cpp
index 062e7d57..062e7d57 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextureAtlas.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderTextureAtlas.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextureAtlas.h b/src/Runtime/Source/runtimerender/Qt3DSRenderTextureAtlas.h
index 46f7bdb5..46f7bdb5 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextureAtlas.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderTextureAtlas.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderThreadPool.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderThreadPool.cpp
index 70499c62..70499c62 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderThreadPool.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderThreadPool.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderThreadPool.h b/src/Runtime/Source/runtimerender/Qt3DSRenderThreadPool.h
index d39f226f..d39f226f 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderThreadPool.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderThreadPool.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderUIPLoader.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.cpp
index f64efbcc..f64efbcc 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderUIPLoader.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPLoader.h b/src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.h
index 2b70c687..2b70c687 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPLoader.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderUIPSharedTranslation.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderUIPSharedTranslation.cpp
index a0594933..a0594933 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderUIPSharedTranslation.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderUIPSharedTranslation.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h b/src/Runtime/Source/runtimerender/Qt3DSRenderUIPSharedTranslation.h
index 8ba74eae..8ba74eae 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderUIPSharedTranslation.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderWidgets.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderWidgets.cpp
index 311b2189..311b2189 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderWidgets.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderWidgets.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWidgets.h b/src/Runtime/Source/runtimerender/Qt3DSRenderWidgets.h
index 28cb3322..28cb3322 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWidgets.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderWidgets.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderableImage.h b/src/Runtime/Source/runtimerender/Qt3DSRenderableImage.h
index 5d4aa1c4..5d4aa1c4 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderableImage.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderableImage.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderer.h b/src/Runtime/Source/runtimerender/Qt3DSRenderer.h
index 360ebf48..360ebf48 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderer.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRenderer.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRendererUtil.cpp b/src/Runtime/Source/runtimerender/Qt3DSRendererUtil.cpp
index 7bc108e0..7bc108e0 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRendererUtil.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSRendererUtil.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRendererUtil.h b/src/Runtime/Source/runtimerender/Qt3DSRendererUtil.h
index 96f36426..96f36426 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRendererUtil.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSRendererUtil.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSTextRenderer.cpp b/src/Runtime/Source/runtimerender/Qt3DSTextRenderer.cpp
index 91a5eb78..91a5eb78 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSTextRenderer.cpp
+++ b/src/Runtime/Source/runtimerender/Qt3DSTextRenderer.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSTextRenderer.h b/src/Runtime/Source/runtimerender/Qt3DSTextRenderer.h
index 756c3a90..756c3a90 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSTextRenderer.h
+++ b/src/Runtime/Source/runtimerender/Qt3DSTextRenderer.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/ANDROID/DynamicLibLoader.h b/src/Runtime/Source/runtimerender/android/DynamicLibLoader.h
index ad47c506..c968419a 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/ANDROID/DynamicLibLoader.h
+++ b/src/Runtime/Source/runtimerender/android/DynamicLibLoader.h
@@ -27,4 +27,4 @@
 **
 ****************************************************************************/
 
-#include "LINUX/DynamicLibLoader.h"
\ No newline at end of file
+#include "linux/DynamicLibLoader.h"
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderCamera.cpp
index 062a36c5..062a36c5 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.cpp
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderCamera.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderCamera.h
index d6d8ce82..d6d8ce82 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderCamera.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCustomMaterial.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderCustomMaterial.h
index 593c7573..593c7573 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCustomMaterial.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderCustomMaterial.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.cpp
index 06f3649a..06f3649a 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.cpp
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h
index 09595236..09595236 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDynamicObject.cpp
index 3d7c6ff5..3d7c6ff5 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.cpp
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDynamicObject.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDynamicObject.h
index a275e572..a275e572 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDynamicObject.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderEffect.cpp
index 97cddd9d..97cddd9d 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.cpp
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderEffect.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderEffect.h
index c11c214c..c11c214c 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderEffect.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderGraphObject.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderGraphObject.h
index 58c48ed1..58c48ed1 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderGraphObject.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderGraphObject.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderImage.cpp
index eaa98c77..eaa98c77 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.cpp
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderImage.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderImage.h
index 47993e73..47993e73 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderImage.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLayer.cpp
index ee146624..ee146624 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.cpp
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLayer.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLayer.h
index 3759fe12..3759fe12 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLayer.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLight.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLight.cpp
index 3b45e8c9..3b45e8c9 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLight.cpp
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLight.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLight.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLight.h
index 549e3e26..549e3e26 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLight.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLight.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLightmaps.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLightmaps.cpp
index 0e5e6c60..0e5e6c60 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLightmaps.cpp
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLightmaps.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLightmaps.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLightmaps.h
index 4480aea4..4480aea4 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLightmaps.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLightmaps.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderMaterialDirty.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderMaterialDirty.h
index c04c1b6b..c04c1b6b 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderMaterialDirty.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderMaterialDirty.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderModel.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderModel.cpp
index a78396c5..a78396c5 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderModel.cpp
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderModel.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderModel.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderModel.h
index cc5c4e27..cc5c4e27 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderModel.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderModel.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderNode.cpp
index bf47bb8d..bf47bb8d 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.cpp
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderNode.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderNode.h
index 87a1500c..87a1500c 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderNode.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPath.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPath.cpp
index bc637680..bc637680 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPath.cpp
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPath.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPath.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPath.h
index 7db3ef50..7db3ef50 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPath.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPath.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPathSubPath.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPathSubPath.h
index ed1f9beb..ed1f9beb 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPathSubPath.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPathSubPath.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPresentation.cpp
index 6403959e..6403959e 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.cpp
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPresentation.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPresentation.h
index 2403e3b8..2403e3b8 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPresentation.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderReferencedMaterial.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderReferencedMaterial.h
index d2043f0d..d2043f0d 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderReferencedMaterial.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderReferencedMaterial.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderScene.cpp
index 8d206e69..8d206e69 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.cpp
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderScene.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderScene.h
index 57887199..57887199 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderScene.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderText.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.cpp
index 8b44e00f..8b44e00f 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderText.cpp
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderText.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.h
index 56a2a9bf..56a2a9bf 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderText.h
+++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/LINUX/DynamicLibLoader.h b/src/Runtime/Source/runtimerender/linux/DynamicLibLoader.h
index cc5d077c..cc5d077c 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/LINUX/DynamicLibLoader.h
+++ b/src/Runtime/Source/runtimerender/linux/DynamicLibLoader.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/OSX/DynamicLibLoader.h b/src/Runtime/Source/runtimerender/macos/DynamicLibLoader.h
index df486c14..c968419a 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/OSX/DynamicLibLoader.h
+++ b/src/Runtime/Source/runtimerender/macos/DynamicLibLoader.h
@@ -27,4 +27,4 @@
 **
 ****************************************************************************/
 
-#include "LINUX/DynamicLibLoader.h"
+#include "linux/DynamicLibLoader.h"
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/q3dsqmlrender.cpp b/src/Runtime/Source/runtimerender/q3dsqmlrender.cpp
index f1bdd4d9..f1bdd4d9 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/q3dsqmlrender.cpp
+++ b/src/Runtime/Source/runtimerender/q3dsqmlrender.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/q3dsqmlrender.h b/src/Runtime/Source/runtimerender/q3dsqmlrender.h
index 12d459cf..12d459cf 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/q3dsqmlrender.h
+++ b/src/Runtime/Source/runtimerender/q3dsqmlrender.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/QNX/DynamicLibLoader.h b/src/Runtime/Source/runtimerender/qnx/DynamicLibLoader.h
index df486c14..c968419a 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/QNX/DynamicLibLoader.h
+++ b/src/Runtime/Source/runtimerender/qnx/DynamicLibLoader.h
@@ -27,4 +27,4 @@
 **
 ****************************************************************************/
 
-#include "LINUX/DynamicLibLoader.h"
+#include "linux/DynamicLibLoader.h"
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.cpp b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.cpp
index 7d8054f7..7d8054f7 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.cpp
+++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.h b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.h
index d380b850..d380b850 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.h
+++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.cpp b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImpl.cpp
index d6fb3b1b..d6fb3b1b 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.cpp
+++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImpl.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.h b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImpl.h
index 686e7d3b..686e7d3b 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.h
+++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImpl.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.cpp b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.cpp
index af3cb613..af3cb613 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.cpp
+++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.h b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.h
index 4e237b0b..4e237b0b 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.h
+++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderHelper.cpp b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderHelper.cpp
index 8a050db0..8a050db0 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderHelper.cpp
+++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderHelper.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderHelper.h b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderHelper.h
index 8ee4ff73..8ee4ff73 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderHelper.h
+++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderHelper.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
index 68ed9907..68ed9907 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
+++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.h b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.h
index 5b8d6e10..5b8d6e10 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.h
+++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.cpp b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplShaders.cpp
index c3fc2d4d..50620f88 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.cpp
+++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplShaders.cpp
@@ -36,7 +36,7 @@
 #include "Qt3DSRenderDynamicObjectSystem.h"
 #include "Qt3DSRenderShaderCodeGeneratorV2.h"
 #include "Qt3DSRenderDefaultMaterialShaderGenerator.h"
-#include "../RendererImpl/Qt3DSVertexPipelineImpl.h"
+#include "Qt3DSVertexPipelineImpl.h"
 
 // This adds support for the depth buffers in the shader so we can do depth
 // texture-based effects.
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.h b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplShaders.h
index 1ac85dbf..1ac85dbf 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.h
+++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplShaders.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSVertexPipelineImpl.h b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSVertexPipelineImpl.h
index e2de7e0f..e2de7e0f 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSVertexPipelineImpl.h
+++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSVertexPipelineImpl.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferLoader.cpp b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferLoader.cpp
index 963186ff..963186ff 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferLoader.cpp
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferLoader.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferLoader.h b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferLoader.h
index 8d75e259..8d75e259 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferLoader.h
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferLoader.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.cpp b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp
index 37ca281f..37ca281f 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.cpp
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.h b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferManager.h
index cd9e3d33..cd9e3d33 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.h
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferManager.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderImageBatchLoader.cpp b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderImageBatchLoader.cpp
index 8f1cb14f..8f1cb14f 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderImageBatchLoader.cpp
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderImageBatchLoader.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderImageBatchLoader.h b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderImageBatchLoader.h
index d45123f1..d45123f1 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderImageBatchLoader.h
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderImageBatchLoader.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.cpp b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.cpp
index 3365a2ce..3365a2ce 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.cpp
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.h b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.h
index f0194000..f0194000 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.h
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureBMP.cpp b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureBMP.cpp
index 29e75a89..29e75a89 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureBMP.cpp
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureBMP.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.cpp b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureDDS.cpp
index 19d41d11..19d41d11 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.cpp
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureDDS.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.h b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureDDS.h
index 8490b474..8490b474 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.h
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureDDS.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureFreeImageCompat.h b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureFreeImageCompat.h
index 13f317bd..13f317bd 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureFreeImageCompat.h
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureFreeImageCompat.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureGIF.cpp b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureGIF.cpp
index ece4d3a3..ece4d3a3 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureGIF.cpp
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureGIF.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureHDR.cpp b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureHDR.cpp
index defff295..defff295 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureHDR.cpp
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureHDR.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureKTX.cpp b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.cpp
index b1d4b050..b1d4b050 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureKTX.cpp
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureKTX.h b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.h
index 3a2d7628..3a2d7628 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureKTX.h
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.cpp b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderPrefilterTexture.cpp
index 023964f5..023964f5 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.cpp
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderPrefilterTexture.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.h b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderPrefilterTexture.h
index e633eb14..e633eb14 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.h
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderPrefilterTexture.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceBufferObjects.cpp b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceBufferObjects.cpp
index 25fbb414..25fbb414 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceBufferObjects.cpp
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceBufferObjects.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceBufferObjects.h b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceBufferObjects.h
index fb54c4dc..fb54c4dc 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceBufferObjects.h
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceBufferObjects.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceManager.cpp b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceManager.cpp
index 35936885..35936885 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceManager.cpp
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceManager.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceManager.h b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceManager.h
index 675d644c..675d644c 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceManager.h
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceManager.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceTexture2D.cpp b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceTexture2D.cpp
index e877cbc9..e877cbc9 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceTexture2D.cpp
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceTexture2D.cpp
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceTexture2D.h b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceTexture2D.h
index eb54713a..eb54713a 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceTexture2D.h
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceTexture2D.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/WINDOWS/DynamicLibLoader.h b/src/Runtime/Source/runtimerender/windows/DynamicLibLoader.h
index 09b028bc..09b028bc 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/WINDOWS/DynamicLibLoader.h
+++ b/src/Runtime/Source/runtimerender/windows/DynamicLibLoader.h
diff --git a/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateApplication.h b/src/Runtime/Source/state/Qt3DSStateApplication.h
index ca8f44d5..ca8f44d5 100644
--- a/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateApplication.h
+++ b/src/Runtime/Source/state/Qt3DSStateApplication.h
diff --git a/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateConfig.h b/src/Runtime/Source/state/Qt3DSStateConfig.h
index 0252d1f7..0252d1f7 100644
--- a/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateConfig.h
+++ b/src/Runtime/Source/state/Qt3DSStateConfig.h
diff --git a/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateEngine.h b/src/Runtime/Source/state/Qt3DSStateEngine.h
index 464fd3a5..464fd3a5 100644
--- a/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateEngine.h
+++ b/src/Runtime/Source/state/Qt3DSStateEngine.h
diff --git a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateInputStreamFactory.cpp b/src/Runtime/Source/state/Qt3DSStateInputStreamFactory.cpp
index 2fd3dffa..2fd3dffa 100644
--- a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateInputStreamFactory.cpp
+++ b/src/Runtime/Source/state/Qt3DSStateInputStreamFactory.cpp
diff --git a/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateInputStreamFactory.h b/src/Runtime/Source/state/Qt3DSStateInputStreamFactory.h
index a4e387ab..a4e387ab 100644
--- a/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateInputStreamFactory.h
+++ b/src/Runtime/Source/state/Qt3DSStateInputStreamFactory.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSState.h b/src/Runtime/Source/stateapplication/Qt3DSState.h
index b5686c25..b5686c25 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSState.h
+++ b/src/Runtime/Source/stateapplication/Qt3DSState.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Application/Qt3DSStateApplication.cpp b/src/Runtime/Source/stateapplication/Qt3DSStateApplication.cpp
index cd89d52f..cd89d52f 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Application/Qt3DSStateApplication.cpp
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateApplication.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Application/Qt3DSStateApplication.h b/src/Runtime/Source/stateapplication/Qt3DSStateApplication.h
index 3ebe0d4f..3ebe0d4f 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Application/Qt3DSStateApplication.h
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateApplication.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateContext.cpp b/src/Runtime/Source/stateapplication/Qt3DSStateContext.cpp
index 60814ed5..60814ed5 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateContext.cpp
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateContext.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateContext.h b/src/Runtime/Source/stateapplication/Qt3DSStateContext.h
index 31098938..31098938 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateContext.h
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateContext.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateExecutionContext.cpp b/src/Runtime/Source/stateapplication/Qt3DSStateExecutionContext.cpp
index 4516c2f9..4516c2f9 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateExecutionContext.cpp
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateExecutionContext.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionContext.h b/src/Runtime/Source/stateapplication/Qt3DSStateExecutionContext.h
index 31ff0e22..31ff0e22 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionContext.h
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateExecutionContext.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionTypes.h b/src/Runtime/Source/stateapplication/Qt3DSStateExecutionTypes.h
index 6dc7674f..6dc7674f 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionTypes.h
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateExecutionTypes.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateIdValue.h b/src/Runtime/Source/stateapplication/Qt3DSStateIdValue.h
index ed5beb13..ed5beb13 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateIdValue.h
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateIdValue.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateInterpreter.cpp b/src/Runtime/Source/stateapplication/Qt3DSStateInterpreter.cpp
index 9fc72406..9fc72406 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateInterpreter.cpp
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateInterpreter.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateInterpreter.h b/src/Runtime/Source/stateapplication/Qt3DSStateInterpreter.h
index d615d21f..d615d21f 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateInterpreter.h
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateInterpreter.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateScriptContext.h b/src/Runtime/Source/stateapplication/Qt3DSStateScriptContext.h
index 110770a1..110770a1 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateScriptContext.h
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateScriptContext.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateSharedImpl.h b/src/Runtime/Source/stateapplication/Qt3DSStateSharedImpl.h
index 0b82cc3c..0b82cc3c 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateSharedImpl.h
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateSharedImpl.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateSignalConnection.h b/src/Runtime/Source/stateapplication/Qt3DSStateSignalConnection.h
index 5bfa59ad..5bfa59ad 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateSignalConnection.h
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateSignalConnection.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateTypes.h b/src/Runtime/Source/stateapplication/Qt3DSStateTypes.h
index 41e759fb..41e759fb 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateTypes.h
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateTypes.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateVisualBindingContext.cpp b/src/Runtime/Source/stateapplication/Qt3DSStateVisualBindingContext.cpp
index 62413bae..62413bae 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateVisualBindingContext.cpp
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateVisualBindingContext.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContext.h b/src/Runtime/Source/stateapplication/Qt3DSStateVisualBindingContext.h
index 192181e4..192181e4 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContext.h
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateVisualBindingContext.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextCommands.h b/src/Runtime/Source/stateapplication/Qt3DSStateVisualBindingContextCommands.h
index 4d08f695..4d08f695 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextCommands.h
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateVisualBindingContextCommands.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextValues.h b/src/Runtime/Source/stateapplication/Qt3DSStateVisualBindingContextValues.h
index 7bad9b33..7bad9b33 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextValues.h
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateVisualBindingContextValues.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateXMLIO.cpp b/src/Runtime/Source/stateapplication/Qt3DSStateXMLIO.cpp
index 44f3242f..44f3242f 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateXMLIO.cpp
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateXMLIO.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateXMLIO.h b/src/Runtime/Source/stateapplication/Qt3DSStateXMLIO.h
index 3a639845..3a639845 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateXMLIO.h
+++ b/src/Runtime/Source/stateapplication/Qt3DSStateXMLIO.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebugger.h b/src/Runtime/Source/stateapplication/debugger/Qt3DSSceneGraphDebugger.h
index 38a0b74f..38a0b74f 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebugger.h
+++ b/src/Runtime/Source/stateapplication/debugger/Qt3DSSceneGraphDebugger.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerProtocol.h b/src/Runtime/Source/stateapplication/debugger/Qt3DSSceneGraphDebuggerProtocol.h
index 4fea4322..4fea4322 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerProtocol.h
+++ b/src/Runtime/Source/stateapplication/debugger/Qt3DSSceneGraphDebuggerProtocol.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerValue.h b/src/Runtime/Source/stateapplication/debugger/Qt3DSSceneGraphDebuggerValue.h
index 3b6a4172..3b6a4172 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerValue.h
+++ b/src/Runtime/Source/stateapplication/debugger/Qt3DSSceneGraphDebuggerValue.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphRuntimeDebugger.cpp b/src/Runtime/Source/stateapplication/debugger/Qt3DSSceneGraphRuntimeDebugger.cpp
index 403fb580..403fb580 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphRuntimeDebugger.cpp
+++ b/src/Runtime/Source/stateapplication/debugger/Qt3DSSceneGraphRuntimeDebugger.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDataTest.cpp b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDataTest.cpp
index ced1397b..ced1397b 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDataTest.cpp
+++ b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDataTest.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugStreams.cpp b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDebugStreams.cpp
index 707ea73e..707ea73e 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugStreams.cpp
+++ b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDebugStreams.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugStreams.h b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDebugStreams.h
index 5bbc0b26..5bbc0b26 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugStreams.h
+++ b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDebugStreams.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggedInterpreter.cpp b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDebuggedInterpreter.cpp
index a64e8589..a64e8589 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggedInterpreter.cpp
+++ b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDebuggedInterpreter.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugger.cpp b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDebugger.cpp
index 5917db60..5917db60 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugger.cpp
+++ b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDebugger.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugger.h b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDebugger.h
index 00814e42..00814e42 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugger.h
+++ b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDebugger.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerListener.cpp b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDebuggerListener.cpp
index 2045f84f..2045f84f 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerListener.cpp
+++ b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDebuggerListener.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerProtocol.h b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDebuggerProtocol.h
index 03230a61..03230a61 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerProtocol.h
+++ b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDebuggerProtocol.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerValues.h b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDebuggerValues.h
index 340f46cb..340f46cb 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerValues.h
+++ b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateDebuggerValues.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateTest.h b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateTest.h
index 6edbe366..6edbe366 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateTest.h
+++ b/src/Runtime/Source/stateapplication/debugger/Qt3DSStateTest.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSSceneGraphArchitectDebugger.cpp b/src/Runtime/Source/stateapplication/editor/Qt3DSSceneGraphArchitectDebugger.cpp
index e15f587d..e15f587d 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSSceneGraphArchitectDebugger.cpp
+++ b/src/Runtime/Source/stateapplication/editor/Qt3DSSceneGraphArchitectDebugger.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateDebuggerMaster.cpp b/src/Runtime/Source/stateapplication/editor/Qt3DSStateDebuggerMaster.cpp
index 83fe016f..83fe016f 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateDebuggerMaster.cpp
+++ b/src/Runtime/Source/stateapplication/editor/Qt3DSStateDebuggerMaster.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditor.cpp b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditor.cpp
index 6891fab0..6891fab0 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditor.cpp
+++ b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditor.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditor.h b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditor.h
index 31c83afe..31c83afe 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditor.h
+++ b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditor.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorEditorsImpl.h b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorEditorsImpl.h
index fc9411d2..fc9411d2 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorEditorsImpl.h
+++ b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorEditorsImpl.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorFoundation.h b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorFoundation.h
index edb55ee3..edb55ee3 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorFoundation.h
+++ b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorFoundation.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorImpl.h b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorImpl.h
index c1a691ee..c1a691ee 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorImpl.h
+++ b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorImpl.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorProperties.h b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorProperties.h
index 5f06fbdb..5f06fbdb 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorProperties.h
+++ b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorProperties.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransactionImpl.cpp b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorTransactionImpl.cpp
index 1bc0faf7..1bc0faf7 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransactionImpl.cpp
+++ b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorTransactionImpl.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransactionImpl.h b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorTransactionImpl.h
index 9996c351..9996c351 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransactionImpl.h
+++ b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorTransactionImpl.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransitionPath.cpp b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorTransitionPath.cpp
index 7fb4ab9f..7fb4ab9f 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransitionPath.cpp
+++ b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorTransitionPath.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransitionPath.h b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorTransitionPath.h
index bacf60f2..bacf60f2 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransitionPath.h
+++ b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorTransitionPath.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorValue.h b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorValue.h
index d47e6c99..d47e6c99 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorValue.h
+++ b/src/Runtime/Source/stateapplication/editor/Qt3DSStateEditorValue.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSUIADatamodel.cpp b/src/Runtime/Source/stateapplication/editor/Qt3DSUIADatamodel.cpp
index f21fb27b..f21fb27b 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSUIADatamodel.cpp
+++ b/src/Runtime/Source/stateapplication/editor/Qt3DSUIADatamodel.cpp
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSUIADatamodel.h b/src/Runtime/Source/stateapplication/editor/Qt3DSUIADatamodel.h
index e064529a..e064529a 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSUIADatamodel.h
+++ b/src/Runtime/Source/stateapplication/editor/Qt3DSUIADatamodel.h
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSUIADatamodelValue.h b/src/Runtime/Source/stateapplication/editor/Qt3DSUIADatamodelValue.h
index 7698809c..7698809c 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSUIADatamodelValue.h
+++ b/src/Runtime/Source/stateapplication/editor/Qt3DSUIADatamodelValue.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSArray.h b/src/Runtime/Source/system/Qt3DSArray.h
index 805b8b0a..805b8b0a 100644
--- a/src/Runtime/Source/System/Include/Qt3DSArray.h
+++ b/src/Runtime/Source/system/Qt3DSArray.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSArray.inl b/src/Runtime/Source/system/Qt3DSArray.inl
index a9667fd2..a9667fd2 100644
--- a/src/Runtime/Source/System/Include/Qt3DSArray.inl
+++ b/src/Runtime/Source/system/Qt3DSArray.inl
diff --git a/src/Runtime/Source/System/Source/Qt3DSAssert.cpp b/src/Runtime/Source/system/Qt3DSAssert.cpp
index 63d38768..63d38768 100644
--- a/src/Runtime/Source/System/Source/Qt3DSAssert.cpp
+++ b/src/Runtime/Source/system/Qt3DSAssert.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSAssert.h b/src/Runtime/Source/system/Qt3DSAssert.h
index a64ca7f6..a64ca7f6 100644
--- a/src/Runtime/Source/System/Include/Qt3DSAssert.h
+++ b/src/Runtime/Source/system/Qt3DSAssert.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSAudioPlayer.h b/src/Runtime/Source/system/Qt3DSAudioPlayer.h
index 3b6f3ef8..3b6f3ef8 100644
--- a/src/Runtime/Source/System/Include/Qt3DSAudioPlayer.h
+++ b/src/Runtime/Source/system/Qt3DSAudioPlayer.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSBasicPluginDLL.h b/src/Runtime/Source/system/Qt3DSBasicPluginDLL.h
index 63a2d1f6..63a2d1f6 100644
--- a/src/Runtime/Source/System/Include/Qt3DSBasicPluginDLL.h
+++ b/src/Runtime/Source/system/Qt3DSBasicPluginDLL.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSBezierEval.h b/src/Runtime/Source/system/Qt3DSBezierEval.h
index c4d733a3..c4d733a3 100644
--- a/src/Runtime/Source/System/Include/Qt3DSBezierEval.h
+++ b/src/Runtime/Source/system/Qt3DSBezierEval.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSBoundingBox.cpp b/src/Runtime/Source/system/Qt3DSBoundingBox.cpp
index 2a9331d1..2a9331d1 100644
--- a/src/Runtime/Source/System/Source/Qt3DSBoundingBox.cpp
+++ b/src/Runtime/Source/system/Qt3DSBoundingBox.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSBoundingBox.h b/src/Runtime/Source/system/Qt3DSBoundingBox.h
index 988a9ba8..988a9ba8 100644
--- a/src/Runtime/Source/System/Include/Qt3DSBoundingBox.h
+++ b/src/Runtime/Source/system/Qt3DSBoundingBox.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSCircularArray.h b/src/Runtime/Source/system/Qt3DSCircularArray.h
index be921673..be921673 100644
--- a/src/Runtime/Source/System/Include/Qt3DSCircularArray.h
+++ b/src/Runtime/Source/system/Qt3DSCircularArray.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSCircularArray.inl b/src/Runtime/Source/system/Qt3DSCircularArray.inl
index 0d7f081f..0d7f081f 100644
--- a/src/Runtime/Source/System/Include/Qt3DSCircularArray.inl
+++ b/src/Runtime/Source/system/Qt3DSCircularArray.inl
diff --git a/src/Runtime/Source/System/Source/Qt3DSColor.cpp b/src/Runtime/Source/system/Qt3DSColor.cpp
index a44d488b..a44d488b 100644
--- a/src/Runtime/Source/System/Source/Qt3DSColor.cpp
+++ b/src/Runtime/Source/system/Qt3DSColor.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSColor.h b/src/Runtime/Source/system/Qt3DSColor.h
index b917f46b..b917f46b 100644
--- a/src/Runtime/Source/System/Include/Qt3DSColor.h
+++ b/src/Runtime/Source/system/Qt3DSColor.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSConfig.h b/src/Runtime/Source/system/Qt3DSConfig.h
index 49c644da..49c644da 100644
--- a/src/Runtime/Source/System/Include/Qt3DSConfig.h
+++ b/src/Runtime/Source/system/Qt3DSConfig.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSCubicRoots.cpp b/src/Runtime/Source/system/Qt3DSCubicRoots.cpp
index ebcc54b8..ebcc54b8 100644
--- a/src/Runtime/Source/System/Source/Qt3DSCubicRoots.cpp
+++ b/src/Runtime/Source/system/Qt3DSCubicRoots.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSCubicRoots.h b/src/Runtime/Source/system/Qt3DSCubicRoots.h
index b5ac0530..b5ac0530 100644
--- a/src/Runtime/Source/System/Include/Qt3DSCubicRoots.h
+++ b/src/Runtime/Source/system/Qt3DSCubicRoots.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSCubicRootsImpl.h b/src/Runtime/Source/system/Qt3DSCubicRootsImpl.h
index 8cca59f9..8cca59f9 100644
--- a/src/Runtime/Source/System/Include/Qt3DSCubicRootsImpl.h
+++ b/src/Runtime/Source/system/Qt3DSCubicRootsImpl.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSDLLManager.cpp b/src/Runtime/Source/system/Qt3DSDLLManager.cpp
index c6f6d80d..c6f6d80d 100644
--- a/src/Runtime/Source/System/Source/Qt3DSDLLManager.cpp
+++ b/src/Runtime/Source/system/Qt3DSDLLManager.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSDLLManager.h b/src/Runtime/Source/system/Qt3DSDLLManager.h
index d670af2e..d670af2e 100644
--- a/src/Runtime/Source/System/Include/Qt3DSDLLManager.h
+++ b/src/Runtime/Source/system/Qt3DSDLLManager.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSDataLogger.cpp b/src/Runtime/Source/system/Qt3DSDataLogger.cpp
index 2f45f012..2f45f012 100644
--- a/src/Runtime/Source/System/Source/Qt3DSDataLogger.cpp
+++ b/src/Runtime/Source/system/Qt3DSDataLogger.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSDataLogger.h b/src/Runtime/Source/system/Qt3DSDataLogger.h
index b834edab..b834edab 100644
--- a/src/Runtime/Source/System/Include/Qt3DSDataLogger.h
+++ b/src/Runtime/Source/system/Qt3DSDataLogger.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSDataLogger.hpp b/src/Runtime/Source/system/Qt3DSDataLogger.hpp
index 0900c4a4..0900c4a4 100644
--- a/src/Runtime/Source/System/Include/Qt3DSDataLogger.hpp
+++ b/src/Runtime/Source/system/Qt3DSDataLogger.hpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSDataLoggerEnums.h b/src/Runtime/Source/system/Qt3DSDataLoggerEnums.h
index 27320e19..27320e19 100644
--- a/src/Runtime/Source/System/Include/Qt3DSDataLoggerEnums.h
+++ b/src/Runtime/Source/system/Qt3DSDataLoggerEnums.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSDataLoggerViewer.h b/src/Runtime/Source/system/Qt3DSDataLoggerViewer.h
index 0eaf9f6a..0eaf9f6a 100644
--- a/src/Runtime/Source/System/Include/Qt3DSDataLoggerViewer.h
+++ b/src/Runtime/Source/system/Qt3DSDataLoggerViewer.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSEGLTimer.h b/src/Runtime/Source/system/Qt3DSEGLTimer.h
index 4c9f4ce2..4c9f4ce2 100644
--- a/src/Runtime/Source/System/Include/Qt3DSEGLTimer.h
+++ b/src/Runtime/Source/system/Qt3DSEGLTimer.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSEndian.h b/src/Runtime/Source/system/Qt3DSEndian.h
index f8913a72..f8913a72 100644
--- a/src/Runtime/Source/System/Include/Qt3DSEndian.h
+++ b/src/Runtime/Source/system/Qt3DSEndian.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSEulerAngles.cpp b/src/Runtime/Source/system/Qt3DSEulerAngles.cpp
index 7c4364fc..7c4364fc 100644
--- a/src/Runtime/Source/System/Source/Qt3DSEulerAngles.cpp
+++ b/src/Runtime/Source/system/Qt3DSEulerAngles.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSEulerAngles.h b/src/Runtime/Source/system/Qt3DSEulerAngles.h
index d0f53c56..d0f53c56 100644
--- a/src/Runtime/Source/System/Include/Qt3DSEulerAngles.h
+++ b/src/Runtime/Source/system/Qt3DSEulerAngles.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSFNDTimer.h b/src/Runtime/Source/system/Qt3DSFNDTimer.h
index 8241e2ed..8241e2ed 100644
--- a/src/Runtime/Source/System/Include/Qt3DSFNDTimer.h
+++ b/src/Runtime/Source/system/Qt3DSFNDTimer.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSFile.cpp b/src/Runtime/Source/system/Qt3DSFile.cpp
index a26b7351..a26b7351 100644
--- a/src/Runtime/Source/System/Source/Qt3DSFile.cpp
+++ b/src/Runtime/Source/system/Qt3DSFile.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSFile.h b/src/Runtime/Source/system/Qt3DSFile.h
index e970cd2d..e970cd2d 100644
--- a/src/Runtime/Source/System/Include/Qt3DSFile.h
+++ b/src/Runtime/Source/system/Qt3DSFile.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSFileStream.cpp b/src/Runtime/Source/system/Qt3DSFileStream.cpp
index 202e4ae7..202e4ae7 100644
--- a/src/Runtime/Source/System/Source/Qt3DSFileStream.cpp
+++ b/src/Runtime/Source/system/Qt3DSFileStream.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSFileStream.h b/src/Runtime/Source/system/Qt3DSFileStream.h
index 49e272f4..49e272f4 100644
--- a/src/Runtime/Source/System/Include/Qt3DSFileStream.h
+++ b/src/Runtime/Source/system/Qt3DSFileStream.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSFixedArray.h b/src/Runtime/Source/system/Qt3DSFixedArray.h
index 9f971d81..9f971d81 100644
--- a/src/Runtime/Source/System/Include/Qt3DSFixedArray.h
+++ b/src/Runtime/Source/system/Qt3DSFixedArray.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSFixedArray.inl b/src/Runtime/Source/system/Qt3DSFixedArray.inl
index 55242243..55242243 100644
--- a/src/Runtime/Source/System/Include/Qt3DSFixedArray.inl
+++ b/src/Runtime/Source/system/Qt3DSFixedArray.inl
diff --git a/src/Runtime/Source/System/Source/Qt3DSFunctionWrappers.cpp b/src/Runtime/Source/system/Qt3DSFunctionWrappers.cpp
index e96c3ce1..e96c3ce1 100644
--- a/src/Runtime/Source/System/Source/Qt3DSFunctionWrappers.cpp
+++ b/src/Runtime/Source/system/Qt3DSFunctionWrappers.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSFunctionWrappers.h b/src/Runtime/Source/system/Qt3DSFunctionWrappers.h
index 8fff62de..8fff62de 100644
--- a/src/Runtime/Source/System/Include/Qt3DSFunctionWrappers.h
+++ b/src/Runtime/Source/system/Qt3DSFunctionWrappers.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSHash.h b/src/Runtime/Source/system/Qt3DSHash.h
index 8baa2dba..8baa2dba 100644
--- a/src/Runtime/Source/System/Include/Qt3DSHash.h
+++ b/src/Runtime/Source/system/Qt3DSHash.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSIFileStream.h b/src/Runtime/Source/system/Qt3DSIFileStream.h
index 0b432601..0b432601 100644
--- a/src/Runtime/Source/System/Include/Qt3DSIFileStream.h
+++ b/src/Runtime/Source/system/Qt3DSIFileStream.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSIStream.h b/src/Runtime/Source/system/Qt3DSIStream.h
index a4c11955..a4c11955 100644
--- a/src/Runtime/Source/System/Include/Qt3DSIStream.h
+++ b/src/Runtime/Source/system/Qt3DSIStream.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSITimer.h b/src/Runtime/Source/system/Qt3DSITimer.h
index e73fbb95..e73fbb95 100644
--- a/src/Runtime/Source/System/Include/Qt3DSITimer.h
+++ b/src/Runtime/Source/system/Qt3DSITimer.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSMacros.h b/src/Runtime/Source/system/Qt3DSMacros.h
index fbc40b4d..fbc40b4d 100644
--- a/src/Runtime/Source/System/Include/Qt3DSMacros.h
+++ b/src/Runtime/Source/system/Qt3DSMacros.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSMatrix.cpp b/src/Runtime/Source/system/Qt3DSMatrix.cpp
index b5310d0e..b5310d0e 100644
--- a/src/Runtime/Source/System/Source/Qt3DSMatrix.cpp
+++ b/src/Runtime/Source/system/Qt3DSMatrix.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSMatrix.h b/src/Runtime/Source/system/Qt3DSMatrix.h
index 4ef74420..4ef74420 100644
--- a/src/Runtime/Source/System/Include/Qt3DSMatrix.h
+++ b/src/Runtime/Source/system/Qt3DSMatrix.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSMemory.cpp b/src/Runtime/Source/system/Qt3DSMemory.cpp
index 17fa5c86..17fa5c86 100644
--- a/src/Runtime/Source/System/Source/Qt3DSMemory.cpp
+++ b/src/Runtime/Source/system/Qt3DSMemory.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSMemory.h b/src/Runtime/Source/system/Qt3DSMemory.h
index cc04bf73..cc04bf73 100644
--- a/src/Runtime/Source/System/Include/Qt3DSMemory.h
+++ b/src/Runtime/Source/system/Qt3DSMemory.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSMemoryFilter.cpp b/src/Runtime/Source/system/Qt3DSMemoryFilter.cpp
index f6d6591c..f6d6591c 100644
--- a/src/Runtime/Source/System/Source/Qt3DSMemoryFilter.cpp
+++ b/src/Runtime/Source/system/Qt3DSMemoryFilter.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSMemoryFilter.h b/src/Runtime/Source/system/Qt3DSMemoryFilter.h
index df9367da..df9367da 100644
--- a/src/Runtime/Source/System/Include/Qt3DSMemoryFilter.h
+++ b/src/Runtime/Source/system/Qt3DSMemoryFilter.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSMemoryHeap.cpp b/src/Runtime/Source/system/Qt3DSMemoryHeap.cpp
index 4ab36178..4ab36178 100644
--- a/src/Runtime/Source/System/Source/Qt3DSMemoryHeap.cpp
+++ b/src/Runtime/Source/system/Qt3DSMemoryHeap.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSMemoryHeap.h b/src/Runtime/Source/system/Qt3DSMemoryHeap.h
index ba7c1306..ba7c1306 100644
--- a/src/Runtime/Source/System/Include/Qt3DSMemoryHeap.h
+++ b/src/Runtime/Source/system/Qt3DSMemoryHeap.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSMemoryManager.cpp b/src/Runtime/Source/system/Qt3DSMemoryManager.cpp
index a1ace59e..a1ace59e 100644
--- a/src/Runtime/Source/System/Source/Qt3DSMemoryManager.cpp
+++ b/src/Runtime/Source/system/Qt3DSMemoryManager.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSMemoryManager.h b/src/Runtime/Source/system/Qt3DSMemoryManager.h
index fa54fce7..fa54fce7 100644
--- a/src/Runtime/Source/System/Include/Qt3DSMemoryManager.h
+++ b/src/Runtime/Source/system/Qt3DSMemoryManager.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSMemoryPool.cpp b/src/Runtime/Source/system/Qt3DSMemoryPool.cpp
index 44545d45..44545d45 100644
--- a/src/Runtime/Source/System/Source/Qt3DSMemoryPool.cpp
+++ b/src/Runtime/Source/system/Qt3DSMemoryPool.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSMemoryPool.h b/src/Runtime/Source/system/Qt3DSMemoryPool.h
index 01b2e418..01b2e418 100644
--- a/src/Runtime/Source/System/Include/Qt3DSMemoryPool.h
+++ b/src/Runtime/Source/system/Qt3DSMemoryPool.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSMemoryProbe.cpp b/src/Runtime/Source/system/Qt3DSMemoryProbe.cpp
index 4e977ee1..4e977ee1 100644
--- a/src/Runtime/Source/System/Source/Qt3DSMemoryProbe.cpp
+++ b/src/Runtime/Source/system/Qt3DSMemoryProbe.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSMemoryProbe.h b/src/Runtime/Source/system/Qt3DSMemoryProbe.h
index 5f0844e8..5f0844e8 100644
--- a/src/Runtime/Source/System/Include/Qt3DSMemoryProbe.h
+++ b/src/Runtime/Source/system/Qt3DSMemoryProbe.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSMemorySettings.h b/src/Runtime/Source/system/Qt3DSMemorySettings.h
index 54002424..54002424 100644
--- a/src/Runtime/Source/System/Include/Qt3DSMemorySettings.h
+++ b/src/Runtime/Source/system/Qt3DSMemorySettings.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSMemoryStatistics.cpp b/src/Runtime/Source/system/Qt3DSMemoryStatistics.cpp
index 2f5eba0e..2f5eba0e 100644
--- a/src/Runtime/Source/System/Source/Qt3DSMemoryStatistics.cpp
+++ b/src/Runtime/Source/system/Qt3DSMemoryStatistics.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSMemoryStatistics.h b/src/Runtime/Source/system/Qt3DSMemoryStatistics.h
index 81e30434..81e30434 100644
--- a/src/Runtime/Source/System/Include/Qt3DSMemoryStatistics.h
+++ b/src/Runtime/Source/system/Qt3DSMemoryStatistics.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSMemoryTracker.cpp b/src/Runtime/Source/system/Qt3DSMemoryTracker.cpp
index 8aef9519..8aef9519 100644
--- a/src/Runtime/Source/System/Source/Qt3DSMemoryTracker.cpp
+++ b/src/Runtime/Source/system/Qt3DSMemoryTracker.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSMemoryTracker.h b/src/Runtime/Source/system/Qt3DSMemoryTracker.h
index ee6ce699..ee6ce699 100644
--- a/src/Runtime/Source/System/Include/Qt3DSMemoryTracker.h
+++ b/src/Runtime/Source/system/Qt3DSMemoryTracker.h
diff --git a/src/Runtime/Source/System/Include/Qt3DSPlatformSpecific.h b/src/Runtime/Source/system/Qt3DSPlatformSpecific.h
index 3fc34016..3fc34016 100644
--- a/src/Runtime/Source/System/Include/Qt3DSPlatformSpecific.h
+++ b/src/Runtime/Source/system/Qt3DSPlatformSpecific.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSTimer.cpp b/src/Runtime/Source/system/Qt3DSTimer.cpp
index d9e82eb9..d9e82eb9 100644
--- a/src/Runtime/Source/System/Source/Qt3DSTimer.cpp
+++ b/src/Runtime/Source/system/Qt3DSTimer.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSTimer.h b/src/Runtime/Source/system/Qt3DSTimer.h
index 278bd4b4..278bd4b4 100644
--- a/src/Runtime/Source/System/Include/Qt3DSTimer.h
+++ b/src/Runtime/Source/system/Qt3DSTimer.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSTypes.cpp b/src/Runtime/Source/system/Qt3DSTypes.cpp
index 25d41c8b..25d41c8b 100644
--- a/src/Runtime/Source/System/Source/Qt3DSTypes.cpp
+++ b/src/Runtime/Source/system/Qt3DSTypes.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSTypes.h b/src/Runtime/Source/system/Qt3DSTypes.h
index 6330919c..6330919c 100644
--- a/src/Runtime/Source/System/Include/Qt3DSTypes.h
+++ b/src/Runtime/Source/system/Qt3DSTypes.h
diff --git a/src/Runtime/Source/System/Source/Qt3DSVector3.cpp b/src/Runtime/Source/system/Qt3DSVector3.cpp
index 2d790f95..2d790f95 100644
--- a/src/Runtime/Source/System/Source/Qt3DSVector3.cpp
+++ b/src/Runtime/Source/system/Qt3DSVector3.cpp
diff --git a/src/Runtime/Source/System/Include/Qt3DSVector3.h b/src/Runtime/Source/system/Qt3DSVector3.h
index 08df028b..08df028b 100644
--- a/src/Runtime/Source/System/Include/Qt3DSVector3.h
+++ b/src/Runtime/Source/system/Qt3DSVector3.h
diff --git a/src/Runtime/Source/System/Include/SystemPrefix.h b/src/Runtime/Source/system/SystemPrefix.h
index aa1ba185..aa1ba185 100644
--- a/src/Runtime/Source/System/Include/SystemPrefix.h
+++ b/src/Runtime/Source/system/SystemPrefix.h
diff --git a/src/Runtime/Source/UIPParser/Include/Qt3DSIPresentation.h b/src/Runtime/Source/uipparser/Qt3DSIPresentation.h
index 00f3d15a..00f3d15a 100644
--- a/src/Runtime/Source/UIPParser/Include/Qt3DSIPresentation.h
+++ b/src/Runtime/Source/uipparser/Qt3DSIPresentation.h
diff --git a/src/Runtime/Source/UIPParser/Include/Qt3DSUIPParser.h b/src/Runtime/Source/uipparser/Qt3DSUIPParser.h
index 1c31d457..1c31d457 100644
--- a/src/Runtime/Source/UIPParser/Include/Qt3DSUIPParser.h
+++ b/src/Runtime/Source/uipparser/Qt3DSUIPParser.h
diff --git a/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserActionHelper.cpp b/src/Runtime/Source/uipparser/Qt3DSUIPParserActionHelper.cpp
index ab6d751d..ab6d751d 100644
--- a/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserActionHelper.cpp
+++ b/src/Runtime/Source/uipparser/Qt3DSUIPParserActionHelper.cpp
diff --git a/src/Runtime/Source/UIPParser/Include/Qt3DSUIPParserActionHelper.h b/src/Runtime/Source/uipparser/Qt3DSUIPParserActionHelper.h
index 3d9d44ce..3d9d44ce 100644
--- a/src/Runtime/Source/UIPParser/Include/Qt3DSUIPParserActionHelper.h
+++ b/src/Runtime/Source/uipparser/Qt3DSUIPParserActionHelper.h
diff --git a/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserImpl.cpp b/src/Runtime/Source/uipparser/Qt3DSUIPParserImpl.cpp
index a9c581aa..a9c581aa 100644
--- a/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserImpl.cpp
+++ b/src/Runtime/Source/uipparser/Qt3DSUIPParserImpl.cpp
diff --git a/src/Runtime/Source/UIPParser/Include/Qt3DSUIPParserImpl.h b/src/Runtime/Source/uipparser/Qt3DSUIPParserImpl.h
index 1a7ac778..1a7ac778 100644
--- a/src/Runtime/Source/UIPParser/Include/Qt3DSUIPParserImpl.h
+++ b/src/Runtime/Source/uipparser/Qt3DSUIPParserImpl.h
diff --git a/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserObjectRefHelper.cpp b/src/Runtime/Source/uipparser/Qt3DSUIPParserObjectRefHelper.cpp
index 19af2a9d..19af2a9d 100644
--- a/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserObjectRefHelper.cpp
+++ b/src/Runtime/Source/uipparser/Qt3DSUIPParserObjectRefHelper.cpp
diff --git a/src/Runtime/Source/UIPParser/Include/Qt3DSUIPParserObjectRefHelper.h b/src/Runtime/Source/uipparser/Qt3DSUIPParserObjectRefHelper.h
index fcd16985..fcd16985 100644
--- a/src/Runtime/Source/UIPParser/Include/Qt3DSUIPParserObjectRefHelper.h
+++ b/src/Runtime/Source/uipparser/Qt3DSUIPParserObjectRefHelper.h
diff --git a/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.cpp b/src/Runtime/Source/viewer/Qt3DSAudioPlayerImpl.cpp
index b9fb9763..b9fb9763 100644
--- a/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.cpp
+++ b/src/Runtime/Source/viewer/Qt3DSAudioPlayerImpl.cpp
diff --git a/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.h b/src/Runtime/Source/viewer/Qt3DSAudioPlayerImpl.h
index bba5bd6a..bba5bd6a 100644
--- a/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.h
+++ b/src/Runtime/Source/viewer/Qt3DSAudioPlayerImpl.h
diff --git a/src/Runtime/Source/Viewer/Qt3DSViewerApp.cpp b/src/Runtime/Source/viewer/Qt3DSViewerApp.cpp
index d393f2af..d393f2af 100644
--- a/src/Runtime/Source/Viewer/Qt3DSViewerApp.cpp
+++ b/src/Runtime/Source/viewer/Qt3DSViewerApp.cpp
diff --git a/src/Runtime/Source/Viewer/Qt3DSViewerApp.h b/src/Runtime/Source/viewer/Qt3DSViewerApp.h
index 0d56c3a1..0d56c3a1 100644
--- a/src/Runtime/Source/Viewer/Qt3DSViewerApp.h
+++ b/src/Runtime/Source/viewer/Qt3DSViewerApp.h
diff --git a/src/Runtime/Source/Viewer/Qt3DSViewerTimer.h b/src/Runtime/Source/viewer/Qt3DSViewerTimer.h
index de679ce9..de679ce9 100644
--- a/src/Runtime/Source/Viewer/Qt3DSViewerTimer.h
+++ b/src/Runtime/Source/viewer/Qt3DSViewerTimer.h
diff --git a/src/Runtime/Source/Viewer/PerfLog/SimpleTCPClientSocket.cpp b/src/Runtime/Source/viewer/perflog/SimpleTCPClientSocket.cpp
index b8e290f8..b8e290f8 100644
--- a/src/Runtime/Source/Viewer/PerfLog/SimpleTCPClientSocket.cpp
+++ b/src/Runtime/Source/viewer/perflog/SimpleTCPClientSocket.cpp
diff --git a/src/Runtime/Source/Viewer/PerfLog/SimpleTCPClientSocket.h b/src/Runtime/Source/viewer/perflog/SimpleTCPClientSocket.h
index c320f7fd..c320f7fd 100644
--- a/src/Runtime/Source/Viewer/PerfLog/SimpleTCPClientSocket.h
+++ b/src/Runtime/Source/viewer/perflog/SimpleTCPClientSocket.h
diff --git a/src/Runtime/Source/Viewer/PerfLog/SimpleTCPServerSocket.cpp b/src/Runtime/Source/viewer/perflog/SimpleTCPServerSocket.cpp
index 44202739..44202739 100644
--- a/src/Runtime/Source/Viewer/PerfLog/SimpleTCPServerSocket.cpp
+++ b/src/Runtime/Source/viewer/perflog/SimpleTCPServerSocket.cpp
diff --git a/src/Runtime/Source/Viewer/PerfLog/SimpleTCPServerSocket.h b/src/Runtime/Source/viewer/perflog/SimpleTCPServerSocket.h
index 565dd736..565dd736 100644
--- a/src/Runtime/Source/Viewer/PerfLog/SimpleTCPServerSocket.h
+++ b/src/Runtime/Source/viewer/perflog/SimpleTCPServerSocket.h
diff --git a/src/Runtime/Source/Viewer/PerfLog/TCPPerfLogClient.cpp b/src/Runtime/Source/viewer/perflog/TCPPerfLogClient.cpp
index a8be5b27..a8be5b27 100644
--- a/src/Runtime/Source/Viewer/PerfLog/TCPPerfLogClient.cpp
+++ b/src/Runtime/Source/viewer/perflog/TCPPerfLogClient.cpp
diff --git a/src/Runtime/Source/Viewer/PerfLog/TCPPerfLogClient.h b/src/Runtime/Source/viewer/perflog/TCPPerfLogClient.h
index 8a39dab6..8a39dab6 100644
--- a/src/Runtime/Source/Viewer/PerfLog/TCPPerfLogClient.h
+++ b/src/Runtime/Source/viewer/perflog/TCPPerfLogClient.h
diff --git a/src/Runtime/Source/Viewer/PerfLog/TCPPerfLogClientStub.h b/src/Runtime/Source/viewer/perflog/TCPPerfLogClientStub.h
index 2b6c0975..2b6c0975 100644
--- a/src/Runtime/Source/Viewer/PerfLog/TCPPerfLogClientStub.h
+++ b/src/Runtime/Source/viewer/perflog/TCPPerfLogClientStub.h
diff --git a/src/Runtime/Source/Viewer/PerfLog/TCPPerfLogCommon.h b/src/Runtime/Source/viewer/perflog/TCPPerfLogCommon.h
index 23bc58f2..23bc58f2 100644
--- a/src/Runtime/Source/Viewer/PerfLog/TCPPerfLogCommon.h
+++ b/src/Runtime/Source/viewer/perflog/TCPPerfLogCommon.h
diff --git a/src/Runtime/Source/Viewer/PerfLog/TCPPerfLogServer.cpp b/src/Runtime/Source/viewer/perflog/TCPPerfLogServer.cpp
index b62663b2..b62663b2 100644
--- a/src/Runtime/Source/Viewer/PerfLog/TCPPerfLogServer.cpp
+++ b/src/Runtime/Source/viewer/perflog/TCPPerfLogServer.cpp
diff --git a/src/Runtime/Source/Viewer/PerfLog/TCPPerfLogServer.h b/src/Runtime/Source/viewer/perflog/TCPPerfLogServer.h
index bfa6abcc..bfa6abcc 100644
--- a/src/Runtime/Source/Viewer/PerfLog/TCPPerfLogServer.h
+++ b/src/Runtime/Source/viewer/perflog/TCPPerfLogServer.h
diff --git a/src/Runtime/Source/Viewer/qt3dsruntimeglobal.h b/src/Runtime/Source/viewer/qt3dsruntimeglobal.h
index 6732c85d..6732c85d 100644
--- a/src/Runtime/Source/Viewer/qt3dsruntimeglobal.h
+++ b/src/Runtime/Source/viewer/qt3dsruntimeglobal.h
diff --git a/src/Runtime/commoninclude.pri b/src/Runtime/commoninclude.pri
index 1f355c97..bf7d92d2 100644
--- a/src/Runtime/commoninclude.pri
+++ b/src/Runtime/commoninclude.pri
@@ -13,25 +13,23 @@ DEFINES += COMPILED_FROM_DSP \
 
 INCLUDEPATH += \
     $$PWD/Source \
-    $$PWD/Source/DataModel/Include \
-    $$PWD/Source/Runtime/Include \
-    $$PWD/Source/System/Include \
-    $$PWD/Source/Engine/Include \
-    $$PWD/Source/Qt3DSFoundation/Include \
-    $$PWD/Source/Qt3DSRender/Include \
-    $$PWD/Source/Qt3DSRender/Source \
-    $$PWD/Source/Qt3DSRender/Source/gl2 \
-    $$PWD/Source/Qt3DSRender/Source/gl3 \
-    $$PWD/Source/Qt3DSRender/Source/glg \
-    $$PWD/Source/UIPParser/Include \
-    $$PWD/Source/Qt3DSState/Include \
-    $$PWD/Source/Qt3DSStateApplication/Include \
-    $$PWD/Source/Qt3DSStateApplication/Editor \
-    $$PWD/Source/Qt3DSStateApplication/Debugger \
-    $$PWD/Source/Qt3DSEvent/Include \
-    $$PWD/Source/Qt3DSEvent/InternalInclude \
-    $$PWD/Source/Viewer \
-    $$PWD/Source/Viewer/PerfLog \
+    $$PWD/Source/datamodel \
+    $$PWD/Source/runtime \
+    $$PWD/Source/system \
+    $$PWD/Source/engine \
+    $$PWD/Source/foundation \
+    $$PWD/Source/render \
+    $$PWD/Source/render/gl2 \
+    $$PWD/Source/render/gl3 \
+    $$PWD/Source/render/glg \
+    $$PWD/Source/uipparser \
+    $$PWD/Source/state \
+    $$PWD/Source/stateapplication \
+    $$PWD/Source/stateapplication/editor \
+    $$PWD/Source/stateapplication/debugger \
+    $$PWD/Source/event \
+    $$PWD/Source/viewer \
+    $$PWD/Source/viewer/perflog \
     $$PWD/../Authoring/QT3DSIMP/Qt3DSImportLib \
     $$PWD/../Authoring/QT3DSDM \
     $$PWD/../Authoring/QT3DSDM/Systems \
@@ -41,9 +39,9 @@ INCLUDEPATH += \
     $$PWD/../3rdparty/color \
     $$PWD/../3rdparty/RuntimePlatformSpecific/$$PlatformSpecificDir/PlatformLibs \
     $$PWD/../QtExtras/qmlstreamer \
-    $$PWD/Source/Qt3DSRuntimeRender/Include \
-    $$PWD/Source/Qt3DSRuntimeRender/GraphObjects \
-    $$PWD/Source/Qt3DSRuntimeRender/ResourceManager
+    $$PWD/Source/runtimerender \
+    $$PWD/Source/runtimerender/graphobjects \
+    $$PWD/Source/runtimerender/resourcemanager
 
 # TODO: Investigate whether these can be moved to commonplatform
 win32-msvc {
@@ -54,7 +52,7 @@ win32-msvc {
 
 win32 {
 INCLUDEPATH += \
-    $$PWD/Source/PlatformSpecific/Windows/Qt3DSLibs \
+    $$PWD/Source/platformspecific/windows/libs \
     $$PWD/../3rdparty/RuntimePlatformSpecific/Windows/Qt3DSLibs
 }
 
@@ -62,30 +60,28 @@ linux|qnx {
 QMAKE_CXXFLAGS += -fpermissive
 QMAKE_CFLAGS += -fpermissive
 INCLUDEPATH += \
-    $$PWD/Source/Qt3DSFoundation/Include/foundation/linux \
-    $$PWD/Source/Qt3DSFoundation/Source/foundation/linux \
-    $$PWD/Source/PlatformSpecific/Linux/Qt3DSLibs \
+    $$PWD/Source/foundation/linux \
+    $$PWD/Source/platformspecific/linux/libs \
     $$PWD/../3rdparty/RuntimePlatformSpecific/Linux/Qt3DSLibs
 }
 
 integrity {
 INCLUDEPATH += \
-    $$PWD/Source/Qt3DSFoundation/Include/foundation/linux \
-    $$PWD/Source/Qt3DSFoundation/Source/foundation/linux \
-    $$PWD/Source/PlatformSpecific/Linux/Qt3DSLibs \
+    $$PWD/Source/foundation/linux \
+    $$PWD/Source/platformspecific/linux/libs \
     $$PWD/../3rdparty/RuntimePlatformSpecific/Linux/Qt3DSLibs
 }
 
 macos {
 INCLUDEPATH += \
   $$PWD/../3rdparty/RuntimePlatformSpecific/Macos/Qt3DSLibs \
-  $$PWD/Source/PlatformSpecific/Macos/Qt3DSLibs
+  $$PWD/Source/platformspecific/macos/libs
 
 }
 
 android {
 INCLUDEPATH += \
-    $$PWD/Source/PlatformSpecific/Android/jni/Qt3DSLibs/nv_thread \
+    $$PWD/Source/platformspecific/android/jni/libs/nv_thread \
     $$PWD/../3rdparty/RuntimePlatformSpecific/Android/jni/Qt3DSLibs \
     $$PWD/../3rdparty/RuntimePlatformSpecific/Android/jni
 }
diff --git a/src/commonplatform.pri b/src/commonplatform.pri
index 92fb248f..cec9d152 100644
--- a/src/commonplatform.pri
+++ b/src/commonplatform.pri
@@ -18,17 +18,17 @@ DEFINES += \
     _UNICODE \
     NO_BOOST
 
-win32: PlatformSpecificDir = Windows
-macos: PlatformSpecificDir = Macos
-linux|integrity|qnx: PlatformSpecificDir = Linux
-android: PlatformSpecificDir = Android/jni
+win32: PlatformSpecificDir = windows
+macos: PlatformSpecificDir = macos
+linux|integrity|qnx: PlatformSpecificDir = linux
+android: PlatformSpecificDir = android/jni
 
 integrity: {
     DEFINES += _LINUX
     DEFINES += _INTEGRITYPLATFORM
 }
 
-INCLUDEPATH += $$PWD/Runtime/Source/PlatformSpecific/$$PlatformSpecificDir
+INCLUDEPATH += $$PWD/Runtime/Source/platformspecific/$$PlatformSpecificDir
 
 THIRDPARTY_DIR = $$(QT3DSTUDIO_3RDPARTY_DIR)
 isEmpty(THIRDPARTY_DIR) {