Move files required by OpenGL runtime within ogl-runtime directory

First step towards ejecting ogl-runtime in to its own repository.

Task-number: QT3DS-3596
Change-Id: I8c551aef5f680d89221a8075bbeff8857ad2a318
Reviewed-by: Jari Karppinen <jari.karppinen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 

1003 files changed, 1255 insertions, 927 deletions

diff --git a/.gitmodules b/.gitmodules
index 48e2a4d9..6040d0a9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "src/3rdparty/ColladaDOM"]
 	path = src/3rdparty/ColladaDOM
 	url = ../qt3dstudio-collada-dom.git
-[submodule "src/3rdparty/EASTL"]
-	path = src/3rdparty/EASTL
+[submodule "src/Runtime/ogl-runtime/src/3rdparty/EASTL"]
+	path = src/Runtime/ogl-runtime/src/3rdparty/EASTL
 	url = ../qt3dstudio-eastl.git
 [submodule "src/3rdparty/pcre"]
 	path = src/3rdparty/pcre
diff --git a/src/3rdparty/3rdparty.pro b/src/3rdparty/3rdparty.pro
index 66db810a..97adab35 100644
--- a/src/3rdparty/3rdparty.pro
+++ b/src/3rdparty/3rdparty.pro
@@ -1,7 +1,5 @@
 TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS += \
-    EASTL
 
 !cross_compile:!qnx {
     SUBDIRS += \
diff --git a/src/Authoring/Authoring.pro b/src/Authoring/Authoring.pro
index 025a7b42..da658893 100644
--- a/src/Authoring/Authoring.pro
+++ b/src/Authoring/Authoring.pro
@@ -2,7 +2,6 @@ TEMPLATE = subdirs
 CONFIG += ordered
 
 SUBDIRS += \
-    QT3DSDM \
     CoreLib \
     Common \
     Studio/Qt3DStudio.pro
diff --git a/src/Authoring/Common/Common.pro b/src/Authoring/Common/Common.pro
index 40afde5c..d154d36e 100644
--- a/src/Authoring/Common/Common.pro
+++ b/src/Authoring/Common/Common.pro
@@ -24,18 +24,18 @@ INCLUDEPATH += \
     Code/Serialize \
     ../Client/Code/Shared \
     ../Client/Code/Core/Utility \
-    ../QT3DSDM \
-    ../QT3DSDM/Systems \
+    ../../Runtime/ogl-runtime/src/dm \
+    ../../Runtime/ogl-runtime/src/dm/systems \
     ../Studio/Utils \
-    ../../Runtime/Source/foundation \
-    ../../3rdparty/EASTL/UnknownVersion/include \
-    ../../3rdparty/color \
+    ../../Runtime/ogl-runtime/src/foundation \
+    ../../Runtime/ogl-runtime/src/3rdparty/EASTL/UnknownVersion/include \
+    ../../Runtime/ogl-runtime/src/3rdparty/color \
     ..
 
 PRECOMPILED_HEADER += Code/Qt3DSCommonPrecompile.h
 
 SOURCES += \
-    ../../3rdparty/color/CColor.cpp \
+    ../../Runtime/ogl-runtime/src/3rdparty/color/CColor.cpp \
     Code/HiResTimer.cpp \
     Code/MasterP.cpp \
     Code/MethProf.cpp \
diff --git a/src/Authoring/CoreLib/CoreLib.pro b/src/Authoring/CoreLib/CoreLib.pro
index 118e432d..30e5ad81 100644
--- a/src/Authoring/CoreLib/CoreLib.pro
+++ b/src/Authoring/CoreLib/CoreLib.pro
@@ -33,10 +33,11 @@ INCLUDEPATH += \
     ../Client/Code/Shared/Log \
     ../Client/Code/Core/Timer \
     ../Client/Code/Core/VirtualAssets \
+    ../../Runtime/ogl-runtime/src/importlib \
     ../QT3DSIMP/Qt3DSImportLib \
-    ../QT3DSDM/Systems \
-    ../QT3DSDM/Systems/Cores \
     ../QT3DSIMP/Qt3DSImportSGTranslation \
+    ../../Runtime/ogl-runtime/src/dm/systems \
+    ../../Runtime/ogl-runtime/src/dm/systems/cores \
     ../Studio \
     ../Studio/DragAndDrop \
     ../Studio/Render \
@@ -53,17 +54,17 @@ INCLUDEPATH += \
     ../Common/Code/Graph \
     ../Common/Code/EulerAngles \
     ../Common/Code/Serialize \
-    ../../Runtime/Source/datamodel \
-    ../../Runtime/Source/render \
-    ../../Runtime/Source/foundation \
-    ../../Runtime/Source/runtimerender \
-    ../../Runtime/Source/runtimerender/graphobjects \
-    ../../Runtime/Source/runtimerender/resourcemanager \
-    ../../3rdparty/EASTL/UnknownVersion/include \
+    ../../Runtime/ogl-runtime/src/datamodel \
+    ../../Runtime/ogl-runtime/src/render \
+    ../../Runtime/ogl-runtime/src/foundation \
+    ../../Runtime/ogl-runtime/src/runtimerender \
+    ../../Runtime/ogl-runtime/src/runtimerender/graphobjects \
+    ../../Runtime/ogl-runtime/src/runtimerender/resourcemanager \
+    ../../Runtime/ogl-runtime/src/3rdparty/EASTL/UnknownVersion/include \
     $$QMAKE_INCDIR_FBX \
     ../../3rdparty/ColladaDOM/2.4.0/dom/include \
     ../../3rdparty/ColladaDOM/2.4.0/dom/include/1.4 \
-    ../../3rdparty/color \
+    ../../Runtime/ogl-runtime/src/3rdparty/color \
     ..
 
 PRECOMPILED_HEADER = ../Common/Code/Qt3DSCommonPrecompile.h
@@ -113,12 +114,12 @@ SOURCES += \
     ../Client/Code/Core/Timer/Timer.cpp \
     ../Client/Code/Core/VirtualAssets/PlaybackClock.cpp \
     ../Client/Code/Core/VirtualAssets/VClockPolicy.cpp \
+    ../../Runtime/ogl-runtime/src/importlib/Qt3DSImportMesh.cpp \
+    ../../Runtime/ogl-runtime/src/importlib/Qt3DSImportMeshBuilder.cpp \
+    ../../Runtime/ogl-runtime/src/importlib/Qt3DSImportPath.cpp \
     ../QT3DSIMP/Qt3DSImportLib/Qt3DSImport.cpp \
     ../QT3DSIMP/Qt3DSImportLib/Qt3DSImportComposerTypes.cpp \
-    ../QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.cpp \
-    ../QT3DSIMP/Qt3DSImportLib/Qt3DSImportMeshBuilder.cpp \
     ../QT3DSIMP/Qt3DSImportLib/Qt3DSImportMeshStudioOnly.cpp \
-    ../QT3DSIMP/Qt3DSImportLib/Qt3DSImportPath.cpp \
     ../QT3DSIMP/Qt3DSImportLib/Qt3DSImportPerformImport.cpp \
     ../QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportColladaSGTranslation.cpp \
     ../QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportFbxSGTranslation.cpp \
diff --git a/src/Authoring/FBXLineExporter/FBXLineExporter.pro b/src/Authoring/FBXLineExporter/FBXLineExporter.pro
index 5ae46df8..aaac8d3e 100644
--- a/src/Authoring/FBXLineExporter/FBXLineExporter.pro
+++ b/src/Authoring/FBXLineExporter/FBXLineExporter.pro
@@ -9,9 +9,9 @@ QT -= gui
 DEFINES += _UNICODE QT3DS_AUTHORING _AFXDLL PCRE_STATIC
 
 INCLUDEPATH += \
-    ../../Runtime/Source/foundation \
+    ../../Runtime/ogl-runtime/src/foundation \
     $$QMAKE_INCDIR_FBX \
-    ../../3rdparty/EASTL/UnknownVersion/include
+    ../../Runtime/ogl-runtime/src/3rdparty/EASTL/UnknownVersion/include
 
 LIBS += \
     $$QMAKE_LIBS_FBX \
diff --git a/src/Authoring/MorphLines/MorphLines.pro b/src/Authoring/MorphLines/MorphLines.pro
index 9cdace66..7885d743 100644
--- a/src/Authoring/MorphLines/MorphLines.pro
+++ b/src/Authoring/MorphLines/MorphLines.pro
@@ -10,9 +10,9 @@ DEFINES += _UNICODE QT3DS_AUTHORING _AFXDLL PCRE_STATIC
 
 INCLUDEPATH += \
     ../QT3DSIMP/Qt3DSImportLib \
-    ../../Runtime/Source/render \
-    ../../Runtime/Source/foundation \
-    ../../3rdparty/EASTL/UnknownVersion/include
+    ../../Runtime/ogl-runtime/src/render \
+    ../../Runtime/ogl-runtime/src/foundation \
+    ../../Runtime/ogl-runtime/src/3rdparty/EASTL/UnknownVersion/include
 
 LIBS += \
     $$QMAKE_LIBS_FBX \
diff --git a/src/Authoring/QT3DSDM/QT3DSDM.pro b/src/Authoring/QT3DSDM/QT3DSDM.pro
deleted file mode 100644
index 11a63370..00000000
--- a/src/Authoring/QT3DSDM/QT3DSDM.pro
+++ /dev/null
@@ -1,59 +0,0 @@
-TEMPLATE = lib
-TARGET = QT3DSDM
-CONFIG += staticlib
-include(../commoninclude.pri)
-
-DEFINES += QT3DS_AUTHORING _AFXDLL PCRE_STATIC _UNICODE
-
-linux {
-    DEFINES += QT3DSDM_META_DATA_NO_SIGNALS
-}
-
-INCLUDEPATH += \
-    \
-    Systems \
-    Systems/Cores \
-    ../../Runtime/Source/system \
-    ../../Runtime/Source/foundation \
-    ../../Runtime/Source/runtimerender \
-    ../../Runtime/Source/datamodel \
-    ../../Runtime/Source/render \
-    ../../3rdparty/EASTL/UnknownVersion/include \
-    ../../3rdparty/color \
-    ..
-
-PRECOMPILED_HEADER = Qt3DSDMPrefix.h
-
-SOURCES += \
-    EASTL_new.cpp \
-    Systems/ActionSystem.cpp \
-    Systems/SignalsImpl.cpp \
-    Systems/SlideSystem.cpp \
-    Systems/StudioAnimationSystem.cpp \
-    Systems/StudioCoreSystem.cpp \
-    Systems/StudioFullSystem.cpp \
-    Systems/StudioPropertySystem.cpp \
-    Systems/Qt3DSDMComposerTypeDefinitions.cpp \
-    Systems/Qt3DSDMGuides.cpp \
-    Systems/Qt3DSDMMetaData.cpp \
-    Systems/Qt3DSDMSignalSystem.cpp \
-    Systems/Qt3DSDMStringTable.cpp \
-    Systems/Qt3DSDMValue.cpp \
-    Systems/Qt3DSDMXML.cpp \
-    Systems/Cores/ActionCoreProducer.cpp \
-    Systems/Cores/AnimationCoreProducer.cpp \
-    Systems/Cores/DataCoreProducer.cpp \
-    Systems/Cores/SimpleActionCore.cpp \
-    Systems/Cores/SimpleAnimationCore.cpp \
-    Systems/Cores/SimpleDataCore.cpp \
-    Systems/Cores/SimpleSlideCore.cpp \
-    Systems/Cores/SimpleSlideGraphCore.cpp \
-    Systems/Cores/SlideCoreProducer.cpp \
-    Systems/Cores/SlideGraphCoreProducer.cpp \
-
-HEADERS += \
-    Systems/Qt3DSDMDataTypes.h \
-    Systems/Qt3DSDMMetaDataTypes.h \
-    Systems/Qt3DSDMMetaDataValue.h \
-    Systems/Qt3DSDMMetaData.h \
-    Systems/Qt3DSDMWStrOpsImpl.h
diff --git a/src/Authoring/Studio/Qt3DStudio.pro b/src/Authoring/Studio/Qt3DStudio.pro
index 0b9be69c..3a80df6d 100644
--- a/src/Authoring/Studio/Qt3DStudio.pro
+++ b/src/Authoring/Studio/Qt3DStudio.pro
@@ -54,7 +54,6 @@ INCLUDEPATH += \
     .. \
     ../QT3DSIMP/Qt3DSImportLib \
     ../QT3DSIMP/Qt3DSImportSGTranslation \
-    ../QT3DSDM/Systems \
     ../Common/Code/Thread \
     ../Common/Code/IO \
     ../Common/Code \
@@ -73,15 +72,17 @@ INCLUDEPATH += \
     ../Client/Code/Core/Doc/ClientDataModelBridge \
     ../Client/Code/Shared \
     ../Client/Code/Shared/Log \
-    ../../Runtime/Source/render \
-    ../../Runtime/Source/foundation \
-    ../../Runtime/Source/runtimerender \
-    ../../Runtime/Source/runtimerender/graphobjects \
-    ../../Runtime/Source/runtimerender/resourcemanager \
-    ../../Runtime/Source/event \
-    ../../3rdparty/EASTL/UnknownVersion/include \
-    ../../3rdparty/color \
-    ../../QtExtras/qmlstreamer
+    ../../Runtime/ogl-runtime/src/importlib \
+    ../../Runtime/ogl-runtime/src/dm/systems \
+    ../../Runtime/ogl-runtime/src/render \
+    ../../Runtime/ogl-runtime/src/foundation \
+    ../../Runtime/ogl-runtime/src/runtimerender \
+    ../../Runtime/ogl-runtime/src/runtimerender/graphobjects \
+    ../../Runtime/ogl-runtime/src/runtimerender/resourcemanager \
+    ../../Runtime/ogl-runtime/src/event \
+    ../../Runtime/ogl-runtime/src/3rdparty/EASTL/UnknownVersion/include \
+    ../../Runtime/ogl-runtime/src/3rdparty/color \
+    ../../Runtime/ogl-runtime/src/qmlstreamer
 
 linux {
     BEGIN_ARCHIVE = -Wl,--whole-archive
diff --git a/src/Authoring/commoninclude.pri b/src/Authoring/commoninclude.pri
index 889deb49..5eba100c 100644
--- a/src/Authoring/commoninclude.pri
+++ b/src/Authoring/commoninclude.pri
@@ -17,31 +17,31 @@ mingw:win32 {
     DEFINES += WIN32
 }
 
-INCLUDEPATH += $$PWD/../Runtime/Source
+INCLUDEPATH += $$PWD/../Runtime/ogl-runtime/src
 
 win32 {
 INCLUDEPATH += \
-    $$PWD/../Runtime/Source/platformspecific/windows/libs \
-    $$PWD/../3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs \
-    $$PWD/../3rdparty/RuntimePlatformSpecific/Windows/Qt3DSLibs
+    $$PWD/../Runtime/ogl-runtime/src/platformspecific/windows/libs \
+    $$PWD/../Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs \
+    $$PWD/../Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/Qt3DSLibs
 }
 
 linux {
 INCLUDEPATH += \
-    $$PWD/../3rdparty/RuntimePlatformSpecific/Linux/PlatformLibs \
-    $$PWD/../Runtime/Source/platformspecific/Linux/libs \
-    $$PWD/../3rdparty/RuntimePlatformSpecific/Linux/Qt3DSLibs
+    $$PWD/../Runtime/ogl-runtime/src/3rdparty/platformspecific/Linux/PlatformLibs \
+    $$PWD/../Runtime/ogl-runtime/src/platformspecific/Linux/libs \
+    $$PWD/../Runtime/ogl-runtime/src/3rdparty/platformspecific/Linux/Qt3DSLibs
 }
 
 macos {
 INCLUDEPATH += \
-    $$PWD/../3rdparty/RuntimePlatformSpecific/Macos/PlatformLibs \
-    $$PWD/../Runtime/Source/platformspecific/macos/libs \
-    $$PWD/../3rdparty/RuntimePlatformSpecific/Macos/Qt3DSLibs
+    $$PWD/../Runtime/ogl-runtime/src/3rdparty/platformspecific/Macos/PlatformLibs \
+    $$PWD/../Runtime/ogl-runtime/src/platformspecific/macos/libs \
+    $$PWD/../Runtime/ogl-runtime/src/3rdparty/platformspecific/Macos/Qt3DSLibs
 
 }
 android {
 INCLUDEPATH += \
-    $$PWD/../Runtime/Source/platformspecific/Android/jni/libs
-    $$PWD/../Runtime/Source/platformspecific/Android/jni/libs/nv_thread
+    $$PWD/../Runtime/ogl-runtime/src/platformspecific/Android/jni/libs
+    $$PWD/../Runtime/ogl-runtime/src/platformspecific/Android/jni/libs/nv_thread
 }
diff --git a/src/QtExtras/QtExtras.pro b/src/QtExtras/QtExtras.pro
deleted file mode 100644
index 36916d01..00000000
--- a/src/QtExtras/QtExtras.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += qmlstreamer
diff --git a/src/Runtime/Qt3DSRuntimeStatic/Qt3DSRuntimeStatic.pro b/src/Runtime/Qt3DSRuntimeStatic/Qt3DSRuntimeStatic.pro
deleted file mode 100644
index 7e446406..00000000
--- a/src/Runtime/Qt3DSRuntimeStatic/Qt3DSRuntimeStatic.pro
+++ /dev/null
@@ -1,656 +0,0 @@
-TEMPLATE = lib
-TARGET = qt3dsruntimestatic
-CONFIG += staticlib
-include(../commoninclude.pri)
-
-!boot2qt:!integrity:!ios {
-    RESOURCES += ../res.qrc
-}
-
-linux {
-    DEFINES += _POSIX_C_SOURCE=199309L
-    QMAKE_LFLAGS += -lrt
-}
-
-DEFINES += QT3DS_BUILDING_LIBRARY DISABLE_MESH_OPTIMIZATION
-
-QT += qml
-QT += quick-private
-
-# Foundation
-SOURCES += \
-    ../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/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/runtime/q3dsmaterialdefinitionparser.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/uipparser/Qt3DSUIPParserActionHelper.cpp \
-    ../Source/uipparser/Qt3DSUIPParserImpl.cpp \
-    ../Source/uipparser/Qt3DSUIPParserObjectRefHelper.cpp \
-    ../Source/runtimerender/Qt3DSRenderContextCore.cpp \
-    ../Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.cpp \
-    ../Source/runtimerender/Qt3DSDistanceFieldRenderer.cpp \
-    ../Source/runtimerender/Qt3DSFontDatabase.cpp \
-    ../Source/runtimerender/Qt3DSDistanceFieldGlyphCacheManager.cpp \
-    ../Source/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp \
-    ../Source/engine/Qt3DSRuntimeView.cpp
-
-HEADERS += \
-    ../Source/foundation/ConvertUTF.h \
-    ../Source/foundation/FileTools.h \
-    ../Source/foundation/StringTools.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/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/runtime/q3dsmaterialdefinitionparser.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/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/state/Qt3DSState.h \
-    ../Source/state/Qt3DSStateTypes.h \
-    ../Source/state/Qt3DSStateScriptContext.h \
-    ../Source/state/Qt3DSStateVisualBindingContextCommands.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 \
-    ../Source/runtimerender/Qt3DSDistanceFieldRenderer.h \
-    ../Source/runtimerender/Qt3DSFontDatabase_p.h \
-    ../Source/runtimerender/Qt3DSDistanceFieldGlyphCacheManager_p.h \
-    ../Source/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h \
-    ../Source/engine/Qt3DSRuntimeView.h
-
-win32 {
-SOURCES += \
-    ../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/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/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/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/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/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/render/Qt3DSRenderAtomicCounterBuffer.cpp \
-    ../Source/render/Qt3DSRenderAttribLayout.cpp \
-    ../Source/render/Qt3DSRenderBaseTypes.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/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/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/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/Qt3DSMetadata.cpp \
-    ../../Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.cpp \
-    ../../Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMeshBuilder.cpp \
-    ../../Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportPath.cpp \
-    ../../Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp \
-    ../../Authoring/QT3DSDM/Systems/Qt3DSDMXML.cpp \
-    ../../Authoring/QT3DSDM/Systems/Qt3DSDMStringTable.cpp \
-    ../../Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp \
-    ../../Authoring/QT3DSDM/Systems/Qt3DSDMValue.cpp \
-    ../../Authoring/QT3DSDM/Systems/Cores/SimpleDataCore.cpp
-
-HEADERS += \
-    ../Source/datamodel/Qt3DSMetadata.h \
-    ../Source/datamodel/DocumentResourceManagerScriptParser.h \
-    ../../Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.h \
-    ../../Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportPath.h \
-    ../../Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.h \
-    ../../Authoring/QT3DSDM/Systems/Qt3DSDMXML.h \
-    ../../Authoring/QT3DSDM/Systems/Qt3DSDMStringTable.h \
-    ../../Authoring/QT3DSDM/Systems/Qt3DSDMHandles.h \
-    ../../Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h \
-    ../../Authoring/QT3DSDM/Systems/Qt3DSDMValue.h \
-    ../../Authoring/QT3DSDM/Systems/Cores/SimpleDataCore.h
-
-# Engine
-HEADERS += \
-    ../Source/engine/EnginePrefix.h
-
-# Event
-SOURCES += \
-    ../Source/event/EventFactory.cpp \
-    ../Source/event/EventPoller.cpp \
-    ../Source/event/EventSystemC.cpp
-
-HEADERS += \
-    ../Source/event/EventPollingSystem.h \
-    ../Source/event/EventSystem.h \
-    ../Source/event/EventSystemC.h
-
-# Render
-HEADERS += \
-    ../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/RuntimePrefix.h \
-    ../Source/runtime/q3dsqmlscript.h \
-    ../Source/runtime/q3dsqmlbehavior.h
-
-SOURCES += \
-    ../Source/runtime/q3dsqmlscript.cpp \
-    ../Source/runtime/q3dsqmlbehavior.cpp
-
-# System
-HEADERS += \
-    ../Source/system/SystemPrefix.h
-
-DISTFILES += \
-    ../Source/runtime/Qt3DSAttributeHashes.txt
diff --git a/src/Runtime/Runtime.pro b/src/Runtime/Runtime.pro
index aedfb1ee..a23a91a0 100644
--- a/src/Runtime/Runtime.pro
+++ b/src/Runtime/Runtime.pro
@@ -1,14 +1,7 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 SUBDIRS += \
-    Qt3DSRuntimeStatic \
-    Qt3DSRuntime \
-    api
-
-win32 {
-SUBDIRS += \
-    AttributeHashes
-}
+    ogl-runtime \
 
 # Qt3D based runtime needs Qt 5.11 or later
 greaterThan(QT_MAJOR_VERSION, 5)|greaterThan(QT_MINOR_VERSION, 10) {
diff --git a/src/Runtime/commoninclude.pri b/src/Runtime/commoninclude.pri
deleted file mode 100644
index 67c27bfd..00000000
--- a/src/Runtime/commoninclude.pri
+++ /dev/null
@@ -1,82 +0,0 @@
-include($$PWD/../commonplatform.pri)
-
-contains(TEMPLATE, lib) {
-    load(qt_helper_lib)
-    # qt_helper_lib assumes non-qt lib, so it clears qt from config - reset that
-    CONFIG += qt exceptions
-}
-QT += core gui openglextensions
-
-DEFINES += COMPILED_FROM_DSP \
-    QT3DSDM_USE_NVLOG QT3DSDM_META_DATA_NO_SIGNALS \
-    QT3DS_AUTOTESTS_ENABLED
-
-INCLUDEPATH += \
-    $$PWD/Source \
-    $$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/event \
-    $$PWD/Source/viewer \
-    $$PWD/Source/viewer/perflog \
-    $$PWD/../Authoring/QT3DSIMP/Qt3DSImportLib \
-    $$PWD/../Authoring/QT3DSDM \
-    $$PWD/../Authoring/QT3DSDM/Systems \
-    $$PWD/../Authoring/QT3DSDM/Systems/Cores \
-    $$PWD/../3rdparty/EASTL/UnknownVersion/include \
-    $$PWD/../3rdparty/RuntimePlatformSpecific/$$PlatformSpecificDir/PlatformLibs \
-    $$PWD/../QtExtras/qmlstreamer \
-    $$PWD/Source/runtimerender \
-    $$PWD/Source/runtimerender/graphobjects \
-    $$PWD/Source/runtimerender/resourcemanager \
-
-# TODO: Investigate whether these can be moved to commonplatform
-win32-msvc {
-    CONFIG += nostrictstrings
-    QMAKE_CXXFLAGS += /EHsc /GA
-    QMAKE_CFLAGS += /EHsc /GA
-}
-
-win32 {
-INCLUDEPATH += \
-    $$PWD/Source/platformspecific/windows/libs \
-    $$PWD/../3rdparty/RuntimePlatformSpecific/Windows/Qt3DSLibs
-}
-
-linux|qnx {
-QMAKE_CXXFLAGS += -fpermissive
-QMAKE_CFLAGS += -fpermissive
-INCLUDEPATH += \
-    $$PWD/Source/foundation/linux \
-    $$PWD/Source/platformspecific/linux/libs \
-    $$PWD/../3rdparty/RuntimePlatformSpecific/Linux/Qt3DSLibs
-}
-
-integrity {
-INCLUDEPATH += \
-    $$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/libs
-
-}
-
-android {
-INCLUDEPATH += \
-    $$PWD/Source/platformspecific/android/jni/libs/nv_thread \
-    $$PWD/../3rdparty/RuntimePlatformSpecific/Android/jni/Qt3DSLibs \
-    $$PWD/../3rdparty/RuntimePlatformSpecific/Android/jni
-}
diff --git a/src/Runtime/ogl-runtime/commoninclude.pri b/src/Runtime/ogl-runtime/commoninclude.pri
new file mode 100644
index 00000000..3940e4d3
--- /dev/null
+++ b/src/Runtime/ogl-runtime/commoninclude.pri
@@ -0,0 +1,82 @@
+include($$PWD/commonplatform.pri)
+
+contains(TEMPLATE, lib) {
+    load(qt_helper_lib)
+    # qt_helper_lib assumes non-qt lib, so it clears qt from config - reset that
+    CONFIG += qt exceptions
+}
+QT += core gui openglextensions
+
+DEFINES += COMPILED_FROM_DSP \
+    QT3DSDM_USE_NVLOG QT3DSDM_META_DATA_NO_SIGNALS \
+    QT3DS_AUTOTESTS_ENABLED
+
+INCLUDEPATH += \
+    $$PWD/src \
+    $$PWD/src/datamodel \
+    $$PWD/src/runtime \
+    $$PWD/src/system \
+    $$PWD/src/engine \
+    $$PWD/src/foundation \
+    $$PWD/src/render \
+    $$PWD/src/render/gl2 \
+    $$PWD/src/render/gl3 \
+    $$PWD/src/render/glg \
+    $$PWD/src/uipparser \
+    $$PWD/src/state \
+    $$PWD/src/event \
+    $$PWD/src/viewer \
+    $$PWD/src/viewer/perflog \
+    $$PWD/src/importlib \
+    $$PWD/src/dm \
+    $$PWD/src/dm/systems \
+    $$PWD/src/dm/systems/cores \
+    $$PWD/src/3rdparty/EASTL/UnknownVersion/include \
+    $$PWD/src/3rdparty/platformspecific/$$PlatformSpecificDir/PlatformLibs \
+    $$PWD/src/qmlstreamer \
+    $$PWD/src/runtimerender \
+    $$PWD/src/runtimerender/graphobjects \
+    $$PWD/src/runtimerender/resourcemanager \
+
+# TODO: Investigate whether these can be moved to commonplatform
+win32-msvc {
+    CONFIG += nostrictstrings
+    QMAKE_CXXFLAGS += /EHsc /GA
+    QMAKE_CFLAGS += /EHsc /GA
+}
+
+win32 {
+INCLUDEPATH += \
+    $$PWD/src/platformspecific/windows/libs \
+    $$PWD/src/3rdparty/platformspecific/Windows/Qt3DSLibs
+}
+
+linux|qnx {
+QMAKE_CXXFLAGS += -fpermissive
+QMAKE_CFLAGS += -fpermissive
+INCLUDEPATH += \
+    $$PWD/src/foundation/linux \
+    $$PWD/src/platformspecific/linux/libs \
+    $$PWD/src/3rdparty/platformspecific/Linux/Qt3DSLibs
+}
+
+integrity {
+INCLUDEPATH += \
+    $$PWD/src/foundation/linux \
+    $$PWD/src/platformspecific/linux/libs \
+    $$PWD/src/3rdparty/platformspecific/Linux/Qt3DSLibs
+}
+
+macos {
+INCLUDEPATH += \
+  $$PWD/src/3rdparty/platformspecific/Macos/Qt3DSLibs \
+  $$PWD/src/platformspecific/macos/libs
+
+}
+
+android {
+INCLUDEPATH += \
+    $$PWD/src/platformspecific/android/jni/libs/nv_thread \
+    $$PWD/src/3rdparty/platformspecific/Android/jni/Qt3DSLibs \
+    $$PWD/src/3rdparty/platformspecific/Android/jni
+}
diff --git a/src/Runtime/ogl-runtime/commonplatform.pri b/src/Runtime/ogl-runtime/commonplatform.pri
new file mode 100644
index 00000000..f5ff9e08
--- /dev/null
+++ b/src/Runtime/ogl-runtime/commonplatform.pri
@@ -0,0 +1,307 @@
+load(qt_build_config)
+load(qt_build_paths)
+
+# Common defines across platforms that should be checked if/where they are used
+# as we remove dependencies to see where we can reduce
+DEFINES += \
+    QT3DS_FOUNDATION_NO_EXPORTS \
+    _CRT_SECURE_NO_DEPRECATE \
+    _CRT_NONSTDC_NO_DEPRECATE \
+    QT3DS_GRAPHICS_API_GL \
+    QT3DS_NO_SEARCH_PATH \
+    QT3DS_RENDER_ENABLE_LOAD_UIP \
+    FONT_NO_RES_DIR \
+    _TEGRA_NO_LOG_FILE \
+    EA_COMPILER_HAS_INTTYPES \
+    EASTL_ALLOCATOR_COPY_ENABLED \
+    UNICODE \
+    _UNICODE \
+    NO_BOOST
+
+win32: PlatformSpecificDir = windows
+macos: PlatformSpecificDir = macos
+linux|integrity|qnx: PlatformSpecificDir = linux
+android: PlatformSpecificDir = android/jni
+
+integrity: {
+    DEFINES += _LINUX
+    DEFINES += _INTEGRITYPLATFORM
+}
+
+INCLUDEPATH += $$PWD/src/platformspecific/$$PlatformSpecificDir
+
+THIRDPARTY_DIR = $$(QT3DSTUDIO_3RDPARTY_DIR)
+isEmpty(THIRDPARTY_DIR) {
+    THIRDPARTY_DIR = $$PWD/3rdparty
+}
+
+contains(QT_ARCH, x86_64) {
+    DEFINES += QT3DS_PROCESSOR_X64
+}
+
+CONFIG(debug, debug|release) {
+    DEFINES += _DEBUG
+} else {
+    DEFINES += NDEBUG
+}
+
+linux|qnx {
+    CONFIG += egl
+    DEFINES+=_LINUX QT3DS_OS_LINUX _LINUXPLATFORM QT3DS_NO_X11 \
+        QT3DS_VIEWER_EXPORTS WIDE_IS_DIFFERENT_TYPE_THAN_CHAR16_T
+    QMAKE_CXXFLAGS_WARN_ON = -Wall -Wno-unused-local-typedefs
+}
+
+linux-clang {
+    DEFINES += __STRICT_ANSI__
+}
+
+macos {
+    DEFINES += _MACOSX _LINUXPLATFORM WIDE_IS_DIFFERENT_TYPE_THAN_CHAR16_T
+    INCLUDEPATH += /usr/local/include
+
+# macOS builds treat most warnings as errors to prevent slipping more warnings
+# in to the code
+
+# Suppress large number of warnings from the Qt 3D Studio Code.
+# Suppressions have been reported in JIRA with these bugs:
+# QT3DS-2214 -Wno-unused-local-typedefs
+# QT3DS-2216 -Wno-inconsistent-missing-override
+# QT3DS-2222 -Wno-reorder
+# QT3DS-2223 -Wno-format
+# QT3DS-2224 -Wno-unused-function
+# QT3DS-2227 -Wno-unused-value
+# QT3DS-2229 -Wno-delete-non-virtual-dtor
+# QT3DS-2234 -Wno-unused-variable
+# QT3DS-2235 -Wno-overloaded-virtual
+# QT3DS-2237 -Wno-unused-private-field
+# QT3DS-2238 -Wno-comment
+# QT3DS-2240 -Wno-enum-compare
+# QT3DS-2241 -Wno-int-to-pointer-cast
+# QT3DS-2242 -Wno-int-to-void-pointer-cast
+# QT3DS-2244 -Wno-unused-lambda-capture
+# QT3DS-2246 -Wno-deprecated-declarations
+# QT3DS-2247 -Wno-pointer-bool-conversion
+# QT3DS-2248 -Wno-self-assign
+# QT3DS-2249 -Wno-tautological-compare
+# QT3DS-2251 -Wno-tautological-constant-out-of-range-compare
+    QMAKE_CXXFLAGS_WARN_ON = -Wall \
+        -Werror \
+        -Wno-unknown-pragmas \
+        -Wno-unused-local-typedefs \
+        -Wno-inconsistent-missing-override \
+        -Wno-reorder \
+        -Wno-format \
+        -Wno-unused-function \
+        -Wno-unused-value \
+        -Wno-delete-non-virtual-dtor \
+        -Wno-unused-variable \
+        -Wno-overloaded-virtual \
+        -Wno-unused-private-field \
+        -Wno-comment \
+        -Wno-enum-compare \
+        -Wno-int-to-pointer-cast \
+        -Wno-int-to-void-pointer-cast \
+        -Wno-unused-lambda-capture \
+        -Wno-deprecated-declarations \
+        -Wno-pointer-bool-conversion \
+        -Wno-self-assign \
+        -Wno-tautological-compare \
+        -Wno-tautological-constant-out-of-range-compare \
+        -Wno-mismatched-tags \
+        -Wno-pragma-pack \
+        -Wno-error=unused-local-typedefs \
+        -Wno-error=inconsistent-missing-override \
+        -Wno-error=reorder \
+        -Wno-error=format \
+        -Wno-error=unused-function \
+        -Wno-error=unused-value \
+        -Wno-error=delete-non-virtual-dtor \
+        -Wno-error=unused-variable \
+        -Wno-error=overloaded-virtual \
+        -Wno-error=unused-private-field \
+        -Wno-error=comment \
+        -Wno-error=enum-compare \
+        -Wno-error=int-to-pointer-cast \
+        -Wno-error=int-to-void-pointer-cast \
+        -Wno-error=unused-lambda-capture \
+        -Wno-error=deprecated-declarations \
+        -Wno-error=pointer-bool-conversion \
+        -Wno-error=self-assign \
+        -Wno-error=tautological-compare \
+        -Wno-error=tautological-constant-out-of-range-compare \
+        -Wno-error=switch \
+        -Wno-error=mismatched-tags \
+        -Wno-error=logical-op-parentheses \
+        -Wno-error=pragmas \
+        -Wno-error=pragma-pack \
+        -Wno-error=mismatched-tags
+
+    QMAKE_CFLAGS_WARN_ON = -Wall \
+        -Werror \
+        -Wno-unknown-pragmas \
+        -Wno-unused-local-typedefs \
+        -Wno-inconsistent-missing-override \
+        -Wno-reorder \
+        -Wno-format \
+        -Wno-unused-function \
+        -Wno-unused-value \
+        -Wno-delete-non-virtual-dtor \
+        -Wno-unused-variable \
+        -Wno-overloaded-virtual \
+        -Wno-unused-private-field \
+        -Wno-comment \
+        -Wno-enum-compare \
+        -Wno-int-to-pointer-cast \
+        -Wno-int-to-void-pointer-cast \
+        -Wno-unused-lambda-capture \
+        -Wno-deprecated-declarations \
+        -Wno-pointer-bool-conversion \
+        -Wno-self-assign \
+        -Wno-tautological-compare \
+        -Wno-tautological-constant-out-of-range-compare \
+        -Wno-mismatched-tags \
+        -Wno-pragma-pack \
+        -Wno-error=unused-local-typedefs \
+        -Wno-error=inconsistent-missing-override \
+        -Wno-error=reorder \
+        -Wno-error=format \
+        -Wno-error=unused-function \
+        -Wno-error=unused-value \
+        -Wno-error=delete-non-virtual-dtor \
+        -Wno-error=unused-variable \
+        -Wno-error=overloaded-virtual \
+        -Wno-error=unused-private-field \
+        -Wno-error=comment \
+        -Wno-error=enum-compare \
+        -Wno-error=int-to-pointer-cast \
+        -Wno-error=int-to-void-pointer-cast \
+        -Wno-error=unused-lambda-capture \
+        -Wno-error=deprecated-declarations \
+        -Wno-error=pointer-bool-conversion \
+        -Wno-error=self-assign \
+        -Wno-error=tautological-compare \
+        -Wno-error=tautological-constant-out-of-range-compare \
+        -Wno-error=switch \
+        -Wno-error=mismatched-tags \
+        -Wno-error=logical-op-parentheses \
+        -Wno-error=pragmas \
+        -Wno-error=pragma-pack \
+        -Wno-error=mismatched-tags
+
+# Suppress the huge pile of Qt related warnings on "direct access in function
+# from file to global weak symbol". These arise when not using devbuilds of Qt.
+    QMAKE_CXXFLAGS += -fvisibility=hidden
+    QMAKE_CFLAGS += -fvisibility=hidden
+}
+
+clang {
+# Suppress large number of warnings from the Qt 3D Studio Code.
+# Suppressions have been reported in JIRA with bugs
+    QMAKE_CXXFLAGS_WARN_ON = -Wall \
+        -Wno-unknown-pragmas \
+        -Wno-unused-local-typedefs \
+        -Wno-inconsistent-missing-override \
+        -Wno-reorder \
+        -Wno-format \
+        -Wno-unused-function \
+        -Wno-unused-value \
+        -Wno-delete-non-virtual-dtor \
+        -Wno-unused-variable \
+        -Wno-overloaded-virtual \
+        -Wno-unused-private-field \
+        -Wno-comment \
+        -Wno-enum-compare \
+        -Wno-int-to-pointer-cast \
+        -Wno-int-to-void-pointer-cast \
+        -Wno-unused-lambda-capture \
+        -Wno-deprecated-declarations \
+        -Wno-pointer-bool-conversion \
+        -Wno-self-assign \
+        -Wno-tautological-compare \
+        -Wno-tautological-constant-out-of-range-compare \
+        -Wno-mismatched-tags \
+        -Wno-pragma-pack
+
+    QMAKE_CFLAGS_WARN_ON = -Wall \
+        -Wno-unknown-pragmas \
+        -Wno-unused-local-typedefs \
+        -Wno-inconsistent-missing-override \
+        -Wno-reorder \
+        -Wno-format \
+        -Wno-unused-function \
+        -Wno-unused-value \
+        -Wno-delete-non-virtual-dtor \
+        -Wno-unused-variable \
+        -Wno-overloaded-virtual \
+        -Wno-unused-private-field \
+        -Wno-comment \
+        -Wno-enum-compare \
+        -Wno-int-to-pointer-cast \
+        -Wno-int-to-void-pointer-cast \
+        -Wno-unused-lambda-capture \
+        -Wno-deprecated-declarations \
+        -Wno-pointer-bool-conversion \
+        -Wno-self-assign \
+        -Wno-tautological-compare \
+        -Wno-tautological-constant-out-of-range-compare \
+        -Wno-mismatched-tags \
+        -Wno-pragma-pack
+
+# Suppress the huge pile of Qt related warnings on "direct access in function
+# from file to global weak symbol". These arise when not using devbuilds of Qt.
+    QMAKE_CXXFLAGS += -fvisibility=hidden
+    QMAKE_CFLAGS += -fvisibility=hidden
+}
+
+android {
+    QMAKE_CXXFLAGS -= -fstack-protector-strong
+    QMAKE_CFLAGS -= -fstack-protector-strong
+    # TODO: Should be done using this instead of copying the GLES headers, but including this
+    # causes lots of conflicting definitions in signal.h for some reason. Feel free to fix it if
+    # you know how. After this works, GLES3 and GLES2 folders can be deleted from
+    # 3rdparty/RuntimePlatformSpecific/Android/jni
+#    INCLUDEPATH += $$(ANDROID_NDK_ROOT)/sysroot/usr/include
+#    DEFINES += __BITS_PER_LONG=32
+}
+
+win32 {
+    DEFINES += QT3DS_OS_WINDOWS _WIN32 _PCPLATFORM \
+        WIDE_IS_DIFFERENT_TYPE_THAN_CHAR16_T KDWIN NOMINMAX
+
+    win32-msvc {
+        QMAKE_CXXFLAGS += /MP /d2Zi+
+        QMAKE_CFLAGS += /MP /d2Zi+
+        # Warning C4251 = needs to have dll-interface to be used by clients of class,
+        #                 it comes from a lot of Qt headers, so disabling it.
+        QMAKE_CXXFLAGS_WARN_ON += -wd4251 #needs to have dll-interface to be used by clients
+    }
+
+    CONFIG(debug, debug|release) {
+        win32-msvc {
+            QMAKE_CXXFLAGS += /Od
+            QMAKE_CFLAGS += /Od
+        }
+    } else {
+        win32-msvc {
+            QMAKE_CXXFLAGS += /Ox
+            QMAKE_CFLAGS += /Ox
+        }
+    }
+
+    contains(QT_ARCH, x86_64) {
+        DEFINES += _WIN64
+    }
+}
+
+BINDIR = $$MODULE_BASE_OUTDIR/bin
+LIBDIR = $$MODULE_BASE_OUTDIR/lib
+LIBS += -L"$$LIBDIR"
+!testcase {
+    contains(TEMPLATE, app) {
+        DESTDIR = $$BINDIR
+    } else {
+        DESTDIR = $$LIBDIR
+        win32: DLLDESTDIR = $$BINDIR
+    }
+}
diff --git a/src/Runtime/ogl-runtime/ogl-runtime.pro b/src/Runtime/ogl-runtime/ogl-runtime.pro
new file mode 100644
index 00000000..6bb3d181
--- /dev/null
+++ b/src/Runtime/ogl-runtime/ogl-runtime.pro
@@ -0,0 +1,6 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS += \
+    src \
+    tools
diff --git a/src/Runtime/platformres.qrc b/src/Runtime/ogl-runtime/platformres.qrc
index af8a564b..af8a564b 100644
--- a/src/Runtime/platformres.qrc
+++ b/src/Runtime/ogl-runtime/platformres.qrc
diff --git a/src/Runtime/res.qrc b/src/Runtime/ogl-runtime/res.qrc
index c5c59b29..c5c59b29 100644
--- a/src/Runtime/res.qrc
+++ b/src/Runtime/ogl-runtime/res.qrc
diff --git a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml b/src/Runtime/ogl-runtime/res/DataModelMetadata/en-us/MetaData.xml
index 951a2fba..951a2fba 100644
--- a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml
+++ b/src/Runtime/ogl-runtime/res/DataModelMetadata/en-us/MetaData.xml
diff --git a/src/Runtime/res/Font/TitilliumWeb-Regular.ttf b/src/Runtime/ogl-runtime/res/Font/TitilliumWeb-Regular.ttf
index 6da82193..6da82193 100644
--- a/src/Runtime/res/Font/TitilliumWeb-Regular.ttf
+++ b/src/Runtime/ogl-runtime/res/Font/TitilliumWeb-Regular.ttf
diff --git a/src/Runtime/res/effectlib/Fxaa3_11.glsllib b/src/Runtime/ogl-runtime/res/effectlib/Fxaa3_11.glsllib
index f5de2089..f5de2089 100644
--- a/src/Runtime/res/effectlib/Fxaa3_11.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/Fxaa3_11.glsllib
diff --git a/src/Runtime/res/effectlib/Fxaa3_8.glsllib b/src/Runtime/ogl-runtime/res/effectlib/Fxaa3_8.glsllib
index 620f5650..620f5650 100644
--- a/src/Runtime/res/effectlib/Fxaa3_8.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/Fxaa3_8.glsllib
diff --git a/src/Runtime/res/effectlib/SMAA.glsllib b/src/Runtime/ogl-runtime/res/effectlib/SMAA.glsllib
index 97e0153a..97e0153a 100644
--- a/src/Runtime/res/effectlib/SMAA.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/SMAA.glsllib
diff --git a/src/Runtime/res/effectlib/SSAOCustomMaterial.glsllib b/src/Runtime/ogl-runtime/res/effectlib/SSAOCustomMaterial.glsllib
index 1d8a1c39..1d8a1c39 100644
--- a/src/Runtime/res/effectlib/SSAOCustomMaterial.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/SSAOCustomMaterial.glsllib
diff --git a/src/Runtime/res/effectlib/abbeNumberIOR.glsllib b/src/Runtime/ogl-runtime/res/effectlib/abbeNumberIOR.glsllib
index 43ed79d8..43ed79d8 100644
--- a/src/Runtime/res/effectlib/abbeNumberIOR.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/abbeNumberIOR.glsllib
diff --git a/src/Runtime/res/effectlib/anisotropyConversion.glsllib b/src/Runtime/ogl-runtime/res/effectlib/anisotropyConversion.glsllib
index b8aae1ed..b8aae1ed 100644
--- a/src/Runtime/res/effectlib/anisotropyConversion.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/anisotropyConversion.glsllib
diff --git a/src/Runtime/res/effectlib/average.glsllib b/src/Runtime/ogl-runtime/res/effectlib/average.glsllib
index 082eec0c..082eec0c 100644
--- a/src/Runtime/res/effectlib/average.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/average.glsllib
diff --git a/src/Runtime/res/effectlib/blendColorLayers.glsllib b/src/Runtime/ogl-runtime/res/effectlib/blendColorLayers.glsllib
index e07fe613..e07fe613 100644
--- a/src/Runtime/res/effectlib/blendColorLayers.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/blendColorLayers.glsllib
diff --git a/src/Runtime/res/effectlib/blur.glsllib b/src/Runtime/ogl-runtime/res/effectlib/blur.glsllib
index 1f3abc86..1f3abc86 100644
--- a/src/Runtime/res/effectlib/blur.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/blur.glsllib
diff --git a/src/Runtime/res/effectlib/calculateRoughness.glsllib b/src/Runtime/ogl-runtime/res/effectlib/calculateRoughness.glsllib
index a14083d6..a14083d6 100644
--- a/src/Runtime/res/effectlib/calculateRoughness.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/calculateRoughness.glsllib
diff --git a/src/Runtime/res/effectlib/coordinateSource.glsllib b/src/Runtime/ogl-runtime/res/effectlib/coordinateSource.glsllib
index bc435d51..bc435d51 100644
--- a/src/Runtime/res/effectlib/coordinateSource.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/coordinateSource.glsllib
diff --git a/src/Runtime/res/effectlib/cube.glsllib b/src/Runtime/ogl-runtime/res/effectlib/cube.glsllib
index 74da8333..74da8333 100644
--- a/src/Runtime/res/effectlib/cube.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/cube.glsllib
diff --git a/src/Runtime/res/effectlib/customCurveLayer.glsllib b/src/Runtime/ogl-runtime/res/effectlib/customCurveLayer.glsllib
index 2bc1780e..2bc1780e 100644
--- a/src/Runtime/res/effectlib/customCurveLayer.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/customCurveLayer.glsllib
diff --git a/src/Runtime/res/effectlib/customMaterial.glsllib b/src/Runtime/ogl-runtime/res/effectlib/customMaterial.glsllib
index 0a4d88b9..0a4d88b9 100644
--- a/src/Runtime/res/effectlib/customMaterial.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/customMaterial.glsllib
diff --git a/src/Runtime/res/effectlib/customMaterialFragBody.glsllib b/src/Runtime/ogl-runtime/res/effectlib/customMaterialFragBody.glsllib
index fccb8e05..fccb8e05 100644
--- a/src/Runtime/res/effectlib/customMaterialFragBody.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/customMaterialFragBody.glsllib
diff --git a/src/Runtime/res/effectlib/customMaterialFragBodyAO.glsllib b/src/Runtime/ogl-runtime/res/effectlib/customMaterialFragBodyAO.glsllib
index d194569e..d194569e 100644
--- a/src/Runtime/res/effectlib/customMaterialFragBodyAO.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/customMaterialFragBodyAO.glsllib
diff --git a/src/Runtime/res/effectlib/defaultMaterialBumpNoLod.glsllib b/src/Runtime/ogl-runtime/res/effectlib/defaultMaterialBumpNoLod.glsllib
index 4144ae2f..4144ae2f 100644
--- a/src/Runtime/res/effectlib/defaultMaterialBumpNoLod.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/defaultMaterialBumpNoLod.glsllib
diff --git a/src/Runtime/res/effectlib/defaultMaterialFileBumpTexture.glsllib b/src/Runtime/ogl-runtime/res/effectlib/defaultMaterialFileBumpTexture.glsllib
index 6901ace0..6901ace0 100644
--- a/src/Runtime/res/effectlib/defaultMaterialFileBumpTexture.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/defaultMaterialFileBumpTexture.glsllib
diff --git a/src/Runtime/res/effectlib/defaultMaterialFileDisplacementTexture.glsllib b/src/Runtime/ogl-runtime/res/effectlib/defaultMaterialFileDisplacementTexture.glsllib
index 4c9af3fc..4c9af3fc 100644
--- a/src/Runtime/res/effectlib/defaultMaterialFileDisplacementTexture.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/defaultMaterialFileDisplacementTexture.glsllib
diff --git a/src/Runtime/res/effectlib/defaultMaterialFileNormalTexture.glsllib b/src/Runtime/ogl-runtime/res/effectlib/defaultMaterialFileNormalTexture.glsllib
index 70ab52bc..70ab52bc 100644
--- a/src/Runtime/res/effectlib/defaultMaterialFileNormalTexture.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/defaultMaterialFileNormalTexture.glsllib
diff --git a/src/Runtime/res/effectlib/defaultMaterialFresnel.glsllib b/src/Runtime/ogl-runtime/res/effectlib/defaultMaterialFresnel.glsllib
index e0eff4ff..e0eff4ff 100644
--- a/src/Runtime/res/effectlib/defaultMaterialFresnel.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/defaultMaterialFresnel.glsllib
diff --git a/src/Runtime/res/effectlib/defaultMaterialLighting.glsllib b/src/Runtime/ogl-runtime/res/effectlib/defaultMaterialLighting.glsllib
index e96a4509..e96a4509 100644
--- a/src/Runtime/res/effectlib/defaultMaterialLighting.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/defaultMaterialLighting.glsllib
diff --git a/src/Runtime/res/effectlib/defaultMaterialPhysGlossyBSDF.glsllib b/src/Runtime/ogl-runtime/res/effectlib/defaultMaterialPhysGlossyBSDF.glsllib
index 1035e436..1035e436 100644
--- a/src/Runtime/res/effectlib/defaultMaterialPhysGlossyBSDF.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/defaultMaterialPhysGlossyBSDF.glsllib
diff --git a/src/Runtime/res/effectlib/depthpass.glsllib b/src/Runtime/ogl-runtime/res/effectlib/depthpass.glsllib
index cbd45c24..cbd45c24 100644
--- a/src/Runtime/res/effectlib/depthpass.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/depthpass.glsllib
diff --git a/src/Runtime/res/effectlib/dfTint.glsllib b/src/Runtime/ogl-runtime/res/effectlib/dfTint.glsllib
index f1f4b7ac..f1f4b7ac 100644
--- a/src/Runtime/res/effectlib/dfTint.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/dfTint.glsllib
diff --git a/src/Runtime/res/effectlib/diffuseReflectionBSDF.glsllib b/src/Runtime/ogl-runtime/res/effectlib/diffuseReflectionBSDF.glsllib
index a98509d9..a98509d9 100644
--- a/src/Runtime/res/effectlib/diffuseReflectionBSDF.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/diffuseReflectionBSDF.glsllib
diff --git a/src/Runtime/res/effectlib/diffuseTransmissionBSDF.glsllib b/src/Runtime/ogl-runtime/res/effectlib/diffuseTransmissionBSDF.glsllib
index f6e5f52b..f6e5f52b 100644
--- a/src/Runtime/res/effectlib/diffuseTransmissionBSDF.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/diffuseTransmissionBSDF.glsllib
diff --git a/src/Runtime/res/effectlib/directionalFactor.glsllib b/src/Runtime/ogl-runtime/res/effectlib/directionalFactor.glsllib
index 78af8839..78af8839 100644
--- a/src/Runtime/res/effectlib/directionalFactor.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/directionalFactor.glsllib
diff --git a/src/Runtime/res/effectlib/distancefieldtext.frag b/src/Runtime/ogl-runtime/res/effectlib/distancefieldtext.frag
index 1d834902..1d834902 100644
--- a/src/Runtime/res/effectlib/distancefieldtext.frag
+++ b/src/Runtime/ogl-runtime/res/effectlib/distancefieldtext.frag
diff --git a/src/Runtime/res/effectlib/distancefieldtext.vert b/src/Runtime/ogl-runtime/res/effectlib/distancefieldtext.vert
index f6b2de41..f6b2de41 100644
--- a/src/Runtime/res/effectlib/distancefieldtext.vert
+++ b/src/Runtime/ogl-runtime/res/effectlib/distancefieldtext.vert
diff --git a/src/Runtime/res/effectlib/distancefieldtext_core.frag b/src/Runtime/ogl-runtime/res/effectlib/distancefieldtext_core.frag
index bf60f874..bf60f874 100644
--- a/src/Runtime/res/effectlib/distancefieldtext_core.frag
+++ b/src/Runtime/ogl-runtime/res/effectlib/distancefieldtext_core.frag
diff --git a/src/Runtime/res/effectlib/distancefieldtext_core.vert b/src/Runtime/ogl-runtime/res/effectlib/distancefieldtext_core.vert
index 2dc198f4..2dc198f4 100644
--- a/src/Runtime/res/effectlib/distancefieldtext_core.vert
+++ b/src/Runtime/ogl-runtime/res/effectlib/distancefieldtext_core.vert
diff --git a/src/Runtime/res/effectlib/distancefieldtext_dropshadow.frag b/src/Runtime/ogl-runtime/res/effectlib/distancefieldtext_dropshadow.frag
index fdb68bac..fdb68bac 100644
--- a/src/Runtime/res/effectlib/distancefieldtext_dropshadow.frag
+++ b/src/Runtime/ogl-runtime/res/effectlib/distancefieldtext_dropshadow.frag
diff --git a/src/Runtime/res/effectlib/distancefieldtext_dropshadow.vert b/src/Runtime/ogl-runtime/res/effectlib/distancefieldtext_dropshadow.vert
index 835d34dd..835d34dd 100644
--- a/src/Runtime/res/effectlib/distancefieldtext_dropshadow.vert
+++ b/src/Runtime/ogl-runtime/res/effectlib/distancefieldtext_dropshadow.vert
diff --git a/src/Runtime/res/effectlib/distancefieldtext_dropshadow_core.frag b/src/Runtime/ogl-runtime/res/effectlib/distancefieldtext_dropshadow_core.frag
index 51aae5a7..51aae5a7 100644
--- a/src/Runtime/res/effectlib/distancefieldtext_dropshadow_core.frag
+++ b/src/Runtime/ogl-runtime/res/effectlib/distancefieldtext_dropshadow_core.frag
diff --git a/src/Runtime/res/effectlib/distancefieldtext_dropshadow_core.vert b/src/Runtime/ogl-runtime/res/effectlib/distancefieldtext_dropshadow_core.vert
index 7d9736e5..7d9736e5 100644
--- a/src/Runtime/res/effectlib/distancefieldtext_dropshadow_core.vert
+++ b/src/Runtime/ogl-runtime/res/effectlib/distancefieldtext_dropshadow_core.vert
diff --git a/src/Runtime/res/effectlib/effect.glsllib b/src/Runtime/ogl-runtime/res/effectlib/effect.glsllib
index 802a8460..802a8460 100644
--- a/src/Runtime/res/effectlib/effect.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/effect.glsllib
diff --git a/src/Runtime/res/effectlib/evalBakedShadowMap.glsllib b/src/Runtime/ogl-runtime/res/effectlib/evalBakedShadowMap.glsllib
index a283d8a8..a283d8a8 100644
--- a/src/Runtime/res/effectlib/evalBakedShadowMap.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/evalBakedShadowMap.glsllib
diff --git a/src/Runtime/res/effectlib/evalEnvironmentMap.glsllib b/src/Runtime/ogl-runtime/res/effectlib/evalEnvironmentMap.glsllib
index 18431c70..18431c70 100644
--- a/src/Runtime/res/effectlib/evalEnvironmentMap.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/evalEnvironmentMap.glsllib
diff --git a/src/Runtime/res/effectlib/evalLightmaps.glsllib b/src/Runtime/ogl-runtime/res/effectlib/evalLightmaps.glsllib
index 1a9bc997..1a9bc997 100644
--- a/src/Runtime/res/effectlib/evalLightmaps.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/evalLightmaps.glsllib
diff --git a/src/Runtime/res/effectlib/fileBumpTexture.glsllib b/src/Runtime/ogl-runtime/res/effectlib/fileBumpTexture.glsllib
index d0129a81..d0129a81 100644
--- a/src/Runtime/res/effectlib/fileBumpTexture.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/fileBumpTexture.glsllib
diff --git a/src/Runtime/res/effectlib/fileDisplacementTexture.glsllib b/src/Runtime/ogl-runtime/res/effectlib/fileDisplacementTexture.glsllib
index a38d701d..a38d701d 100644
--- a/src/Runtime/res/effectlib/fileDisplacementTexture.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/fileDisplacementTexture.glsllib
diff --git a/src/Runtime/res/effectlib/fileTexture.glsllib b/src/Runtime/ogl-runtime/res/effectlib/fileTexture.glsllib
index 6b9f6ab8..6b9f6ab8 100644
--- a/src/Runtime/res/effectlib/fileTexture.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/fileTexture.glsllib
diff --git a/src/Runtime/res/effectlib/flakeNoiseBumpTexture.glsllib b/src/Runtime/ogl-runtime/res/effectlib/flakeNoiseBumpTexture.glsllib
index e8e427ce..e8e427ce 100644
--- a/src/Runtime/res/effectlib/flakeNoiseBumpTexture.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/flakeNoiseBumpTexture.glsllib
diff --git a/src/Runtime/res/effectlib/flakeNoiseTexture.glsllib b/src/Runtime/ogl-runtime/res/effectlib/flakeNoiseTexture.glsllib
index 92f15d30..92f15d30 100644
--- a/src/Runtime/res/effectlib/flakeNoiseTexture.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/flakeNoiseTexture.glsllib
diff --git a/src/Runtime/res/effectlib/fresnelLayer.glsllib b/src/Runtime/ogl-runtime/res/effectlib/fresnelLayer.glsllib
index 60d71764..60d71764 100644
--- a/src/Runtime/res/effectlib/fresnelLayer.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/fresnelLayer.glsllib
diff --git a/src/Runtime/res/effectlib/funcareaLightVars.glsllib b/src/Runtime/ogl-runtime/res/effectlib/funcareaLightVars.glsllib
index 7505b348..7505b348 100644
--- a/src/Runtime/res/effectlib/funcareaLightVars.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/funcareaLightVars.glsllib
diff --git a/src/Runtime/res/effectlib/funccalculateDiffuseAreaOld.glsllib b/src/Runtime/ogl-runtime/res/effectlib/funccalculateDiffuseAreaOld.glsllib
index fc37390c..fc37390c 100644
--- a/src/Runtime/res/effectlib/funccalculateDiffuseAreaOld.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/funccalculateDiffuseAreaOld.glsllib
diff --git a/src/Runtime/res/effectlib/funccalculatePointLightAttenuation.glsllib b/src/Runtime/ogl-runtime/res/effectlib/funccalculatePointLightAttenuation.glsllib
index 5f421622..5f421622 100644
--- a/src/Runtime/res/effectlib/funccalculatePointLightAttenuation.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/funccalculatePointLightAttenuation.glsllib
diff --git a/src/Runtime/res/effectlib/funccomputeMicroHit.glsllib b/src/Runtime/ogl-runtime/res/effectlib/funccomputeMicroHit.glsllib
index 7c526916..7c526916 100644
--- a/src/Runtime/res/effectlib/funccomputeMicroHit.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/funccomputeMicroHit.glsllib
diff --git a/src/Runtime/res/effectlib/funcdiffuseReflectionBSDF.glsllib b/src/Runtime/ogl-runtime/res/effectlib/funcdiffuseReflectionBSDF.glsllib
index bda0ea60..bda0ea60 100644
--- a/src/Runtime/res/effectlib/funcdiffuseReflectionBSDF.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/funcdiffuseReflectionBSDF.glsllib
diff --git a/src/Runtime/res/effectlib/funcdiffuseReflectionWrapBSDF.glsllib b/src/Runtime/ogl-runtime/res/effectlib/funcdiffuseReflectionWrapBSDF.glsllib
index 9afc58b4..9afc58b4 100644
--- a/src/Runtime/res/effectlib/funcdiffuseReflectionWrapBSDF.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/funcdiffuseReflectionWrapBSDF.glsllib
diff --git a/src/Runtime/res/effectlib/funcgetTransformedUVCoords.glsllib b/src/Runtime/ogl-runtime/res/effectlib/funcgetTransformedUVCoords.glsllib
index 9b14a284..9b14a284 100644
--- a/src/Runtime/res/effectlib/funcgetTransformedUVCoords.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/funcgetTransformedUVCoords.glsllib
diff --git a/src/Runtime/res/effectlib/funcsampleAreaGlossyDefault.glsllib b/src/Runtime/ogl-runtime/res/effectlib/funcsampleAreaGlossyDefault.glsllib
index cb9cba11..cb9cba11 100644
--- a/src/Runtime/res/effectlib/funcsampleAreaGlossyDefault.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/funcsampleAreaGlossyDefault.glsllib
diff --git a/src/Runtime/res/effectlib/funcsampleLightVars.glsllib b/src/Runtime/ogl-runtime/res/effectlib/funcsampleLightVars.glsllib
index 85ca1448..85ca1448 100644
--- a/src/Runtime/res/effectlib/funcsampleLightVars.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/funcsampleLightVars.glsllib
diff --git a/src/Runtime/res/effectlib/funcspecularBSDF.glsllib b/src/Runtime/ogl-runtime/res/effectlib/funcspecularBSDF.glsllib
index e9450bfe..e9450bfe 100644
--- a/src/Runtime/res/effectlib/funcspecularBSDF.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/funcspecularBSDF.glsllib
diff --git a/src/Runtime/res/effectlib/gles2/SSAOCustomMaterial.glsllib b/src/Runtime/ogl-runtime/res/effectlib/gles2/SSAOCustomMaterial.glsllib
index ea8d1642..ea8d1642 100644
--- a/src/Runtime/res/effectlib/gles2/SSAOCustomMaterial.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/gles2/SSAOCustomMaterial.glsllib
diff --git a/src/Runtime/res/effectlib/gles2/defaultMaterialBumpNoLod.glsllib b/src/Runtime/ogl-runtime/res/effectlib/gles2/defaultMaterialBumpNoLod.glsllib
index 2f3bd150..2f3bd150 100644
--- a/src/Runtime/res/effectlib/gles2/defaultMaterialBumpNoLod.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/gles2/defaultMaterialBumpNoLod.glsllib
diff --git a/src/Runtime/res/effectlib/gles2/evalEnvironmentMap.glsllib b/src/Runtime/ogl-runtime/res/effectlib/gles2/evalEnvironmentMap.glsllib
index ac9851e2..ac9851e2 100644
--- a/src/Runtime/res/effectlib/gles2/evalEnvironmentMap.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/gles2/evalEnvironmentMap.glsllib
diff --git a/src/Runtime/res/effectlib/gles2/funcareaLightVars.glsllib b/src/Runtime/ogl-runtime/res/effectlib/gles2/funcareaLightVars.glsllib
index cdb8c92a..cdb8c92a 100644
--- a/src/Runtime/res/effectlib/gles2/funcareaLightVars.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/gles2/funcareaLightVars.glsllib
diff --git a/src/Runtime/res/effectlib/gles2/funcsampleLightVars.glsllib b/src/Runtime/ogl-runtime/res/effectlib/gles2/funcsampleLightVars.glsllib
index 6cb0d831..6cb0d831 100644
--- a/src/Runtime/res/effectlib/gles2/funcsampleLightVars.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/gles2/funcsampleLightVars.glsllib
diff --git a/src/Runtime/res/effectlib/gles2/microfacetBSDF.glsllib b/src/Runtime/ogl-runtime/res/effectlib/gles2/microfacetBSDF.glsllib
index 7173a743..7173a743 100644
--- a/src/Runtime/res/effectlib/gles2/microfacetBSDF.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/gles2/microfacetBSDF.glsllib
diff --git a/src/Runtime/res/effectlib/gles2/monoChannel.glsllib b/src/Runtime/ogl-runtime/res/effectlib/gles2/monoChannel.glsllib
index ca682d67..ca682d67 100644
--- a/src/Runtime/res/effectlib/gles2/monoChannel.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/gles2/monoChannel.glsllib
diff --git a/src/Runtime/res/effectlib/gles2/refraction.glsllib b/src/Runtime/ogl-runtime/res/effectlib/gles2/refraction.glsllib
index 837d7f50..837d7f50 100644
--- a/src/Runtime/res/effectlib/gles2/refraction.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/gles2/refraction.glsllib
diff --git a/src/Runtime/res/effectlib/gles2/sampleProbe.glsllib b/src/Runtime/ogl-runtime/res/effectlib/gles2/sampleProbe.glsllib
index f785918c..f785918c 100644
--- a/src/Runtime/res/effectlib/gles2/sampleProbe.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/gles2/sampleProbe.glsllib
diff --git a/src/Runtime/res/effectlib/gles2/shadowMapping.glsllib b/src/Runtime/ogl-runtime/res/effectlib/gles2/shadowMapping.glsllib
index 183ef974..183ef974 100644
--- a/src/Runtime/res/effectlib/gles2/shadowMapping.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/gles2/shadowMapping.glsllib
diff --git a/src/Runtime/res/effectlib/gles2/tangentSpaceNormalTexture.glsllib b/src/Runtime/ogl-runtime/res/effectlib/gles2/tangentSpaceNormalTexture.glsllib
index daae4014..daae4014 100644
--- a/src/Runtime/res/effectlib/gles2/tangentSpaceNormalTexture.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/gles2/tangentSpaceNormalTexture.glsllib
diff --git a/src/Runtime/res/effectlib/gradient3Recolor.glsllib b/src/Runtime/ogl-runtime/res/effectlib/gradient3Recolor.glsllib
index ba7d5937..ba7d5937 100644
--- a/src/Runtime/res/effectlib/gradient3Recolor.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/gradient3Recolor.glsllib
diff --git a/src/Runtime/res/effectlib/gradient3Texture.glsllib b/src/Runtime/ogl-runtime/res/effectlib/gradient3Texture.glsllib
index 7bd6cec7..7bd6cec7 100644
--- a/src/Runtime/res/effectlib/gradient3Texture.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/gradient3Texture.glsllib
diff --git a/src/Runtime/res/effectlib/gradientGetPosition.glsllib b/src/Runtime/ogl-runtime/res/effectlib/gradientGetPosition.glsllib
index 4ceece04..4ceece04 100644
--- a/src/Runtime/res/effectlib/gradientGetPosition.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/gradientGetPosition.glsllib
diff --git a/src/Runtime/res/effectlib/luminance.glsllib b/src/Runtime/ogl-runtime/res/effectlib/luminance.glsllib
index 067dc184..067dc184 100644
--- a/src/Runtime/res/effectlib/luminance.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/luminance.glsllib
diff --git a/src/Runtime/res/effectlib/miNoise.glsllib b/src/Runtime/ogl-runtime/res/effectlib/miNoise.glsllib
index 5fbff37d..5fbff37d 100644
--- a/src/Runtime/res/effectlib/miNoise.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/miNoise.glsllib
diff --git a/src/Runtime/res/effectlib/microfacetBSDF.glsllib b/src/Runtime/ogl-runtime/res/effectlib/microfacetBSDF.glsllib
index 8e489107..8e489107 100644
--- a/src/Runtime/res/effectlib/microfacetBSDF.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/microfacetBSDF.glsllib
diff --git a/src/Runtime/res/effectlib/monoChannel.glsllib b/src/Runtime/ogl-runtime/res/effectlib/monoChannel.glsllib
index 5c03a971..5c03a971 100644
--- a/src/Runtime/res/effectlib/monoChannel.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/monoChannel.glsllib
diff --git a/src/Runtime/res/effectlib/normalizedMix.glsllib b/src/Runtime/ogl-runtime/res/effectlib/normalizedMix.glsllib
index fc90b46d..fc90b46d 100644
--- a/src/Runtime/res/effectlib/normalizedMix.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/normalizedMix.glsllib
diff --git a/src/Runtime/res/effectlib/perlinNoise.glsllib b/src/Runtime/ogl-runtime/res/effectlib/perlinNoise.glsllib
index 347386c4..347386c4 100644
--- a/src/Runtime/res/effectlib/perlinNoise.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/perlinNoise.glsllib
diff --git a/src/Runtime/res/effectlib/perlinNoiseBumpTexture.glsllib b/src/Runtime/ogl-runtime/res/effectlib/perlinNoiseBumpTexture.glsllib
index 6e0982f3..6e0982f3 100644
--- a/src/Runtime/res/effectlib/perlinNoiseBumpTexture.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/perlinNoiseBumpTexture.glsllib
diff --git a/src/Runtime/res/effectlib/perlinNoiseTexture.glsllib b/src/Runtime/ogl-runtime/res/effectlib/perlinNoiseTexture.glsllib
index d968403e..d968403e 100644
--- a/src/Runtime/res/effectlib/perlinNoiseTexture.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/perlinNoiseTexture.glsllib
diff --git a/src/Runtime/res/effectlib/physGlossyBSDF.glsllib b/src/Runtime/ogl-runtime/res/effectlib/physGlossyBSDF.glsllib
index ece836b5..ece836b5 100644
--- a/src/Runtime/res/effectlib/physGlossyBSDF.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/physGlossyBSDF.glsllib
diff --git a/src/Runtime/res/effectlib/random255.glsllib b/src/Runtime/ogl-runtime/res/effectlib/random255.glsllib
index ef586a78..ef586a78 100644
--- a/src/Runtime/res/effectlib/random255.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/random255.glsllib
diff --git a/src/Runtime/res/effectlib/refraction.glsllib b/src/Runtime/ogl-runtime/res/effectlib/refraction.glsllib
index f961c50e..f961c50e 100644
--- a/src/Runtime/res/effectlib/refraction.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/refraction.glsllib
diff --git a/src/Runtime/res/effectlib/rotationTranslationScale.glsllib b/src/Runtime/ogl-runtime/res/effectlib/rotationTranslationScale.glsllib
index 78bb8dd1..78bb8dd1 100644
--- a/src/Runtime/res/effectlib/rotationTranslationScale.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/rotationTranslationScale.glsllib
diff --git a/src/Runtime/res/effectlib/sampleArea.glsllib b/src/Runtime/ogl-runtime/res/effectlib/sampleArea.glsllib
index 01f3a749..01f3a749 100644
--- a/src/Runtime/res/effectlib/sampleArea.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/sampleArea.glsllib
diff --git a/src/Runtime/res/effectlib/sampleLight.glsllib b/src/Runtime/ogl-runtime/res/effectlib/sampleLight.glsllib
index 05ad5b4b..05ad5b4b 100644
--- a/src/Runtime/res/effectlib/sampleLight.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/sampleLight.glsllib
diff --git a/src/Runtime/res/effectlib/sampleProbe.glsllib b/src/Runtime/ogl-runtime/res/effectlib/sampleProbe.glsllib
index 6556e51c..6556e51c 100644
--- a/src/Runtime/res/effectlib/sampleProbe.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/sampleProbe.glsllib
diff --git a/src/Runtime/res/effectlib/screenSpaceAO.glsllib b/src/Runtime/ogl-runtime/res/effectlib/screenSpaceAO.glsllib
index 54204a1f..54204a1f 100644
--- a/src/Runtime/res/effectlib/screenSpaceAO.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/screenSpaceAO.glsllib
diff --git a/src/Runtime/res/effectlib/screenSpaceDO.glsllib b/src/Runtime/ogl-runtime/res/effectlib/screenSpaceDO.glsllib
index 2ccc69fc..2ccc69fc 100644
--- a/src/Runtime/res/effectlib/screenSpaceDO.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/screenSpaceDO.glsllib
diff --git a/src/Runtime/res/effectlib/shadowMapping.glsllib b/src/Runtime/ogl-runtime/res/effectlib/shadowMapping.glsllib
index df351f9a..df351f9a 100644
--- a/src/Runtime/res/effectlib/shadowMapping.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/shadowMapping.glsllib
diff --git a/src/Runtime/res/effectlib/shadowMappingFragment.glsllib b/src/Runtime/ogl-runtime/res/effectlib/shadowMappingFragment.glsllib
index 660d736a..660d736a 100644
--- a/src/Runtime/res/effectlib/shadowMappingFragment.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/shadowMappingFragment.glsllib
diff --git a/src/Runtime/res/effectlib/simpleGlossyBSDF.glsllib b/src/Runtime/ogl-runtime/res/effectlib/simpleGlossyBSDF.glsllib
index be6024cc..be6024cc 100644
--- a/src/Runtime/res/effectlib/simpleGlossyBSDF.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/simpleGlossyBSDF.glsllib
diff --git a/src/Runtime/res/effectlib/specularBSDF.glsllib b/src/Runtime/ogl-runtime/res/effectlib/specularBSDF.glsllib
index 78e541a5..78e541a5 100644
--- a/src/Runtime/res/effectlib/specularBSDF.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/specularBSDF.glsllib
diff --git a/src/Runtime/res/effectlib/spotEdf.glsllib b/src/Runtime/ogl-runtime/res/effectlib/spotEdf.glsllib
index 2abe194e..2abe194e 100644
--- a/src/Runtime/res/effectlib/spotEdf.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/spotEdf.glsllib
diff --git a/src/Runtime/res/effectlib/square.glsllib b/src/Runtime/ogl-runtime/res/effectlib/square.glsllib
index 96857224..96857224 100644
--- a/src/Runtime/res/effectlib/square.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/square.glsllib
diff --git a/src/Runtime/res/effectlib/tangentSpaceNormalTexture.glsllib b/src/Runtime/ogl-runtime/res/effectlib/tangentSpaceNormalTexture.glsllib
index 1fcc4290..1fcc4290 100644
--- a/src/Runtime/res/effectlib/tangentSpaceNormalTexture.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/tangentSpaceNormalTexture.glsllib
diff --git a/src/Runtime/res/effectlib/tessellationLinear.glsllib b/src/Runtime/ogl-runtime/res/effectlib/tessellationLinear.glsllib
index f854cc15..f854cc15 100644
--- a/src/Runtime/res/effectlib/tessellationLinear.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/tessellationLinear.glsllib
diff --git a/src/Runtime/res/effectlib/tessellationLinearCM.glsllib b/src/Runtime/ogl-runtime/res/effectlib/tessellationLinearCM.glsllib
index d2bb90af..d2bb90af 100644
--- a/src/Runtime/res/effectlib/tessellationLinearCM.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/tessellationLinearCM.glsllib
diff --git a/src/Runtime/res/effectlib/tessellationNPatch.glsllib b/src/Runtime/ogl-runtime/res/effectlib/tessellationNPatch.glsllib
index 62ec2635..62ec2635 100644
--- a/src/Runtime/res/effectlib/tessellationNPatch.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/tessellationNPatch.glsllib
diff --git a/src/Runtime/res/effectlib/tessellationNPatchCM.glsllib b/src/Runtime/ogl-runtime/res/effectlib/tessellationNPatchCM.glsllib
index 4616b583..4616b583 100644
--- a/src/Runtime/res/effectlib/tessellationNPatchCM.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/tessellationNPatchCM.glsllib
diff --git a/src/Runtime/res/effectlib/tessellationPath.glsllib b/src/Runtime/ogl-runtime/res/effectlib/tessellationPath.glsllib
index 17b87b08..17b87b08 100644
--- a/src/Runtime/res/effectlib/tessellationPath.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/tessellationPath.glsllib
diff --git a/src/Runtime/res/effectlib/tessellationPhong.glsllib b/src/Runtime/ogl-runtime/res/effectlib/tessellationPhong.glsllib
index 98a683dc..98a683dc 100644
--- a/src/Runtime/res/effectlib/tessellationPhong.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/tessellationPhong.glsllib
diff --git a/src/Runtime/res/effectlib/tessellationPhongCM.glsllib b/src/Runtime/ogl-runtime/res/effectlib/tessellationPhongCM.glsllib
index 1374a633..1374a633 100644
--- a/src/Runtime/res/effectlib/tessellationPhongCM.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/tessellationPhongCM.glsllib
diff --git a/src/Runtime/res/effectlib/textureCoordinateInfo.glsllib b/src/Runtime/ogl-runtime/res/effectlib/textureCoordinateInfo.glsllib
index a90ffbe9..a90ffbe9 100644
--- a/src/Runtime/res/effectlib/textureCoordinateInfo.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/textureCoordinateInfo.glsllib
diff --git a/src/Runtime/res/effectlib/transformCoordinate.glsllib b/src/Runtime/ogl-runtime/res/effectlib/transformCoordinate.glsllib
index ccdf7d0a..ccdf7d0a 100644
--- a/src/Runtime/res/effectlib/transformCoordinate.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/transformCoordinate.glsllib
diff --git a/src/Runtime/res/effectlib/vertexFragmentBase.glsllib b/src/Runtime/ogl-runtime/res/effectlib/vertexFragmentBase.glsllib
index add11bbc..add11bbc 100644
--- a/src/Runtime/res/effectlib/vertexFragmentBase.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/vertexFragmentBase.glsllib
diff --git a/src/Runtime/res/effectlib/viewProperties.glsllib b/src/Runtime/ogl-runtime/res/effectlib/viewProperties.glsllib
index ef6b01ff..ef6b01ff 100644
--- a/src/Runtime/res/effectlib/viewProperties.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/viewProperties.glsllib
diff --git a/src/Runtime/res/effectlib/weightedLayer.glsllib b/src/Runtime/ogl-runtime/res/effectlib/weightedLayer.glsllib
index 781ffacf..781ffacf 100644
--- a/src/Runtime/res/effectlib/weightedLayer.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/weightedLayer.glsllib
diff --git a/src/Runtime/res/effectlib/wireframeCM.glsllib b/src/Runtime/ogl-runtime/res/effectlib/wireframeCM.glsllib
index fcbf7e9f..fcbf7e9f 100644
--- a/src/Runtime/res/effectlib/wireframeCM.glsllib
+++ b/src/Runtime/ogl-runtime/res/effectlib/wireframeCM.glsllib
diff --git a/src/Runtime/res/primitives/Cone.mesh b/src/Runtime/ogl-runtime/res/primitives/Cone.mesh
index 7ef00f3b..7ef00f3b 100644
--- a/src/Runtime/res/primitives/Cone.mesh
+++ b/src/Runtime/ogl-runtime/res/primitives/Cone.mesh
diff --git a/src/Runtime/res/primitives/Cube.mesh b/src/Runtime/ogl-runtime/res/primitives/Cube.mesh
index af594b2f..af594b2f 100644
--- a/src/Runtime/res/primitives/Cube.mesh
+++ b/src/Runtime/ogl-runtime/res/primitives/Cube.mesh
diff --git a/src/Runtime/res/primitives/Cylinder.mesh b/src/Runtime/ogl-runtime/res/primitives/Cylinder.mesh
index 0e9fbfcc..0e9fbfcc 100644
--- a/src/Runtime/res/primitives/Cylinder.mesh
+++ b/src/Runtime/ogl-runtime/res/primitives/Cylinder.mesh
diff --git a/src/Runtime/res/primitives/Rectangle.mesh b/src/Runtime/ogl-runtime/res/primitives/Rectangle.mesh
index b137cb93..b137cb93 100644
--- a/src/Runtime/res/primitives/Rectangle.mesh
+++ b/src/Runtime/ogl-runtime/res/primitives/Rectangle.mesh
diff --git a/src/Runtime/res/primitives/Sphere.mesh b/src/Runtime/ogl-runtime/res/primitives/Sphere.mesh
index 4f61d4c6..4f61d4c6 100644
--- a/src/Runtime/res/primitives/Sphere.mesh
+++ b/src/Runtime/ogl-runtime/res/primitives/Sphere.mesh
diff --git a/src/Runtime/ogl-runtime/src/3rdparty/3rdparty.pro b/src/Runtime/ogl-runtime/src/3rdparty/3rdparty.pro
new file mode 100644
index 00000000..deb754e4
--- /dev/null
+++ b/src/Runtime/ogl-runtime/src/3rdparty/3rdparty.pro
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS += \
+    EASTL
diff --git a/src/3rdparty/EASTL b/src/Runtime/ogl-runtime/src/3rdparty/EASTL
-Subproject 1f1468dec7c1e9c168d15a35fadc7a084dfcf9e
+Subproject 1f1468dec7c1e9c168d15a35fadc7a084dfcf9e
diff --git a/src/3rdparty/color/CColor.cpp b/src/Runtime/ogl-runtime/src/3rdparty/color/CColor.cpp
index d21cc945..d21cc945 100644
--- a/src/3rdparty/color/CColor.cpp
+++ b/src/Runtime/ogl-runtime/src/3rdparty/color/CColor.cpp
diff --git a/src/3rdparty/color/CColor.h b/src/Runtime/ogl-runtime/src/3rdparty/color/CColor.h
index e6f487b5..e6f487b5 100644
--- a/src/3rdparty/color/CColor.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/color/CColor.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Android/jni/GLES2/gl2.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Android/jni/GLES2/gl2.h
index f64ec00b..f64ec00b 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Android/jni/GLES2/gl2.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Android/jni/GLES2/gl2.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Android/jni/GLES2/gl2ext.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Android/jni/GLES2/gl2ext.h
index 2d055961..2d055961 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Android/jni/GLES2/gl2ext.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Android/jni/GLES2/gl2ext.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Android/jni/GLES2/gl2platform.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Android/jni/GLES2/gl2platform.h
index 89d4d44d..89d4d44d 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Android/jni/GLES2/gl2platform.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Android/jni/GLES2/gl2platform.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Android/jni/GLES3/gl3.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Android/jni/GLES3/gl3.h
index d51d2e65..d51d2e65 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Android/jni/GLES3/gl3.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Android/jni/GLES3/gl3.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Android/jni/GLES3/gl31.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Android/jni/GLES3/gl31.h
index 9b89a0ac..9b89a0ac 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Android/jni/GLES3/gl31.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Android/jni/GLES3/gl31.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Android/jni/GLES3/gl32.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Android/jni/GLES3/gl32.h
index a2c36119..a2c36119 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Android/jni/GLES3/gl32.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Android/jni/GLES3/gl32.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Android/jni/GLES3/gl3ext.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Android/jni/GLES3/gl3ext.h
index 4d4ea96c..4d4ea96c 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Android/jni/GLES3/gl3ext.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Android/jni/GLES3/gl3ext.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Android/jni/GLES3/gl3platform.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Android/jni/GLES3/gl3platform.h
index b1e869dd..b1e869dd 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Android/jni/GLES3/gl3platform.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Android/jni/GLES3/gl3platform.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/gl.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/gl.h
index 1d2cd0ad..1d2cd0ad 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/gl.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/gl.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glcorearb.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glcorearb.h
index 07cb03e1..07cb03e1 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glcorearb.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glcorearb.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glew.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glew.h
index 0cd6ae3a..0cd6ae3a 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glew.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glew.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glext.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glext.h
index 5a6dbc4c..5a6dbc4c 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glext.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glext.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glfuncdef.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glfuncdef.h
index cd50a3a3..cd50a3a3 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glfuncdef.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glfuncdef.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glu.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glu.h
index 54bc52bc..54bc52bc 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glu.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glu.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glut.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glut.h
index 65fd748d..65fd748d 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glut.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glut.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glx.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glx.h
index 66ad53c6..66ad53c6 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glx.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glx.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glxew.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glxew.h
index 6d249f73..6d249f73 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glxew.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glxew.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glxext.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glxext.h
index cccee18d..cccee18d 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/glxext.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/glxext.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/nvogldebug.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/nvogldebug.h
index 10e43b4b..10e43b4b 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/nvogldebug.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/nvogldebug.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/wglew.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/wglew.h
index 05f054fc..05f054fc 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/wglew.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/wglew.h
diff --git a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/wglext.h b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/wglext.h
index ac632cce..ac632cce 100644
--- a/src/3rdparty/RuntimePlatformSpecific/Windows/PlatformLibs/GL/wglext.h
+++ b/src/Runtime/ogl-runtime/src/3rdparty/platformspecific/Windows/PlatformLibs/GL/wglext.h
diff --git a/src/Runtime/api/api.pro b/src/Runtime/ogl-runtime/src/api/api.pro
index 7d5b27d0..7d5b27d0 100644
--- a/src/Runtime/api/api.pro
+++ b/src/Runtime/ogl-runtime/src/api/api.pro
diff --git a/src/Runtime/api/studio3d/q3dscommandqueue.cpp b/src/Runtime/ogl-runtime/src/api/studio3d/q3dscommandqueue.cpp
index 550dc24f..550dc24f 100644
--- a/src/Runtime/api/studio3d/q3dscommandqueue.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dscommandqueue.cpp
diff --git a/src/Runtime/api/studio3d/q3dscommandqueue_p.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dscommandqueue_p.h
index 12d1b7e3..12d1b7e3 100644
--- a/src/Runtime/api/studio3d/q3dscommandqueue_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dscommandqueue_p.h
diff --git a/src/Runtime/api/studio3d/q3dsdatainput.cpp b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdatainput.cpp
index 2e6281e6..2e6281e6 100644
--- a/src/Runtime/api/studio3d/q3dsdatainput.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdatainput.cpp
diff --git a/src/Runtime/api/studio3d/q3dsdatainput.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdatainput.h
index 4504e5d2..4504e5d2 100644
--- a/src/Runtime/api/studio3d/q3dsdatainput.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdatainput.h
diff --git a/src/Runtime/api/studio3d/q3dsdatainput_p.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdatainput_p.h
index 6107add9..6107add9 100644
--- a/src/Runtime/api/studio3d/q3dsdatainput_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdatainput_p.h
diff --git a/src/Runtime/api/studio3d/q3dsdataoutput.cpp b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdataoutput.cpp
index 3cb13a0e..3cb13a0e 100644
--- a/src/Runtime/api/studio3d/q3dsdataoutput.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdataoutput.cpp
diff --git a/src/Runtime/api/studio3d/q3dsdataoutput.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdataoutput.h
index 93f74267..93f74267 100644
--- a/src/Runtime/api/studio3d/q3dsdataoutput.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdataoutput.h
diff --git a/src/Runtime/api/studio3d/q3dsdataoutput_p.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdataoutput_p.h
index c4745bfb..c4745bfb 100644
--- a/src/Runtime/api/studio3d/q3dsdataoutput_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdataoutput_p.h
diff --git a/src/Runtime/api/studio3d/q3dselement.cpp b/src/Runtime/ogl-runtime/src/api/studio3d/q3dselement.cpp
index 16ae1102..16ae1102 100644
--- a/src/Runtime/api/studio3d/q3dselement.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dselement.cpp
diff --git a/src/Runtime/api/studio3d/q3dselement.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dselement.h
index 04c43f52..04c43f52 100644
--- a/src/Runtime/api/studio3d/q3dselement.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dselement.h
diff --git a/src/Runtime/api/studio3d/q3dselement_p.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dselement_p.h
index d4e77b1c..d4e77b1c 100644
--- a/src/Runtime/api/studio3d/q3dselement_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dselement_p.h
diff --git a/src/Runtime/api/studio3d/q3dsgeometry.cpp b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsgeometry.cpp
index bfc66a96..bfc66a96 100644
--- a/src/Runtime/api/studio3d/q3dsgeometry.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsgeometry.cpp
diff --git a/src/Runtime/api/studio3d/q3dsgeometry.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsgeometry.h
index b9b66e98..b9b66e98 100644
--- a/src/Runtime/api/studio3d/q3dsgeometry.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsgeometry.h
diff --git a/src/Runtime/api/studio3d/q3dsgeometry_p.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsgeometry_p.h
index 586b0d7b..586b0d7b 100644
--- a/src/Runtime/api/studio3d/q3dsgeometry_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsgeometry_p.h
diff --git a/src/Runtime/api/studio3d/q3dsimagesequencegenerator.cpp b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsimagesequencegenerator.cpp
index d0b8251b..d0b8251b 100644
--- a/src/Runtime/api/studio3d/q3dsimagesequencegenerator.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsimagesequencegenerator.cpp
diff --git a/src/Runtime/api/studio3d/q3dsimagesequencegenerator_p.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsimagesequencegenerator_p.h
index bc56fb1e..bc56fb1e 100644
--- a/src/Runtime/api/studio3d/q3dsimagesequencegenerator_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsimagesequencegenerator_p.h
diff --git a/src/Runtime/api/studio3d/q3dsimagesequencegeneratorthread.cpp b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsimagesequencegeneratorthread.cpp
index 0968e3f1..0968e3f1 100644
--- a/src/Runtime/api/studio3d/q3dsimagesequencegeneratorthread.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsimagesequencegeneratorthread.cpp
diff --git a/src/Runtime/api/studio3d/q3dsimagesequencegeneratorthread_p.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsimagesequencegeneratorthread_p.h
index 45869a69..45869a69 100644
--- a/src/Runtime/api/studio3d/q3dsimagesequencegeneratorthread_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsimagesequencegeneratorthread_p.h
diff --git a/src/Runtime/api/studio3d/q3dspresentation.cpp b/src/Runtime/ogl-runtime/src/api/studio3d/q3dspresentation.cpp
index 204b2035..204b2035 100644
--- a/src/Runtime/api/studio3d/q3dspresentation.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dspresentation.cpp
diff --git a/src/Runtime/api/studio3d/q3dspresentation.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dspresentation.h
index 436e6844..436e6844 100644
--- a/src/Runtime/api/studio3d/q3dspresentation.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dspresentation.h
diff --git a/src/Runtime/api/studio3d/q3dspresentation_p.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dspresentation_p.h
index 7b4877d9..7b4877d9 100644
--- a/src/Runtime/api/studio3d/q3dspresentation_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dspresentation_p.h
diff --git a/src/Runtime/api/studio3d/q3dssceneelement.cpp b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssceneelement.cpp
index 3f860d65..3f860d65 100644
--- a/src/Runtime/api/studio3d/q3dssceneelement.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssceneelement.cpp
diff --git a/src/Runtime/api/studio3d/q3dssceneelement.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssceneelement.h
index 2d96255c..2d96255c 100644
--- a/src/Runtime/api/studio3d/q3dssceneelement.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssceneelement.h
diff --git a/src/Runtime/api/studio3d/q3dssceneelement_p.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssceneelement_p.h
index 02d2bdff..02d2bdff 100644
--- a/src/Runtime/api/studio3d/q3dssceneelement_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssceneelement_p.h
diff --git a/src/Runtime/api/studio3d/q3dssurfaceviewer.cpp b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer.cpp
index 23782f2f..23782f2f 100644
--- a/src/Runtime/api/studio3d/q3dssurfaceviewer.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer.cpp
diff --git a/src/Runtime/api/studio3d/q3dssurfaceviewer.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer.h
index 5c166af9..5c166af9 100644
--- a/src/Runtime/api/studio3d/q3dssurfaceviewer.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer.h
diff --git a/src/Runtime/api/studio3d/q3dssurfaceviewer_p.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer_p.h
index fc6b4cc8..fc6b4cc8 100644
--- a/src/Runtime/api/studio3d/q3dssurfaceviewer_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer_p.h
diff --git a/src/Runtime/api/studio3d/q3dsviewersettings.cpp b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsviewersettings.cpp
index 187729a0..187729a0 100644
--- a/src/Runtime/api/studio3d/q3dsviewersettings.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsviewersettings.cpp
diff --git a/src/Runtime/api/studio3d/q3dsviewersettings.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsviewersettings.h
index 5d7abf68..5d7abf68 100644
--- a/src/Runtime/api/studio3d/q3dsviewersettings.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsviewersettings.h
diff --git a/src/Runtime/api/studio3d/q3dsviewersettings_p.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsviewersettings_p.h
index 48fbae3a..48fbae3a 100644
--- a/src/Runtime/api/studio3d/q3dsviewersettings_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsviewersettings_p.h
diff --git a/src/Runtime/api/studio3d/qstudio3dglobal.h b/src/Runtime/ogl-runtime/src/api/studio3d/qstudio3dglobal.h
index d1960634..d1960634 100644
--- a/src/Runtime/api/studio3d/qstudio3dglobal.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/qstudio3dglobal.h
diff --git a/src/Runtime/api/studio3d/studio3d.pro b/src/Runtime/ogl-runtime/src/api/studio3d/studio3d.pro
index 62d0613f..62d0613f 100644
--- a/src/Runtime/api/studio3d/studio3d.pro
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/studio3d.pro
diff --git a/src/Runtime/api/studio3d/studioutils.cpp b/src/Runtime/ogl-runtime/src/api/studio3d/studioutils.cpp
index 9156be7f..9156be7f 100644
--- a/src/Runtime/api/studio3d/studioutils.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/studioutils.cpp
diff --git a/src/Runtime/api/studio3d/studioutils_p.h b/src/Runtime/ogl-runtime/src/api/studio3d/studioutils_p.h
index afec688c..afec688c 100644
--- a/src/Runtime/api/studio3d/studioutils_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/studioutils_p.h
diff --git a/src/Runtime/api/studio3d/viewerqmlstreamproxy.cpp b/src/Runtime/ogl-runtime/src/api/studio3d/viewerqmlstreamproxy.cpp
index 520dc8c6..520dc8c6 100644
--- a/src/Runtime/api/studio3d/viewerqmlstreamproxy.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/viewerqmlstreamproxy.cpp
diff --git a/src/Runtime/api/studio3d/viewerqmlstreamproxy_p.h b/src/Runtime/ogl-runtime/src/api/studio3d/viewerqmlstreamproxy_p.h
index 16569c1c..16569c1c 100644
--- a/src/Runtime/api/studio3d/viewerqmlstreamproxy_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/viewerqmlstreamproxy_p.h
diff --git a/src/Runtime/api/studio3dqml/q3dsplugin.cpp b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dsplugin.cpp
index 640018f4..640018f4 100644
--- a/src/Runtime/api/studio3dqml/q3dsplugin.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dsplugin.cpp
diff --git a/src/Runtime/api/studio3dqml/q3dsplugin.h b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dsplugin.h
index 04f69429..04f69429 100644
--- a/src/Runtime/api/studio3dqml/q3dsplugin.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dsplugin.h
diff --git a/src/Runtime/api/studio3dqml/q3dspresentationitem.cpp b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dspresentationitem.cpp
index 407739e5..407739e5 100644
--- a/src/Runtime/api/studio3dqml/q3dspresentationitem.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dspresentationitem.cpp
diff --git a/src/Runtime/api/studio3dqml/q3dspresentationitem_p.h b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dspresentationitem_p.h
index 757f34fa..757f34fa 100644
--- a/src/Runtime/api/studio3dqml/q3dspresentationitem_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dspresentationitem_p.h
diff --git a/src/Runtime/api/studio3dqml/q3dsrenderer.cpp b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dsrenderer.cpp
index bbfee502..bbfee502 100644
--- a/src/Runtime/api/studio3dqml/q3dsrenderer.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dsrenderer.cpp
diff --git a/src/Runtime/api/studio3dqml/q3dsrenderer_p.h b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dsrenderer_p.h
index 6d044ff7..6d044ff7 100644
--- a/src/Runtime/api/studio3dqml/q3dsrenderer_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dsrenderer_p.h
diff --git a/src/Runtime/api/studio3dqml/q3dsstudio3d.cpp b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dsstudio3d.cpp
index 59f92b01..59f92b01 100644
--- a/src/Runtime/api/studio3dqml/q3dsstudio3d.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dsstudio3d.cpp
diff --git a/src/Runtime/api/studio3dqml/q3dsstudio3d_p.h b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dsstudio3d_p.h
index 0fd3b9d0..0fd3b9d0 100644
--- a/src/Runtime/api/studio3dqml/q3dsstudio3d_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dsstudio3d_p.h
diff --git a/src/Runtime/api/studio3dqml/qmldir b/src/Runtime/ogl-runtime/src/api/studio3dqml/qmldir
index 1eaa8f2b..1eaa8f2b 100644
--- a/src/Runtime/api/studio3dqml/qmldir
+++ b/src/Runtime/ogl-runtime/src/api/studio3dqml/qmldir
diff --git a/src/Runtime/api/studio3dqml/studio3dqml.pro b/src/Runtime/ogl-runtime/src/api/studio3dqml/studio3dqml.pro
index b62a3424..b62a3424 100644
--- a/src/Runtime/api/studio3dqml/studio3dqml.pro
+++ b/src/Runtime/ogl-runtime/src/api/studio3dqml/studio3dqml.pro
diff --git a/src/Runtime/ogl-runtime/src/commoninclude.pri b/src/Runtime/ogl-runtime/src/commoninclude.pri
new file mode 100644
index 00000000..13925a3b
--- /dev/null
+++ b/src/Runtime/ogl-runtime/src/commoninclude.pri
@@ -0,0 +1 @@
+include($$PWD/../commoninclude.pri)
diff --git a/src/Runtime/Source/datamodel/DocumentResourceManagerCustomMaterialParser.h b/src/Runtime/ogl-runtime/src/datamodel/DocumentResourceManagerCustomMaterialParser.h
index 47a8092d..47a8092d 100644
--- a/src/Runtime/Source/datamodel/DocumentResourceManagerCustomMaterialParser.h
+++ b/src/Runtime/ogl-runtime/src/datamodel/DocumentResourceManagerCustomMaterialParser.h
diff --git a/src/Runtime/Source/datamodel/DocumentResourceManagerRenderPluginParser.h b/src/Runtime/ogl-runtime/src/datamodel/DocumentResourceManagerRenderPluginParser.h
index e3eee1cf..e3eee1cf 100644
--- a/src/Runtime/Source/datamodel/DocumentResourceManagerRenderPluginParser.h
+++ b/src/Runtime/ogl-runtime/src/datamodel/DocumentResourceManagerRenderPluginParser.h
diff --git a/src/Runtime/Source/datamodel/DocumentResourceManagerScriptParser.h b/src/Runtime/ogl-runtime/src/datamodel/DocumentResourceManagerScriptParser.h
index 4c2ce437..4c2ce437 100644
--- a/src/Runtime/Source/datamodel/DocumentResourceManagerScriptParser.h
+++ b/src/Runtime/ogl-runtime/src/datamodel/DocumentResourceManagerScriptParser.h
diff --git a/src/Runtime/Source/datamodel/Qt3DSMetadata.cpp b/src/Runtime/ogl-runtime/src/datamodel/Qt3DSMetadata.cpp
index 89bb4de7..89bb4de7 100644
--- a/src/Runtime/Source/datamodel/Qt3DSMetadata.cpp
+++ b/src/Runtime/ogl-runtime/src/datamodel/Qt3DSMetadata.cpp
diff --git a/src/Runtime/Source/datamodel/Qt3DSMetadata.h b/src/Runtime/ogl-runtime/src/datamodel/Qt3DSMetadata.h
index 1efe748c..1efe748c 100644
--- a/src/Runtime/Source/datamodel/Qt3DSMetadata.h
+++ b/src/Runtime/ogl-runtime/src/datamodel/Qt3DSMetadata.h
diff --git a/src/Authoring/QT3DSDM/EASTL_new.cpp b/src/Runtime/ogl-runtime/src/dm/EASTL_new.cpp
index 1ca308e7..1ca308e7 100644
--- a/src/Authoring/QT3DSDM/EASTL_new.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/EASTL_new.cpp
diff --git a/src/Authoring/QT3DSDM/Qt3DSDMPrefix.h b/src/Runtime/ogl-runtime/src/dm/Qt3DSDMPrefix.h
index 4164d646..4164d646 100644
--- a/src/Authoring/QT3DSDM/Qt3DSDMPrefix.h
+++ b/src/Runtime/ogl-runtime/src/dm/Qt3DSDMPrefix.h
diff --git a/src/Runtime/ogl-runtime/src/dm/dm.pro b/src/Runtime/ogl-runtime/src/dm/dm.pro
new file mode 100644
index 00000000..2e57f308
--- /dev/null
+++ b/src/Runtime/ogl-runtime/src/dm/dm.pro
@@ -0,0 +1,58 @@
+TEMPLATE = lib
+TARGET = QT3DSDM
+CONFIG += staticlib
+include(../commoninclude.pri)
+
+DEFINES += QT3DS_AUTHORING _AFXDLL PCRE_STATIC _UNICODE
+
+linux {
+    DEFINES += QT3DSDM_META_DATA_NO_SIGNALS
+}
+
+INCLUDEPATH += \
+    \
+    systems \
+    systems/cores \
+    ../system \
+    ../foundation \
+    ../runtimerender \
+    ../datamodel \
+    ../render \
+    ../3rdparty/EASTL/UnknownVersion/include \
+    ../3rdparty/color \
+
+PRECOMPILED_HEADER = Qt3DSDMPrefix.h
+
+SOURCES += \
+    EASTL_new.cpp \
+    systems/ActionSystem.cpp \
+    systems/SignalsImpl.cpp \
+    systems/SlideSystem.cpp \
+    systems/StudioAnimationSystem.cpp \
+    systems/StudioCoreSystem.cpp \
+    systems/StudioFullSystem.cpp \
+    systems/StudioPropertySystem.cpp \
+    systems/Qt3DSDMComposerTypeDefinitions.cpp \
+    systems/Qt3DSDMGuides.cpp \
+    systems/Qt3DSDMMetaData.cpp \
+    systems/Qt3DSDMSignalSystem.cpp \
+    systems/Qt3DSDMStringTable.cpp \
+    systems/Qt3DSDMValue.cpp \
+    systems/Qt3DSDMXML.cpp \
+    systems/cores/ActionCoreProducer.cpp \
+    systems/cores/AnimationCoreProducer.cpp \
+    systems/cores/DataCoreProducer.cpp \
+    systems/cores/SimpleActionCore.cpp \
+    systems/cores/SimpleAnimationCore.cpp \
+    systems/cores/SimpleDataCore.cpp \
+    systems/cores/SimpleSlideCore.cpp \
+    systems/cores/SimpleSlideGraphCore.cpp \
+    systems/cores/SlideCoreProducer.cpp \
+    systems/cores/SlideGraphCoreProducer.cpp \
+
+HEADERS += \
+    systems/Qt3DSDMDataTypes.h \
+    systems/Qt3DSDMMetaDataTypes.h \
+    systems/Qt3DSDMMetaDataValue.h \
+    systems/Qt3DSDMMetaData.h \
+    systems/Qt3DSDMWStrOpsImpl.h
diff --git a/src/Authoring/QT3DSDM/Systems/ActionSystem.cpp b/src/Runtime/ogl-runtime/src/dm/systems/ActionSystem.cpp
index fbd25938..fbd25938 100644
--- a/src/Authoring/QT3DSDM/Systems/ActionSystem.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/ActionSystem.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/ActionSystem.h b/src/Runtime/ogl-runtime/src/dm/systems/ActionSystem.h
index fea9894a..fea9894a 100644
--- a/src/Authoring/QT3DSDM/Systems/ActionSystem.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/ActionSystem.h
diff --git a/src/Authoring/QT3DSDM/Systems/HandleSystemBase.h b/src/Runtime/ogl-runtime/src/dm/systems/HandleSystemBase.h
index cb8e0f6c..cb8e0f6c 100644
--- a/src/Authoring/QT3DSDM/Systems/HandleSystemBase.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/HandleSystemBase.h
diff --git a/src/Authoring/QT3DSDM/Systems/HandleSystemTransactions.h b/src/Runtime/ogl-runtime/src/dm/systems/HandleSystemTransactions.h
index 9d77884e..9d77884e 100644
--- a/src/Authoring/QT3DSDM/Systems/HandleSystemTransactions.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/HandleSystemTransactions.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionCore.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMActionCore.h
index a9201462..a9201462 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionCore.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMActionCore.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionInfo.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMActionInfo.h
index 40fd9645..40fd9645 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionInfo.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMActionInfo.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionSystem.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMActionSystem.h
index 8713729a..8713729a 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionSystem.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMActionSystem.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMAnimation.h
index 457b042f..457b042f 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMAnimation.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMComposerTypeDefinitions.cpp
index 2bd89418..2bd89418 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMComposerTypeDefinitions.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMComposerTypeDefinitions.h
index 1a079402..1a079402 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMComposerTypeDefinitions.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMDataCore.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMDataCore.h
index 793cddb4..793cddb4 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMDataCore.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMDataCore.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMDataTypes.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMDataTypes.h
index 7a7157f6..7a7157f6 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMDataTypes.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMDataTypes.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMErrors.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMErrors.h
index 77ea7bf7..77ea7bf7 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMErrors.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMErrors.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMGuides.cpp b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMGuides.cpp
index e8ea421f..e8ea421f 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMGuides.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMGuides.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMGuides.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMGuides.h
index 0362abff..0362abff 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMGuides.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMGuides.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMHandles.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMHandles.h
index 05867a14..05867a14 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMHandles.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMHandles.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMMetaData.cpp
index 66f56ce8..66f56ce8 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMMetaData.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMMetaData.h
index 67a7fb18..67a7fb18 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMMetaData.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaDataTypes.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMMetaDataTypes.h
index 5532e0a5..5532e0a5 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaDataTypes.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMMetaDataTypes.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaDataValue.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMMetaDataValue.h
index b981b956..b981b956 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaDataValue.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMMetaDataValue.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMPropertyDefinition.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMPropertyDefinition.h
index d324b539..d324b539 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMPropertyDefinition.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMPropertyDefinition.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalStructImpl.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMSignalStructImpl.h
index 9664566f..9664566f 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalStructImpl.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMSignalStructImpl.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalStructs.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMSignalStructs.h
index 86c09fd4..86c09fd4 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalStructs.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMSignalStructs.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalSystem.cpp b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMSignalSystem.cpp
index 37d02003..37d02003 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalSystem.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMSignalSystem.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalSystem.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMSignalSystem.h
index cd80010d..cd80010d 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalSystem.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMSignalSystem.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignals.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMSignals.h
index 57b96591..57b96591 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignals.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMSignals.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideCore.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMSlideCore.h
index 8216b01d..8216b01d 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideCore.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMSlideCore.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideGraphCore.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMSlideGraphCore.h
index 34c04e11..34c04e11 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideGraphCore.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMSlideGraphCore.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlides.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMSlides.h
index aa7c27ce..aa7c27ce 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlides.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMSlides.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMStringTable.cpp b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMStringTable.cpp
index 58db71c7..58db71c7 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMStringTable.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMStringTable.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMStringTable.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMStringTable.h
index 7f1e9453..7f1e9453 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMStringTable.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMStringTable.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMTestOps.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMTestOps.h
index ac43eaf0..ac43eaf0 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMTestOps.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMTestOps.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMTransactions.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMTransactions.h
index f6ed3da0..f6ed3da0 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMTransactions.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMTransactions.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMValue.cpp b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMValue.cpp
index 94c5a594..94c5a594 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMValue.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMValue.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMValue.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMValue.h
index 9e006320..9e006320 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMValue.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMValue.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOps.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMWStrOps.h
index b1e1fb01..b1e1fb01 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOps.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMWStrOps.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMWStrOpsImpl.h
index d65ac131..d65ac131 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMWStrOpsImpl.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWindowsCompatibility.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMWindowsCompatibility.h
index 0a53c71c..0a53c71c 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWindowsCompatibility.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMWindowsCompatibility.h
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMXML.cpp b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMXML.cpp
index 2055adf1..2055adf1 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMXML.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMXML.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMXML.h b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMXML.h
index 5fe722f9..5fe722f9 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMXML.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMXML.h
diff --git a/src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp b/src/Runtime/ogl-runtime/src/dm/systems/SignalsImpl.cpp
index 6f42516b..6f42516b 100644
--- a/src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/SignalsImpl.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/SignalsImpl.h b/src/Runtime/ogl-runtime/src/dm/systems/SignalsImpl.h
index 988270e8..988270e8 100644
--- a/src/Authoring/QT3DSDM/Systems/SignalsImpl.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/SignalsImpl.h
diff --git a/src/Authoring/QT3DSDM/Systems/SlideSystem.cpp b/src/Runtime/ogl-runtime/src/dm/systems/SlideSystem.cpp
index d6d88932..d6d88932 100644
--- a/src/Authoring/QT3DSDM/Systems/SlideSystem.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/SlideSystem.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/SlideSystem.h b/src/Runtime/ogl-runtime/src/dm/systems/SlideSystem.h
index 1ea3f816..1ea3f816 100644
--- a/src/Authoring/QT3DSDM/Systems/SlideSystem.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/SlideSystem.h
diff --git a/src/Authoring/QT3DSDM/Systems/StandardExtensions.h b/src/Runtime/ogl-runtime/src/dm/systems/StandardExtensions.h
index a9946002..a9946002 100644
--- a/src/Authoring/QT3DSDM/Systems/StandardExtensions.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/StandardExtensions.h
diff --git a/src/Authoring/QT3DSDM/Systems/StudioAnimationSystem.cpp b/src/Runtime/ogl-runtime/src/dm/systems/StudioAnimationSystem.cpp
index 2b788880..2b788880 100644
--- a/src/Authoring/QT3DSDM/Systems/StudioAnimationSystem.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/StudioAnimationSystem.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/StudioAnimationSystem.h b/src/Runtime/ogl-runtime/src/dm/systems/StudioAnimationSystem.h
index e6fdf755..e6fdf755 100644
--- a/src/Authoring/QT3DSDM/Systems/StudioAnimationSystem.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/StudioAnimationSystem.h
diff --git a/src/Authoring/QT3DSDM/Systems/StudioCoreSystem.cpp b/src/Runtime/ogl-runtime/src/dm/systems/StudioCoreSystem.cpp
index f9f0e2c8..f9f0e2c8 100644
--- a/src/Authoring/QT3DSDM/Systems/StudioCoreSystem.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/StudioCoreSystem.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/StudioCoreSystem.h b/src/Runtime/ogl-runtime/src/dm/systems/StudioCoreSystem.h
index 18f1dad6..18f1dad6 100644
--- a/src/Authoring/QT3DSDM/Systems/StudioCoreSystem.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/StudioCoreSystem.h
diff --git a/src/Authoring/QT3DSDM/Systems/StudioFullSystem.cpp b/src/Runtime/ogl-runtime/src/dm/systems/StudioFullSystem.cpp
index c98f8a81..c98f8a81 100644
--- a/src/Authoring/QT3DSDM/Systems/StudioFullSystem.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/StudioFullSystem.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/StudioFullSystem.h b/src/Runtime/ogl-runtime/src/dm/systems/StudioFullSystem.h
index 9411e783..9411e783 100644
--- a/src/Authoring/QT3DSDM/Systems/StudioFullSystem.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/StudioFullSystem.h
diff --git a/src/Authoring/QT3DSDM/Systems/StudioPropertySystem.cpp b/src/Runtime/ogl-runtime/src/dm/systems/StudioPropertySystem.cpp
index 78fabc6b..78fabc6b 100644
--- a/src/Authoring/QT3DSDM/Systems/StudioPropertySystem.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/StudioPropertySystem.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/StudioPropertySystem.h b/src/Runtime/ogl-runtime/src/dm/systems/StudioPropertySystem.h
index 67abcf98..67abcf98 100644
--- a/src/Authoring/QT3DSDM/Systems/StudioPropertySystem.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/StudioPropertySystem.h
diff --git a/src/Authoring/QT3DSDM/Systems/VectorTransactions.h b/src/Runtime/ogl-runtime/src/dm/systems/VectorTransactions.h
index ff1fe2e2..ff1fe2e2 100644
--- a/src/Authoring/QT3DSDM/Systems/VectorTransactions.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/VectorTransactions.h
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.cpp b/src/Runtime/ogl-runtime/src/dm/systems/cores/ActionCoreProducer.cpp
index c262c239..c262c239 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/ActionCoreProducer.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.h b/src/Runtime/ogl-runtime/src/dm/systems/cores/ActionCoreProducer.h
index bf65a387..bf65a387 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/ActionCoreProducer.h
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.cpp b/src/Runtime/ogl-runtime/src/dm/systems/cores/AnimationCoreProducer.cpp
index 14d18240..14d18240 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/AnimationCoreProducer.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.h b/src/Runtime/ogl-runtime/src/dm/systems/cores/AnimationCoreProducer.h
index 17603d64..17603d64 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/AnimationCoreProducer.h
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/DataCoreProducer.cpp b/src/Runtime/ogl-runtime/src/dm/systems/cores/DataCoreProducer.cpp
index 5c3cc924..5c3cc924 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/DataCoreProducer.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/DataCoreProducer.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/DataCoreProducer.h b/src/Runtime/ogl-runtime/src/dm/systems/cores/DataCoreProducer.h
index 8d89bfab..8d89bfab 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/DataCoreProducer.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/DataCoreProducer.h
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.cpp b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleActionCore.cpp
index b2f35538..b2f35538 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleActionCore.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.h b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleActionCore.h
index 1e229f18..1e229f18 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleActionCore.h
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.cpp b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleAnimationCore.cpp
index 00d6df4e..00d6df4e 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleAnimationCore.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.h b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleAnimationCore.h
index cb4c4154..cb4c4154 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleAnimationCore.h
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleDataCore.cpp b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleDataCore.cpp
index d6a1470b..d6a1470b 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleDataCore.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleDataCore.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleDataCore.h b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleDataCore.h
index 2664dab4..2664dab4 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleDataCore.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleDataCore.h
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideCore.cpp b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleSlideCore.cpp
index 87eadb9f..87eadb9f 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideCore.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleSlideCore.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideCore.h b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleSlideCore.h
index 278ef777..278ef777 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideCore.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleSlideCore.h
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.cpp b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleSlideGraphCore.cpp
index 5f1de1ea..5f1de1ea 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleSlideGraphCore.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.h b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleSlideGraphCore.h
index 484d6750..484d6750 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/SimpleSlideGraphCore.h
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SlideCoreProducer.cpp b/src/Runtime/ogl-runtime/src/dm/systems/cores/SlideCoreProducer.cpp
index 86b0d1fe..86b0d1fe 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SlideCoreProducer.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/SlideCoreProducer.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SlideCoreProducer.h b/src/Runtime/ogl-runtime/src/dm/systems/cores/SlideCoreProducer.h
index dec0297d..dec0297d 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SlideCoreProducer.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/SlideCoreProducer.h
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.cpp b/src/Runtime/ogl-runtime/src/dm/systems/cores/SlideGraphCoreProducer.cpp
index c514108c..c514108c 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/SlideGraphCoreProducer.cpp
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.h b/src/Runtime/ogl-runtime/src/dm/systems/cores/SlideGraphCoreProducer.h
index 5b34cdb9..5b34cdb9 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/cores/SlideGraphCoreProducer.h
diff --git a/src/Runtime/Source/engine/EnginePrefix.h b/src/Runtime/ogl-runtime/src/engine/EnginePrefix.h
index d9017850..d9017850 100644
--- a/src/Runtime/Source/engine/EnginePrefix.h
+++ b/src/Runtime/ogl-runtime/src/engine/EnginePrefix.h
diff --git a/src/Runtime/Source/engine/NVImageScaler.h b/src/Runtime/ogl-runtime/src/engine/NVImageScaler.h
index 069604a6..069604a6 100644
--- a/src/Runtime/Source/engine/NVImageScaler.h
+++ b/src/Runtime/ogl-runtime/src/engine/NVImageScaler.h
diff --git a/src/Runtime/Source/engine/OpenKodeInclude.h b/src/Runtime/ogl-runtime/src/engine/OpenKodeInclude.h
index 06bdf006..06bdf006 100644
--- a/src/Runtime/Source/engine/OpenKodeInclude.h
+++ b/src/Runtime/ogl-runtime/src/engine/OpenKodeInclude.h
diff --git a/src/Runtime/Source/engine/Qt3DSEGLInfo.h b/src/Runtime/ogl-runtime/src/engine/Qt3DSEGLInfo.h
index 7be2c09e..7be2c09e 100644
--- a/src/Runtime/Source/engine/Qt3DSEGLInfo.h
+++ b/src/Runtime/ogl-runtime/src/engine/Qt3DSEGLInfo.h
diff --git a/src/Runtime/Source/engine/Qt3DSEGLWindowSystem.h b/src/Runtime/ogl-runtime/src/engine/Qt3DSEGLWindowSystem.h
index 770f5c9f..770f5c9f 100644
--- a/src/Runtime/Source/engine/Qt3DSEGLWindowSystem.h
+++ b/src/Runtime/ogl-runtime/src/engine/Qt3DSEGLWindowSystem.h
diff --git a/src/Runtime/Source/engine/Qt3DSPluginDLL.h b/src/Runtime/ogl-runtime/src/engine/Qt3DSPluginDLL.h
index 1ba7cf08..1ba7cf08 100644
--- a/src/Runtime/Source/engine/Qt3DSPluginDLL.h
+++ b/src/Runtime/ogl-runtime/src/engine/Qt3DSPluginDLL.h
diff --git a/src/Runtime/Source/engine/Qt3DSRenderRuntimeBinding.cpp b/src/Runtime/ogl-runtime/src/engine/Qt3DSRenderRuntimeBinding.cpp
index cd99a95b..cd99a95b 100644
--- a/src/Runtime/Source/engine/Qt3DSRenderRuntimeBinding.cpp
+++ b/src/Runtime/ogl-runtime/src/engine/Qt3DSRenderRuntimeBinding.cpp
diff --git a/src/Runtime/Source/engine/Qt3DSRenderRuntimeBinding.h b/src/Runtime/ogl-runtime/src/engine/Qt3DSRenderRuntimeBinding.h
index ad0c4e6b..ad0c4e6b 100644
--- a/src/Runtime/Source/engine/Qt3DSRenderRuntimeBinding.h
+++ b/src/Runtime/ogl-runtime/src/engine/Qt3DSRenderRuntimeBinding.h
diff --git a/src/Runtime/Source/engine/Qt3DSRenderRuntimeBindingImpl.h b/src/Runtime/ogl-runtime/src/engine/Qt3DSRenderRuntimeBindingImpl.h
index 92cb8658..92cb8658 100644
--- a/src/Runtime/Source/engine/Qt3DSRenderRuntimeBindingImpl.h
+++ b/src/Runtime/ogl-runtime/src/engine/Qt3DSRenderRuntimeBindingImpl.h
diff --git a/src/Runtime/Source/engine/Qt3DSRenderRuntimeBindingImplRenderer.cpp b/src/Runtime/ogl-runtime/src/engine/Qt3DSRenderRuntimeBindingImplRenderer.cpp
index b41c83b9..b41c83b9 100644
--- a/src/Runtime/Source/engine/Qt3DSRenderRuntimeBindingImplRenderer.cpp
+++ b/src/Runtime/ogl-runtime/src/engine/Qt3DSRenderRuntimeBindingImplRenderer.cpp
diff --git a/src/Runtime/Source/engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp b/src/Runtime/ogl-runtime/src/engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp
index a4b3bc7e..a4b3bc7e 100644
--- a/src/Runtime/Source/engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp
+++ b/src/Runtime/ogl-runtime/src/engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp
diff --git a/src/Runtime/Source/engine/Qt3DSRuntimeView.cpp b/src/Runtime/ogl-runtime/src/engine/Qt3DSRuntimeView.cpp
index fc6c3cac..fc6c3cac 100644
--- a/src/Runtime/Source/engine/Qt3DSRuntimeView.cpp
+++ b/src/Runtime/ogl-runtime/src/engine/Qt3DSRuntimeView.cpp
diff --git a/src/Runtime/Source/engine/Qt3DSRuntimeView.h b/src/Runtime/ogl-runtime/src/engine/Qt3DSRuntimeView.h
index 9ade9c7f..9ade9c7f 100644
--- a/src/Runtime/Source/engine/Qt3DSRuntimeView.h
+++ b/src/Runtime/ogl-runtime/src/engine/Qt3DSRuntimeView.h
diff --git a/src/Runtime/Source/engine/Qt3DSTegraInputEngine.cpp b/src/Runtime/ogl-runtime/src/engine/Qt3DSTegraInputEngine.cpp
index bb9a7f95..bb9a7f95 100644
--- a/src/Runtime/Source/engine/Qt3DSTegraInputEngine.cpp
+++ b/src/Runtime/ogl-runtime/src/engine/Qt3DSTegraInputEngine.cpp
diff --git a/src/Runtime/Source/engine/Qt3DSTegraInputEngine.h b/src/Runtime/ogl-runtime/src/engine/Qt3DSTegraInputEngine.h
index 29f20f29..29f20f29 100644
--- a/src/Runtime/Source/engine/Qt3DSTegraInputEngine.h
+++ b/src/Runtime/ogl-runtime/src/engine/Qt3DSTegraInputEngine.h
diff --git a/src/Runtime/Source/engine/Qt3DSWindowSystem.h b/src/Runtime/ogl-runtime/src/engine/Qt3DSWindowSystem.h
index 173dd837..173dd837 100644
--- a/src/Runtime/Source/engine/Qt3DSWindowSystem.h
+++ b/src/Runtime/ogl-runtime/src/engine/Qt3DSWindowSystem.h
diff --git a/src/Runtime/Source/event/EventFactory.cpp b/src/Runtime/ogl-runtime/src/event/EventFactory.cpp
index 4bf776c6..4bf776c6 100644
--- a/src/Runtime/Source/event/EventFactory.cpp
+++ b/src/Runtime/ogl-runtime/src/event/EventFactory.cpp
diff --git a/src/Runtime/Source/event/EventFactory.h b/src/Runtime/ogl-runtime/src/event/EventFactory.h
index 10fe6b72..10fe6b72 100644
--- a/src/Runtime/Source/event/EventFactory.h
+++ b/src/Runtime/ogl-runtime/src/event/EventFactory.h
diff --git a/src/Runtime/Source/event/EventPoller.cpp b/src/Runtime/ogl-runtime/src/event/EventPoller.cpp
index a8115953..a8115953 100644
--- a/src/Runtime/Source/event/EventPoller.cpp
+++ b/src/Runtime/ogl-runtime/src/event/EventPoller.cpp
diff --git a/src/Runtime/Source/event/EventPoller.h b/src/Runtime/ogl-runtime/src/event/EventPoller.h
index 99ac27d6..99ac27d6 100644
--- a/src/Runtime/Source/event/EventPoller.h
+++ b/src/Runtime/ogl-runtime/src/event/EventPoller.h
diff --git a/src/Runtime/Source/event/EventPollingSystem.h b/src/Runtime/ogl-runtime/src/event/EventPollingSystem.h
index 4d414066..4d414066 100644
--- a/src/Runtime/Source/event/EventPollingSystem.h
+++ b/src/Runtime/ogl-runtime/src/event/EventPollingSystem.h
diff --git a/src/Runtime/Source/event/EventSystem.h b/src/Runtime/ogl-runtime/src/event/EventSystem.h
index a9e3dbc5..a9e3dbc5 100644
--- a/src/Runtime/Source/event/EventSystem.h
+++ b/src/Runtime/ogl-runtime/src/event/EventSystem.h
diff --git a/src/Runtime/Source/event/EventSystemC.cpp b/src/Runtime/ogl-runtime/src/event/EventSystemC.cpp
index 8bfdb81c..8bfdb81c 100644
--- a/src/Runtime/Source/event/EventSystemC.cpp
+++ b/src/Runtime/ogl-runtime/src/event/EventSystemC.cpp
diff --git a/src/Runtime/Source/event/EventSystemC.h b/src/Runtime/ogl-runtime/src/event/EventSystemC.h
index 2517eae4..2517eae4 100644
--- a/src/Runtime/Source/event/EventSystemC.h
+++ b/src/Runtime/ogl-runtime/src/event/EventSystemC.h
diff --git a/src/Runtime/Source/event/test/CanProviderDemo.cpp b/src/Runtime/ogl-runtime/src/event/test/CanProviderDemo.cpp
index dc51e9db..dc51e9db 100644
--- a/src/Runtime/Source/event/test/CanProviderDemo.cpp
+++ b/src/Runtime/ogl-runtime/src/event/test/CanProviderDemo.cpp
diff --git a/src/Runtime/Source/event/test/CanProviderDemo.h b/src/Runtime/ogl-runtime/src/event/test/CanProviderDemo.h
index 7d6788bc..7d6788bc 100644
--- a/src/Runtime/Source/event/test/CanProviderDemo.h
+++ b/src/Runtime/ogl-runtime/src/event/test/CanProviderDemo.h
diff --git a/src/Runtime/Source/foundation/AutoDeallocatorAllocator.h b/src/Runtime/ogl-runtime/src/foundation/AutoDeallocatorAllocator.h
index 5cbbc8bb..5cbbc8bb 100644
--- a/src/Runtime/Source/foundation/AutoDeallocatorAllocator.h
+++ b/src/Runtime/ogl-runtime/src/foundation/AutoDeallocatorAllocator.h
diff --git a/src/Runtime/Source/foundation/ConvertUTF.cpp b/src/Runtime/ogl-runtime/src/foundation/ConvertUTF.cpp
index a71a3aeb..a71a3aeb 100644
--- a/src/Runtime/Source/foundation/ConvertUTF.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/ConvertUTF.cpp
diff --git a/src/Runtime/Source/foundation/ConvertUTF.h b/src/Runtime/ogl-runtime/src/foundation/ConvertUTF.h
index 93614a0c..93614a0c 100644
--- a/src/Runtime/Source/foundation/ConvertUTF.h
+++ b/src/Runtime/ogl-runtime/src/foundation/ConvertUTF.h
diff --git a/src/Runtime/Source/foundation/EASTL_new.cpp b/src/Runtime/ogl-runtime/src/foundation/EASTL_new.cpp
index 61e8e0b4..61e8e0b4 100644
--- a/src/Runtime/Source/foundation/EASTL_new.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/EASTL_new.cpp
diff --git a/src/Runtime/Source/foundation/FastAllocator.h b/src/Runtime/ogl-runtime/src/foundation/FastAllocator.h
index c296bcb6..c296bcb6 100644
--- a/src/Runtime/Source/foundation/FastAllocator.h
+++ b/src/Runtime/ogl-runtime/src/foundation/FastAllocator.h
diff --git a/src/Runtime/Source/foundation/FileTools.cpp b/src/Runtime/ogl-runtime/src/foundation/FileTools.cpp
index aa1e7384..aa1e7384 100644
--- a/src/Runtime/Source/foundation/FileTools.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/FileTools.cpp
diff --git a/src/Runtime/Source/foundation/FileTools.h b/src/Runtime/ogl-runtime/src/foundation/FileTools.h
index 57455256..57455256 100644
--- a/src/Runtime/Source/foundation/FileTools.h
+++ b/src/Runtime/ogl-runtime/src/foundation/FileTools.h
diff --git a/src/Runtime/Source/foundation/IOStreams.cpp b/src/Runtime/ogl-runtime/src/foundation/IOStreams.cpp
index f1adfbc0..f1adfbc0 100644
--- a/src/Runtime/Source/foundation/IOStreams.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/IOStreams.cpp
diff --git a/src/Runtime/Source/foundation/IOStreams.h b/src/Runtime/ogl-runtime/src/foundation/IOStreams.h
index 855e5209..855e5209 100644
--- a/src/Runtime/Source/foundation/IOStreams.h
+++ b/src/Runtime/ogl-runtime/src/foundation/IOStreams.h
diff --git a/src/Runtime/Source/foundation/LICENCE_SOCKET.TXT b/src/Runtime/ogl-runtime/src/foundation/LICENCE_SOCKET.TXT
index 9b9ab805..9b9ab805 100644
--- a/src/Runtime/Source/foundation/LICENCE_SOCKET.TXT
+++ b/src/Runtime/ogl-runtime/src/foundation/LICENCE_SOCKET.TXT
diff --git a/src/Runtime/Source/foundation/LICENSE_CONVERTUTF.TXT b/src/Runtime/ogl-runtime/src/foundation/LICENSE_CONVERTUTF.TXT
index 254acdfe..254acdfe 100644
--- a/src/Runtime/Source/foundation/LICENSE_CONVERTUTF.TXT
+++ b/src/Runtime/ogl-runtime/src/foundation/LICENSE_CONVERTUTF.TXT
diff --git a/src/Runtime/Source/foundation/PoolingAllocator.h b/src/Runtime/ogl-runtime/src/foundation/PoolingAllocator.h
index 9d939fdc..9d939fdc 100644
--- a/src/Runtime/Source/foundation/PoolingAllocator.h
+++ b/src/Runtime/ogl-runtime/src/foundation/PoolingAllocator.h
diff --git a/src/Runtime/Source/foundation/PreAllocatedAllocator.h b/src/Runtime/ogl-runtime/src/foundation/PreAllocatedAllocator.h
index aea03577..aea03577 100644
--- a/src/Runtime/Source/foundation/PreAllocatedAllocator.h
+++ b/src/Runtime/ogl-runtime/src/foundation/PreAllocatedAllocator.h
diff --git a/src/Runtime/Source/foundation/Qt3DS.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DS.h
index 041923c3..041923c3 100644
--- a/src/Runtime/Source/foundation/Qt3DS.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DS.h
diff --git a/src/Runtime/Source/foundation/Qt3DSAllocator.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSAllocator.h
index cdbbe5f9..cdbbe5f9 100644
--- a/src/Runtime/Source/foundation/Qt3DSAllocator.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSAllocator.h
diff --git a/src/Runtime/Source/foundation/Qt3DSAllocatorCallback.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSAllocatorCallback.h
index ebbf8198..ebbf8198 100644
--- a/src/Runtime/Source/foundation/Qt3DSAllocatorCallback.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSAllocatorCallback.h
diff --git a/src/Runtime/Source/foundation/Qt3DSAssert.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSAssert.h
index a628159f..a628159f 100644
--- a/src/Runtime/Source/foundation/Qt3DSAssert.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSAssert.h
diff --git a/src/Runtime/Source/foundation/Qt3DSAtomic.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSAtomic.h
index 69c7d3b4..69c7d3b4 100644
--- a/src/Runtime/Source/foundation/Qt3DSAtomic.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSAtomic.h
diff --git a/src/Runtime/Source/foundation/Qt3DSBasicTemplates.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSBasicTemplates.h
index f14c7b32..f14c7b32 100644
--- a/src/Runtime/Source/foundation/Qt3DSBasicTemplates.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSBasicTemplates.h
diff --git a/src/Runtime/Source/foundation/Qt3DSBounds3.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSBounds3.h
index fda4a6d4..fda4a6d4 100644
--- a/src/Runtime/Source/foundation/Qt3DSBounds3.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSBounds3.h
diff --git a/src/Runtime/Source/foundation/Qt3DSBroadcastingAllocator.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSBroadcastingAllocator.h
index dc6ae7b5..dc6ae7b5 100644
--- a/src/Runtime/Source/foundation/Qt3DSBroadcastingAllocator.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSBroadcastingAllocator.h
diff --git a/src/Runtime/Source/foundation/Qt3DSContainers.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSContainers.h
index de86d856..de86d856 100644
--- a/src/Runtime/Source/foundation/Qt3DSContainers.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSContainers.h
diff --git a/src/Runtime/Source/foundation/Qt3DSDataRef.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSDataRef.h
index ad860cef..ad860cef 100644
--- a/src/Runtime/Source/foundation/Qt3DSDataRef.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSDataRef.h
diff --git a/src/Runtime/Source/foundation/Qt3DSDiscriminatedUnion.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSDiscriminatedUnion.h
index 1957eb23..1957eb23 100644
--- a/src/Runtime/Source/foundation/Qt3DSDiscriminatedUnion.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSDiscriminatedUnion.h
diff --git a/src/Runtime/Source/foundation/Qt3DSFPU.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSFPU.h
index e4a47f0c..e4a47f0c 100644
--- a/src/Runtime/Source/foundation/Qt3DSFPU.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSFPU.h
diff --git a/src/Runtime/Source/foundation/Qt3DSFastIPC.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSFastIPC.h
index 800c3dfd..800c3dfd 100644
--- a/src/Runtime/Source/foundation/Qt3DSFastIPC.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSFastIPC.h
diff --git a/src/Runtime/Source/foundation/Qt3DSFlags.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSFlags.h
index 765f386f..765f386f 100644
--- a/src/Runtime/Source/foundation/Qt3DSFlags.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSFlags.h
diff --git a/src/Runtime/Source/foundation/Qt3DSFoundation.cpp b/src/Runtime/ogl-runtime/src/foundation/Qt3DSFoundation.cpp
index 8687cd69..8687cd69 100644
--- a/src/Runtime/Source/foundation/Qt3DSFoundation.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSFoundation.cpp
diff --git a/src/Runtime/Source/foundation/Qt3DSFoundation.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSFoundation.h
index 19065d20..19065d20 100644
--- a/src/Runtime/Source/foundation/Qt3DSFoundation.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSFoundation.h
diff --git a/src/Runtime/Source/foundation/Qt3DSIPC.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSIPC.h
index 9bcea1af..9bcea1af 100644
--- a/src/Runtime/Source/foundation/Qt3DSIPC.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSIPC.h
diff --git a/src/Runtime/Source/foundation/Qt3DSIndexableLinkedList.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSIndexableLinkedList.h
index ff36b42a..ff36b42a 100644
--- a/src/Runtime/Source/foundation/Qt3DSIndexableLinkedList.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSIndexableLinkedList.h
diff --git a/src/Runtime/Source/foundation/Qt3DSIntrinsics.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSIntrinsics.h
index 1d6ac7a5..1d6ac7a5 100644
--- a/src/Runtime/Source/foundation/Qt3DSIntrinsics.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSIntrinsics.h
diff --git a/src/Runtime/Source/foundation/Qt3DSInvasiveLinkedList.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSInvasiveLinkedList.h
index da90e120..da90e120 100644
--- a/src/Runtime/Source/foundation/Qt3DSInvasiveLinkedList.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSInvasiveLinkedList.h
diff --git a/src/Runtime/Source/foundation/Qt3DSInvasiveSet.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSInvasiveSet.h
index 772a2308..772a2308 100644
--- a/src/Runtime/Source/foundation/Qt3DSInvasiveSet.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSInvasiveSet.h
diff --git a/src/Runtime/Source/foundation/Qt3DSLogging.cpp b/src/Runtime/ogl-runtime/src/foundation/Qt3DSLogging.cpp
index 257b39b2..257b39b2 100644
--- a/src/Runtime/Source/foundation/Qt3DSLogging.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSLogging.cpp
diff --git a/src/Runtime/Source/foundation/Qt3DSLogging.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSLogging.h
index 4fcb77b5..4fcb77b5 100644
--- a/src/Runtime/Source/foundation/Qt3DSLogging.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSLogging.h
diff --git a/src/Runtime/Source/foundation/Qt3DSMat33.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSMat33.h
index 6fa69eb5..6fa69eb5 100644
--- a/src/Runtime/Source/foundation/Qt3DSMat33.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSMat33.h
diff --git a/src/Runtime/Source/foundation/Qt3DSMat44.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSMat44.h
index 53a66e2b..53a66e2b 100644
--- a/src/Runtime/Source/foundation/Qt3DSMat44.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSMat44.h
diff --git a/src/Runtime/Source/foundation/Qt3DSMath.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSMath.h
index 931852e7..931852e7 100644
--- a/src/Runtime/Source/foundation/Qt3DSMath.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSMath.h
diff --git a/src/Runtime/Source/foundation/Qt3DSMathUtils.cpp b/src/Runtime/ogl-runtime/src/foundation/Qt3DSMathUtils.cpp
index 7eee7405..7eee7405 100644
--- a/src/Runtime/Source/foundation/Qt3DSMathUtils.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSMathUtils.cpp
diff --git a/src/Runtime/Source/foundation/Qt3DSMathUtils.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSMathUtils.h
index 6d3d0abc..6d3d0abc 100644
--- a/src/Runtime/Source/foundation/Qt3DSMathUtils.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSMathUtils.h
diff --git a/src/Runtime/Source/foundation/Qt3DSMemoryBuffer.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSMemoryBuffer.h
index bee2f0c2..bee2f0c2 100644
--- a/src/Runtime/Source/foundation/Qt3DSMemoryBuffer.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSMemoryBuffer.h
diff --git a/src/Runtime/Source/foundation/Qt3DSMutex.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSMutex.h
index 5b717e5c..5b717e5c 100644
--- a/src/Runtime/Source/foundation/Qt3DSMutex.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSMutex.h
diff --git a/src/Runtime/Source/foundation/Qt3DSNoCopy.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSNoCopy.h
index 817f5e19..817f5e19 100644
--- a/src/Runtime/Source/foundation/Qt3DSNoCopy.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSNoCopy.h
diff --git a/src/Runtime/Source/foundation/Qt3DSOption.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSOption.h
index 18d6c3b2..18d6c3b2 100644
--- a/src/Runtime/Source/foundation/Qt3DSOption.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSOption.h
diff --git a/src/Runtime/Source/foundation/Qt3DSPerfTimer.cpp b/src/Runtime/ogl-runtime/src/foundation/Qt3DSPerfTimer.cpp
index 06fb5d38..06fb5d38 100644
--- a/src/Runtime/Source/foundation/Qt3DSPerfTimer.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSPerfTimer.cpp
diff --git a/src/Runtime/Source/foundation/Qt3DSPerfTimer.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSPerfTimer.h
index c63091c0..c63091c0 100644
--- a/src/Runtime/Source/foundation/Qt3DSPerfTimer.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSPerfTimer.h
diff --git a/src/Runtime/Source/foundation/Qt3DSPlane.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSPlane.h
index 378c3bc9..378c3bc9 100644
--- a/src/Runtime/Source/foundation/Qt3DSPlane.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSPlane.h
diff --git a/src/Runtime/Source/foundation/Qt3DSPool.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSPool.h
index 5bd07f86..5bd07f86 100644
--- a/src/Runtime/Source/foundation/Qt3DSPool.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSPool.h
diff --git a/src/Runtime/Source/foundation/Qt3DSPreprocessor.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSPreprocessor.h
index 371d3e67..371d3e67 100644
--- a/src/Runtime/Source/foundation/Qt3DSPreprocessor.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSPreprocessor.h
diff --git a/src/Runtime/Source/foundation/Qt3DSQuat.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSQuat.h
index 2792f977..2792f977 100644
--- a/src/Runtime/Source/foundation/Qt3DSQuat.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSQuat.h
diff --git a/src/Runtime/Source/foundation/Qt3DSRefCounted.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSRefCounted.h
index b500b5fc..b500b5fc 100644
--- a/src/Runtime/Source/foundation/Qt3DSRefCounted.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSRefCounted.h
diff --git a/src/Runtime/Source/foundation/Qt3DSSemaphore.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSSemaphore.h
index f58bb6e0..f58bb6e0 100644
--- a/src/Runtime/Source/foundation/Qt3DSSemaphore.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSSemaphore.h
diff --git a/src/Runtime/Source/foundation/Qt3DSSimpleTypes.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSSimpleTypes.h
index 92f17245..92f17245 100644
--- a/src/Runtime/Source/foundation/Qt3DSSimpleTypes.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSSimpleTypes.h
diff --git a/src/Runtime/Source/foundation/Qt3DSStringTokenizer.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSStringTokenizer.h
index 5229babd..5229babd 100644
--- a/src/Runtime/Source/foundation/Qt3DSStringTokenizer.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSStringTokenizer.h
diff --git a/src/Runtime/Source/foundation/Qt3DSSync.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSSync.h
index a36afaeb..a36afaeb 100644
--- a/src/Runtime/Source/foundation/Qt3DSSync.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSSync.h
diff --git a/src/Runtime/Source/foundation/Qt3DSSystem.cpp b/src/Runtime/ogl-runtime/src/foundation/Qt3DSSystem.cpp
index e87a25ea..e87a25ea 100644
--- a/src/Runtime/Source/foundation/Qt3DSSystem.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSSystem.cpp
diff --git a/src/Runtime/Source/foundation/Qt3DSSystem.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSSystem.h
index 84ca87d1..84ca87d1 100644
--- a/src/Runtime/Source/foundation/Qt3DSSystem.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSSystem.h
diff --git a/src/Runtime/Source/foundation/Qt3DSThread.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSThread.h
index 84e169d6..84e169d6 100644
--- a/src/Runtime/Source/foundation/Qt3DSThread.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSThread.h
diff --git a/src/Runtime/Source/foundation/Qt3DSTime.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSTime.h
index 955bd7e0..955bd7e0 100644
--- a/src/Runtime/Source/foundation/Qt3DSTime.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSTime.h
diff --git a/src/Runtime/Source/foundation/Qt3DSTransform.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSTransform.h
index 0fee0a81..0fee0a81 100644
--- a/src/Runtime/Source/foundation/Qt3DSTransform.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSTransform.h
diff --git a/src/Runtime/Source/foundation/Qt3DSUnionCast.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSUnionCast.h
index a3d03555..a3d03555 100644
--- a/src/Runtime/Source/foundation/Qt3DSUnionCast.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSUnionCast.h
diff --git a/src/Runtime/Source/foundation/Qt3DSUtilities.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSUtilities.h
index cb9ae6a2..cb9ae6a2 100644
--- a/src/Runtime/Source/foundation/Qt3DSUtilities.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSUtilities.h
diff --git a/src/Runtime/Source/foundation/Qt3DSVec2.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSVec2.h
index 0d86c915..0d86c915 100644
--- a/src/Runtime/Source/foundation/Qt3DSVec2.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSVec2.h
diff --git a/src/Runtime/Source/foundation/Qt3DSVec3.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSVec3.h
index 24ab8231..24ab8231 100644
--- a/src/Runtime/Source/foundation/Qt3DSVec3.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSVec3.h
diff --git a/src/Runtime/Source/foundation/Qt3DSVec4.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSVec4.h
index acccd48c..acccd48c 100644
--- a/src/Runtime/Source/foundation/Qt3DSVec4.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSVec4.h
diff --git a/src/Runtime/Source/foundation/Qt3DSVersionNumber.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSVersionNumber.h
index 5942ef72..5942ef72 100644
--- a/src/Runtime/Source/foundation/Qt3DSVersionNumber.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSVersionNumber.h
diff --git a/src/Runtime/Source/foundation/SerializationTypes.h b/src/Runtime/ogl-runtime/src/foundation/SerializationTypes.h
index c7fe5ce7..c7fe5ce7 100644
--- a/src/Runtime/Source/foundation/SerializationTypes.h
+++ b/src/Runtime/ogl-runtime/src/foundation/SerializationTypes.h
diff --git a/src/Runtime/Source/foundation/Socket.cpp b/src/Runtime/ogl-runtime/src/foundation/Socket.cpp
index df00e606..df00e606 100644
--- a/src/Runtime/Source/foundation/Socket.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/Socket.cpp
diff --git a/src/Runtime/Source/foundation/Socket.h b/src/Runtime/ogl-runtime/src/foundation/Socket.h
index f561ab83..f561ab83 100644
--- a/src/Runtime/Source/foundation/Socket.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Socket.h
diff --git a/src/Runtime/Source/foundation/StrConvertUTF.h b/src/Runtime/ogl-runtime/src/foundation/StrConvertUTF.h
index 965867c9..965867c9 100644
--- a/src/Runtime/Source/foundation/StrConvertUTF.h
+++ b/src/Runtime/ogl-runtime/src/foundation/StrConvertUTF.h
diff --git a/src/Runtime/Source/foundation/StringConversion.h b/src/Runtime/ogl-runtime/src/foundation/StringConversion.h
index a55ebb3e..a55ebb3e 100644
--- a/src/Runtime/Source/foundation/StringConversion.h
+++ b/src/Runtime/ogl-runtime/src/foundation/StringConversion.h
diff --git a/src/Runtime/Source/foundation/StringConversionImpl.h b/src/Runtime/ogl-runtime/src/foundation/StringConversionImpl.h
index c5063e6d..c5063e6d 100644
--- a/src/Runtime/Source/foundation/StringConversionImpl.h
+++ b/src/Runtime/ogl-runtime/src/foundation/StringConversionImpl.h
diff --git a/src/Runtime/Source/foundation/StringTable.cpp b/src/Runtime/ogl-runtime/src/foundation/StringTable.cpp
index 47130dca..47130dca 100644
--- a/src/Runtime/Source/foundation/StringTable.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/StringTable.cpp
diff --git a/src/Runtime/Source/foundation/StringTable.h b/src/Runtime/ogl-runtime/src/foundation/StringTable.h
index aa57857a..aa57857a 100644
--- a/src/Runtime/Source/foundation/StringTable.h
+++ b/src/Runtime/ogl-runtime/src/foundation/StringTable.h
diff --git a/src/Runtime/Source/foundation/StringTools.h b/src/Runtime/ogl-runtime/src/foundation/StringTools.h
index 43324b46..43324b46 100644
--- a/src/Runtime/Source/foundation/StringTools.h
+++ b/src/Runtime/ogl-runtime/src/foundation/StringTools.h
diff --git a/src/Runtime/Source/foundation/TaggedPointer.h b/src/Runtime/ogl-runtime/src/foundation/TaggedPointer.h
index aa227250..aa227250 100644
--- a/src/Runtime/Source/foundation/TaggedPointer.h
+++ b/src/Runtime/ogl-runtime/src/foundation/TaggedPointer.h
diff --git a/src/Runtime/Source/foundation/ThreadSafeQueue.h b/src/Runtime/ogl-runtime/src/foundation/ThreadSafeQueue.h
index 462b6d49..462b6d49 100644
--- a/src/Runtime/Source/foundation/ThreadSafeQueue.h
+++ b/src/Runtime/ogl-runtime/src/foundation/ThreadSafeQueue.h
diff --git a/src/Runtime/Source/foundation/TrackingAllocator.cpp b/src/Runtime/ogl-runtime/src/foundation/TrackingAllocator.cpp
index 242b0ac0..242b0ac0 100644
--- a/src/Runtime/Source/foundation/TrackingAllocator.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/TrackingAllocator.cpp
diff --git a/src/Runtime/Source/foundation/TrackingAllocator.h b/src/Runtime/ogl-runtime/src/foundation/TrackingAllocator.h
index 4fd58069..4fd58069 100644
--- a/src/Runtime/Source/foundation/TrackingAllocator.h
+++ b/src/Runtime/ogl-runtime/src/foundation/TrackingAllocator.h
diff --git a/src/Runtime/Source/foundation/Utils.h b/src/Runtime/ogl-runtime/src/foundation/Utils.h
index 33c24004..33c24004 100644
--- a/src/Runtime/Source/foundation/Utils.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Utils.h
diff --git a/src/Runtime/Source/foundation/XML.cpp b/src/Runtime/ogl-runtime/src/foundation/XML.cpp
index bd12dfaf..bd12dfaf 100644
--- a/src/Runtime/Source/foundation/XML.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/XML.cpp
diff --git a/src/Runtime/Source/foundation/XML.h b/src/Runtime/ogl-runtime/src/foundation/XML.h
index 360bfdd7..360bfdd7 100644
--- a/src/Runtime/Source/foundation/XML.h
+++ b/src/Runtime/ogl-runtime/src/foundation/XML.h
diff --git a/src/Runtime/Source/foundation/linux/LICENSE.TXT b/src/Runtime/ogl-runtime/src/foundation/linux/LICENSE.TXT
index f40caef8..f40caef8 100644
--- a/src/Runtime/Source/foundation/linux/LICENSE.TXT
+++ b/src/Runtime/ogl-runtime/src/foundation/linux/LICENSE.TXT
diff --git a/src/Runtime/Source/foundation/linux/Qt3DSLinuxAoS.h b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxAoS.h
index 6bcb4406..6bcb4406 100644
--- a/src/Runtime/Source/foundation/linux/Qt3DSLinuxAoS.h
+++ b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxAoS.h
diff --git a/src/Runtime/Source/foundation/linux/Qt3DSLinuxAtomic.cpp b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxAtomic.cpp
index f0045dd9..f0045dd9 100644
--- a/src/Runtime/Source/foundation/linux/Qt3DSLinuxAtomic.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxAtomic.cpp
diff --git a/src/Runtime/Source/foundation/linux/Qt3DSLinuxFPU.cpp b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxFPU.cpp
index c3eae215..c3eae215 100644
--- a/src/Runtime/Source/foundation/linux/Qt3DSLinuxFPU.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxFPU.cpp
diff --git a/src/Runtime/Source/foundation/linux/Qt3DSLinuxFile.h b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxFile.h
index 1369735f..1369735f 100644
--- a/src/Runtime/Source/foundation/linux/Qt3DSLinuxFile.h
+++ b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxFile.h
diff --git a/src/Runtime/Source/foundation/linux/Qt3DSLinuxInlineAoS.h b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxInlineAoS.h
index 0443ba90..0443ba90 100644
--- a/src/Runtime/Source/foundation/linux/Qt3DSLinuxInlineAoS.h
+++ b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxInlineAoS.h
diff --git a/src/Runtime/Source/foundation/linux/Qt3DSLinuxIntrinsics.h b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxIntrinsics.h
index 70974609..70974609 100644
--- a/src/Runtime/Source/foundation/linux/Qt3DSLinuxIntrinsics.h
+++ b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxIntrinsics.h
diff --git a/src/Runtime/Source/foundation/linux/Qt3DSLinuxMutex.cpp b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxMutex.cpp
index bbc55829..bbc55829 100644
--- a/src/Runtime/Source/foundation/linux/Qt3DSLinuxMutex.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxMutex.cpp
diff --git a/src/Runtime/Source/foundation/linux/Qt3DSLinuxSemaphore.cpp b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxSemaphore.cpp
index 90aab79a..90aab79a 100644
--- a/src/Runtime/Source/foundation/linux/Qt3DSLinuxSemaphore.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxSemaphore.cpp
diff --git a/src/Runtime/Source/foundation/linux/Qt3DSLinuxString.h b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxString.h
index a4645f2b..a4645f2b 100644
--- a/src/Runtime/Source/foundation/linux/Qt3DSLinuxString.h
+++ b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxString.h
diff --git a/src/Runtime/Source/foundation/linux/Qt3DSLinuxSync.cpp b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxSync.cpp
index 52f9d7ab..52f9d7ab 100644
--- a/src/Runtime/Source/foundation/linux/Qt3DSLinuxSync.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxSync.cpp
diff --git a/src/Runtime/Source/foundation/linux/Qt3DSLinuxThread.cpp b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxThread.cpp
index fa6e069e..fa6e069e 100644
--- a/src/Runtime/Source/foundation/linux/Qt3DSLinuxThread.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxThread.cpp
diff --git a/src/Runtime/Source/foundation/linux/Qt3DSLinuxTime.cpp b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxTime.cpp
index 6b3e93e4..6b3e93e4 100644
--- a/src/Runtime/Source/foundation/linux/Qt3DSLinuxTime.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxTime.cpp
diff --git a/src/Runtime/Source/foundation/linux/Qt3DSLinuxTrigConstants.h b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxTrigConstants.h
index 120dec78..120dec78 100644
--- a/src/Runtime/Source/foundation/linux/Qt3DSLinuxTrigConstants.h
+++ b/src/Runtime/ogl-runtime/src/foundation/linux/Qt3DSLinuxTrigConstants.h
diff --git a/src/Runtime/Source/foundation/linux/SocketImpl.h b/src/Runtime/ogl-runtime/src/foundation/linux/SocketImpl.h
index 4c3fcb73..4c3fcb73 100644
--- a/src/Runtime/Source/foundation/linux/SocketImpl.h
+++ b/src/Runtime/ogl-runtime/src/foundation/linux/SocketImpl.h
diff --git a/src/Runtime/Source/foundation/linux/qt_attribution.json b/src/Runtime/ogl-runtime/src/foundation/linux/qt_attribution.json
index 3c3bed6b..3c3bed6b 100644
--- a/src/Runtime/Source/foundation/linux/qt_attribution.json
+++ b/src/Runtime/ogl-runtime/src/foundation/linux/qt_attribution.json
diff --git a/src/Runtime/Source/foundation/macos/Qt3DSUnixAtomic.cpp b/src/Runtime/ogl-runtime/src/foundation/macos/Qt3DSUnixAtomic.cpp
index c1ac3965..c1ac3965 100644
--- a/src/Runtime/Source/foundation/macos/Qt3DSUnixAtomic.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/macos/Qt3DSUnixAtomic.cpp
diff --git a/src/Runtime/Source/foundation/macos/Qt3DSUnixFPU.cpp b/src/Runtime/ogl-runtime/src/foundation/macos/Qt3DSUnixFPU.cpp
index 59c9850d..59c9850d 100644
--- a/src/Runtime/Source/foundation/macos/Qt3DSUnixFPU.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/macos/Qt3DSUnixFPU.cpp
diff --git a/src/Runtime/Source/foundation/macos/Qt3DSUnixMutex.cpp b/src/Runtime/ogl-runtime/src/foundation/macos/Qt3DSUnixMutex.cpp
index bbc55829..bbc55829 100644
--- a/src/Runtime/Source/foundation/macos/Qt3DSUnixMutex.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/macos/Qt3DSUnixMutex.cpp
diff --git a/src/Runtime/Source/foundation/macos/Qt3DSUnixSemaphore.cpp b/src/Runtime/ogl-runtime/src/foundation/macos/Qt3DSUnixSemaphore.cpp
index 90aab79a..90aab79a 100644
--- a/src/Runtime/Source/foundation/macos/Qt3DSUnixSemaphore.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/macos/Qt3DSUnixSemaphore.cpp
diff --git a/src/Runtime/Source/foundation/macos/Qt3DSUnixSync.cpp b/src/Runtime/ogl-runtime/src/foundation/macos/Qt3DSUnixSync.cpp
index 52f9d7ab..52f9d7ab 100644
--- a/src/Runtime/Source/foundation/macos/Qt3DSUnixSync.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/macos/Qt3DSUnixSync.cpp
diff --git a/src/Runtime/Source/foundation/macos/Qt3DSUnixTime.cpp b/src/Runtime/ogl-runtime/src/foundation/macos/Qt3DSUnixTime.cpp
index 58eadcb6..58eadcb6 100644
--- a/src/Runtime/Source/foundation/macos/Qt3DSUnixTime.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/macos/Qt3DSUnixTime.cpp
diff --git a/src/Runtime/Source/foundation/qt_attribution.json b/src/Runtime/ogl-runtime/src/foundation/qt_attribution.json
index 537d8be3..537d8be3 100644
--- a/src/Runtime/Source/foundation/qt_attribution.json
+++ b/src/Runtime/ogl-runtime/src/foundation/qt_attribution.json
diff --git a/src/Runtime/Source/foundation/windows/LICENSE.TXT b/src/Runtime/ogl-runtime/src/foundation/windows/LICENSE.TXT
index f40caef8..f40caef8 100644
--- a/src/Runtime/Source/foundation/windows/LICENSE.TXT
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/LICENSE.TXT
diff --git a/src/Runtime/Source/foundation/windows/Qt3DSWindowsAoS.h b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsAoS.h
index c654ec79..c654ec79 100644
--- a/src/Runtime/Source/foundation/windows/Qt3DSWindowsAoS.h
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsAoS.h
diff --git a/src/Runtime/Source/foundation/windows/Qt3DSWindowsAtomic.cpp b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsAtomic.cpp
index 4f95d3dd..4f95d3dd 100644
--- a/src/Runtime/Source/foundation/windows/Qt3DSWindowsAtomic.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsAtomic.cpp
diff --git a/src/Runtime/Source/foundation/windows/Qt3DSWindowsFPU.cpp b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsFPU.cpp
index 47242801..47242801 100644
--- a/src/Runtime/Source/foundation/windows/Qt3DSWindowsFPU.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsFPU.cpp
diff --git a/src/Runtime/Source/foundation/windows/Qt3DSWindowsFile.h b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsFile.h
index 6c232a54..6c232a54 100644
--- a/src/Runtime/Source/foundation/windows/Qt3DSWindowsFile.h
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsFile.h
diff --git a/src/Runtime/Source/foundation/windows/Qt3DSWindowsInclude.h b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsInclude.h
index f01c9f1a..f01c9f1a 100644
--- a/src/Runtime/Source/foundation/windows/Qt3DSWindowsInclude.h
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsInclude.h
diff --git a/src/Runtime/Source/foundation/windows/Qt3DSWindowsInlineAoS.h b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsInlineAoS.h
index 60c57894..60c57894 100644
--- a/src/Runtime/Source/foundation/windows/Qt3DSWindowsInlineAoS.h
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsInlineAoS.h
diff --git a/src/Runtime/Source/foundation/windows/Qt3DSWindowsIntrinsics.h b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsIntrinsics.h
index 3e0b3e8f..3e0b3e8f 100644
--- a/src/Runtime/Source/foundation/windows/Qt3DSWindowsIntrinsics.h
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsIntrinsics.h
diff --git a/src/Runtime/Source/foundation/windows/Qt3DSWindowsMutex.cpp b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsMutex.cpp
index c5fef09f..c5fef09f 100644
--- a/src/Runtime/Source/foundation/windows/Qt3DSWindowsMutex.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsMutex.cpp
diff --git a/src/Runtime/Source/foundation/windows/Qt3DSWindowsSemaphore.cpp b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsSemaphore.cpp
index bb14c104..bb14c104 100644
--- a/src/Runtime/Source/foundation/windows/Qt3DSWindowsSemaphore.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsSemaphore.cpp
diff --git a/src/Runtime/Source/foundation/windows/Qt3DSWindowsString.h b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsString.h
index 8d5fcd31..8d5fcd31 100644
--- a/src/Runtime/Source/foundation/windows/Qt3DSWindowsString.h
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsString.h
diff --git a/src/Runtime/Source/foundation/windows/Qt3DSWindowsSync.cpp b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsSync.cpp
index 49667e94..49667e94 100644
--- a/src/Runtime/Source/foundation/windows/Qt3DSWindowsSync.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsSync.cpp
diff --git a/src/Runtime/Source/foundation/windows/Qt3DSWindowsThread.cpp b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsThread.cpp
index 3a30de8c..3a30de8c 100644
--- a/src/Runtime/Source/foundation/windows/Qt3DSWindowsThread.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsThread.cpp
diff --git a/src/Runtime/Source/foundation/windows/Qt3DSWindowsTime.cpp b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsTime.cpp
index 9215d642..9215d642 100644
--- a/src/Runtime/Source/foundation/windows/Qt3DSWindowsTime.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsTime.cpp
diff --git a/src/Runtime/Source/foundation/windows/Qt3DSWindowsTrigConstants.h b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsTrigConstants.h
index e3da844c..e3da844c 100644
--- a/src/Runtime/Source/foundation/windows/Qt3DSWindowsTrigConstants.h
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/Qt3DSWindowsTrigConstants.h
diff --git a/src/Runtime/Source/foundation/windows/SocketImpl.h b/src/Runtime/ogl-runtime/src/foundation/windows/SocketImpl.h
index f72203bd..f72203bd 100644
--- a/src/Runtime/Source/foundation/windows/SocketImpl.h
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/SocketImpl.h
diff --git a/src/Runtime/Source/foundation/windows/qt_attribution.json b/src/Runtime/ogl-runtime/src/foundation/windows/qt_attribution.json
index e0310cfa..e0310cfa 100644
--- a/src/Runtime/Source/foundation/windows/qt_attribution.json
+++ b/src/Runtime/ogl-runtime/src/foundation/windows/qt_attribution.json
diff --git a/src/Runtime/Source/hdr/CUDABSDFMipmap.cpp b/src/Runtime/ogl-runtime/src/hdr/CUDABSDFMipmap.cpp
index 94f6712f..94f6712f 100644
--- a/src/Runtime/Source/hdr/CUDABSDFMipmap.cpp
+++ b/src/Runtime/ogl-runtime/src/hdr/CUDABSDFMipmap.cpp
diff --git a/src/Runtime/Source/hdr/CUDABSDFMipmap.h b/src/Runtime/ogl-runtime/src/hdr/CUDABSDFMipmap.h
index 33e0b91c..33e0b91c 100644
--- a/src/Runtime/Source/hdr/CUDABSDFMipmap.h
+++ b/src/Runtime/ogl-runtime/src/hdr/CUDABSDFMipmap.h
diff --git a/src/Runtime/Source/hdr/GLComputeMipMap.h b/src/Runtime/ogl-runtime/src/hdr/GLComputeMipMap.h
index a1a7ce5f..a1a7ce5f 100644
--- a/src/Runtime/Source/hdr/GLComputeMipMap.h
+++ b/src/Runtime/ogl-runtime/src/hdr/GLComputeMipMap.h
diff --git a/src/Runtime/Source/hdr/GLComputeMipmap.cpp b/src/Runtime/ogl-runtime/src/hdr/GLComputeMipmap.cpp
index 36b550dd..36b550dd 100644
--- a/src/Runtime/Source/hdr/GLComputeMipmap.cpp
+++ b/src/Runtime/ogl-runtime/src/hdr/GLComputeMipmap.cpp
diff --git a/src/Runtime/Source/hdr/HDR.cpp b/src/Runtime/ogl-runtime/src/hdr/HDR.cpp
index 9abe2b3b..9abe2b3b 100644
--- a/src/Runtime/Source/hdr/HDR.cpp
+++ b/src/Runtime/ogl-runtime/src/hdr/HDR.cpp
diff --git a/src/Runtime/Source/hdr/HDR.h b/src/Runtime/ogl-runtime/src/hdr/HDR.h
index fbc4ea41..fbc4ea41 100644
--- a/src/Runtime/Source/hdr/HDR.h
+++ b/src/Runtime/ogl-runtime/src/hdr/HDR.h
diff --git a/src/Runtime/Source/hdr/MipmapBSDF.cpp b/src/Runtime/ogl-runtime/src/hdr/MipmapBSDF.cpp
index fd57015e..fd57015e 100644
--- a/src/Runtime/Source/hdr/MipmapBSDF.cpp
+++ b/src/Runtime/ogl-runtime/src/hdr/MipmapBSDF.cpp
diff --git a/src/Runtime/Source/hdr/MipmapBSDF.cu b/src/Runtime/ogl-runtime/src/hdr/MipmapBSDF.cu
index 6ddac4be..6ddac4be 100644
--- a/src/Runtime/Source/hdr/MipmapBSDF.cu
+++ b/src/Runtime/ogl-runtime/src/hdr/MipmapBSDF.cu
diff --git a/src/Runtime/Source/hdr/MipmapBSDF.h b/src/Runtime/ogl-runtime/src/hdr/MipmapBSDF.h
index be8f1366..be8f1366 100644
--- a/src/Runtime/Source/hdr/MipmapBSDF.h
+++ b/src/Runtime/ogl-runtime/src/hdr/MipmapBSDF.h
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportContainers.h b/src/Runtime/ogl-runtime/src/importlib/Qt3DSImportContainers.h
index 2f2a72ee..2f2a72ee 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportContainers.h
+++ b/src/Runtime/ogl-runtime/src/importlib/Qt3DSImportContainers.h
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportLibPrecompile.h b/src/Runtime/ogl-runtime/src/importlib/Qt3DSImportLibPrecompile.h
index 34da79d0..34da79d0 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportLibPrecompile.h
+++ b/src/Runtime/ogl-runtime/src/importlib/Qt3DSImportLibPrecompile.h
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.cpp b/src/Runtime/ogl-runtime/src/importlib/Qt3DSImportMesh.cpp
index 1535b911..1535b911 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.cpp
+++ b/src/Runtime/ogl-runtime/src/importlib/Qt3DSImportMesh.cpp
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.h b/src/Runtime/ogl-runtime/src/importlib/Qt3DSImportMesh.h
index 36b7a841..36b7a841 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.h
+++ b/src/Runtime/ogl-runtime/src/importlib/Qt3DSImportMesh.h
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMeshBuilder.cpp b/src/Runtime/ogl-runtime/src/importlib/Qt3DSImportMeshBuilder.cpp
index e8c6d92e..e8c6d92e 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMeshBuilder.cpp
+++ b/src/Runtime/ogl-runtime/src/importlib/Qt3DSImportMeshBuilder.cpp
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportPath.cpp b/src/Runtime/ogl-runtime/src/importlib/Qt3DSImportPath.cpp
index 3523ef59..3523ef59 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportPath.cpp
+++ b/src/Runtime/ogl-runtime/src/importlib/Qt3DSImportPath.cpp
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportPath.h b/src/Runtime/ogl-runtime/src/importlib/Qt3DSImportPath.h
index 3b52c8ce..3b52c8ce 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportPath.h
+++ b/src/Runtime/ogl-runtime/src/importlib/Qt3DSImportPath.h
diff --git a/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro b/src/Runtime/ogl-runtime/src/ogl-runtime-dylib/ogl-runtime-dylib.pro
index 54aa0442..48929cfc 100644
--- a/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro
+++ b/src/Runtime/ogl-runtime/src/ogl-runtime-dylib/ogl-runtime-dylib.pro
@@ -9,23 +9,23 @@ include(../commoninclude.pri)
 QT += qml
 
 boot2qt: {
-    RESOURCES += ../res.qrc
+    RESOURCES += ../../res.qrc
     DEFINES += EMBEDDED_LINUX # TODO: Is there a compile-time flag for boot2qt?
 }
 
 integrity|ios {
-    RESOURCES += ../res.qrc
+    RESOURCES += ../../res.qrc
 }
 
 SOURCES += \
-    ../Source/viewer/Qt3DSAudioPlayerImpl.cpp \
-    ../Source/viewer/Qt3DSViewerApp.cpp
+    ../viewer/Qt3DSAudioPlayerImpl.cpp \
+    ../viewer/Qt3DSViewerApp.cpp
 
 HEADERS += \
-    ../Source/viewer/qt3dsruntimeglobal.h \
-    ../Source/viewer/Qt3DSAudioPlayerImpl.h \
-    ../Source/viewer/Qt3DSViewerApp.h \
-    ../Source/viewer/Qt3DSViewerTimer.h
+    ../viewer/qt3dsruntimeglobal.h \
+    ../viewer/Qt3DSAudioPlayerImpl.h \
+    ../viewer/Qt3DSViewerApp.h \
+    ../viewer/Qt3DSViewerTimer.h
 
 linux|qnx|mingw {
     BEGIN_ARCHIVE = -Wl,--whole-archive
@@ -54,7 +54,7 @@ win32 {
     LIBS += \
         -lws2_32
 
-    RESOURCES += ../platformres.qrc
+    RESOURCES += ../../platformres.qrc
 }
 
 linux {
diff --git a/src/Runtime/ogl-runtime/src/ogl-runtime-static/ogl-runtime-static.pro b/src/Runtime/ogl-runtime/src/ogl-runtime-static/ogl-runtime-static.pro
new file mode 100644
index 00000000..8b2c95a4
--- /dev/null
+++ b/src/Runtime/ogl-runtime/src/ogl-runtime-static/ogl-runtime-static.pro
@@ -0,0 +1,656 @@
+TEMPLATE = lib
+TARGET = qt3dsruntimestatic
+CONFIG += staticlib
+include(../commoninclude.pri)
+
+!boot2qt:!integrity:!ios {
+    RESOURCES += ../../res.qrc
+}
+
+linux {
+    DEFINES += _POSIX_C_SOURCE=199309L
+    QMAKE_LFLAGS += -lrt
+}
+
+DEFINES += QT3DS_BUILDING_LIBRARY DISABLE_MESH_OPTIMIZATION
+
+QT += qml
+QT += quick-private
+
+# Foundation
+SOURCES += \
+    ../foundation/ConvertUTF.cpp \
+    ../foundation/EASTL_new.cpp \
+    ../foundation/FileTools.cpp \
+    ../foundation/IOStreams.cpp \
+    ../foundation/Qt3DSLogging.cpp \
+    ../foundation/Qt3DSFoundation.cpp \
+    ../foundation/Qt3DSMathUtils.cpp \
+    ../foundation/Qt3DSPerfTimer.cpp \
+    ../foundation/Qt3DSSystem.cpp \
+    ../foundation/Socket.cpp \
+    ../foundation/StringTable.cpp \
+    ../foundation/XML.cpp \
+    ../foundation/TrackingAllocator.cpp \
+    ../runtimerender/q3dsqmlrender.cpp \
+    ../engine/Qt3DSRenderRuntimeBinding.cpp \
+    ../engine/Qt3DSRenderRuntimeBindingImplRenderer.cpp \
+    ../engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp \
+    ../engine/Qt3DSTegraInputEngine.cpp \
+    ../runtime/Qt3DSActivationManager.cpp \
+    ../runtime/Qt3DSAnimationSystem.cpp \
+    ../runtime/Qt3DSApplication.cpp \
+    ../runtime/Qt3DSAttributeHashes.cpp \
+    ../runtime/Qt3DSComponentManager.cpp \
+    ../runtime/Qt3DSElementSystem.cpp \
+    ../runtime/Qt3DSEventCallbacks.cpp \
+    ../runtime/Qt3DSInputEngine.cpp \
+    ../runtime/Qt3DSLogicSystem.cpp \
+    ../runtime/Qt3DSCommandHelper.cpp \
+    ../runtime/Qt3DSElementHelper.cpp \
+    ../runtime/Qt3DSOutputMemoryStream.cpp \
+    ../runtime/Qt3DSParametersSystem.cpp \
+    ../runtime/Qt3DSPresentation.cpp \
+    ../runtime/Qt3DSPresentationFrameData.cpp \
+    ../runtime/Qt3DSQmlElementHelper.cpp \
+    ../runtime/Qt3DSQmlEngine.cpp \
+    ../runtime/Qt3DSSlideSystem.cpp \
+    ../runtime/Qt3DSTimePolicy.cpp \
+    ../runtime/q3dsvariantconfig.cpp \
+    ../runtime/q3dsmaterialdefinitionparser.cpp \
+    ../runtimerender/graphobjects/Qt3DSRenderCamera.cpp \
+    ../runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.cpp \
+    ../runtimerender/graphobjects/Qt3DSRenderDynamicObject.cpp \
+    ../runtimerender/graphobjects/Qt3DSRenderEffect.cpp \
+    ../runtimerender/graphobjects/Qt3DSRenderImage.cpp \
+    ../runtimerender/graphobjects/Qt3DSRenderLayer.cpp \
+    ../runtimerender/graphobjects/Qt3DSRenderLight.cpp \
+    ../runtimerender/graphobjects/Qt3DSRenderLightmaps.cpp \
+    ../runtimerender/graphobjects/Qt3DSRenderModel.cpp \
+    ../runtimerender/graphobjects/Qt3DSRenderNode.cpp \
+    ../runtimerender/graphobjects/Qt3DSRenderPath.cpp \
+    ../runtimerender/graphobjects/Qt3DSRenderPresentation.cpp \
+    ../runtimerender/graphobjects/Qt3DSRenderScene.cpp \
+    ../runtimerender/graphobjects/Qt3DSRenderText.cpp \
+    ../runtimerender/rendererimpl/Qt3DSRenderableObjects.cpp \
+    ../runtimerender/rendererimpl/Qt3DSRendererImpl.cpp \
+    ../runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.cpp \
+    ../runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderHelper.cpp \
+    ../runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.cpp \
+    ../runtimerender/rendererimpl/Qt3DSRendererImplShaders.cpp \
+    ../runtimerender/resourcemanager/Qt3DSRenderBufferLoader.cpp \
+    ../runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp \
+    ../runtimerender/resourcemanager/Qt3DSRenderImageBatchLoader.cpp \
+    ../runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.cpp \
+    ../runtimerender/resourcemanager/Qt3DSRenderLoadedTextureBMP.cpp \
+    ../runtimerender/resourcemanager/Qt3DSRenderLoadedTextureDDS.cpp \
+    ../runtimerender/resourcemanager/Qt3DSRenderLoadedTextureGIF.cpp \
+    ../runtimerender/resourcemanager/Qt3DSRenderLoadedTextureHDR.cpp \
+    ../runtimerender/resourcemanager/Qt3DSRenderPrefilterTexture.cpp \
+    ../runtimerender/resourcemanager/Qt3DSRenderResourceBufferObjects.cpp \
+    ../runtimerender/resourcemanager/Qt3DSRenderResourceManager.cpp \
+    ../runtimerender/resourcemanager/Qt3DSRenderResourceTexture2D.cpp \
+    ../runtimerender/Qt3DSOffscreenRenderManager.cpp \
+    ../runtimerender/Qt3DSOldNBustedRenderPlugin.cpp \
+    ../runtimerender/Qt3DSOnscreenTextRenderer.cpp \
+    ../runtimerender/Qt3DSQtTextRenderer.cpp \
+    ../runtimerender/Qt3DSRenderClippingFrustum.cpp \
+    ../runtimerender/Qt3DSRenderCustomMaterialShaderGenerator.cpp \
+    ../runtimerender/Qt3DSRenderCustomMaterialSystem.cpp \
+    ../runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.cpp \
+    ../runtimerender/Qt3DSRenderDynamicObjectSystem.cpp \
+    ../runtimerender/Qt3DSRenderEffectSystem.cpp \
+    ../runtimerender/Qt3DSRendererUtil.cpp \
+    ../runtimerender/Qt3DSRenderEulerAngles.cpp \
+    ../runtimerender/Qt3DSRenderGpuProfiler.cpp \
+    ../runtimerender/Qt3DSRenderGraphObjectSerializer.cpp \
+    ../runtimerender/Qt3DSRenderImageScaler.cpp \
+    ../runtimerender/Qt3DSRenderInputStreamFactory.cpp \
+    ../runtimerender/Qt3DSRenderPathManager.cpp \
+    ../runtimerender/Qt3DSRenderPixelGraphicsRenderer.cpp \
+    ../runtimerender/Qt3DSRenderPixelGraphicsTypes.cpp \
+    ../runtimerender/Qt3DSRenderPlugin.cpp \
+    ../runtimerender/Qt3DSRenderRay.cpp \
+    ../runtimerender/Qt3DSRenderRenderList.cpp \
+    ../runtimerender/Qt3DSRenderShaderCache.cpp \
+    ../runtimerender/Qt3DSRenderShaderCodeGenerator.cpp \
+    ../runtimerender/Qt3DSRenderShaderCodeGeneratorV2.cpp \
+    ../runtimerender/Qt3DSRenderShadowMap.cpp \
+    ../runtimerender/Qt3DSRenderSubpresentation.cpp \
+    ../runtimerender/Qt3DSRenderTextTextureAtlas.cpp \
+    ../runtimerender/Qt3DSRenderTextTextureCache.cpp \
+    ../runtimerender/Qt3DSRenderTextureAtlas.cpp \
+    ../runtimerender/Qt3DSRenderThreadPool.cpp \
+    ../runtimerender/Qt3DSRenderUIPLoader.cpp \
+    ../runtimerender/Qt3DSRenderUIPSharedTranslation.cpp \
+    ../runtimerender/Qt3DSRenderWidgets.cpp \
+    ../runtimerender/Qt3DSTextRenderer.cpp \
+    ../system/Qt3DSAssert.cpp \
+    ../system/Qt3DSBoundingBox.cpp \
+    ../system/Qt3DSColor.cpp \
+    ../system/Qt3DSCubicRoots.cpp \
+    ../system/Qt3DSDataLogger.cpp \
+    ../system/Qt3DSDLLManager.cpp \
+    ../system/Qt3DSEulerAngles.cpp \
+    ../system/Qt3DSFile.cpp \
+    ../system/Qt3DSFileStream.cpp \
+    ../system/Qt3DSFunctionWrappers.cpp \
+    ../system/Qt3DSMatrix.cpp \
+    ../system/Qt3DSMemory.cpp \
+    ../system/Qt3DSMemoryFilter.cpp \
+    ../system/Qt3DSMemoryHeap.cpp \
+    ../system/Qt3DSMemoryManager.cpp \
+    ../system/Qt3DSMemoryPool.cpp \
+    ../system/Qt3DSMemoryProbe.cpp \
+    ../system/Qt3DSMemoryStatistics.cpp \
+    ../system/Qt3DSMemoryTracker.cpp \
+    ../system/Qt3DSTimer.cpp \
+    ../system/Qt3DSTypes.cpp \
+    ../system/Qt3DSVector3.cpp \
+    ../uipparser/Qt3DSUIPParserActionHelper.cpp \
+    ../uipparser/Qt3DSUIPParserImpl.cpp \
+    ../uipparser/Qt3DSUIPParserObjectRefHelper.cpp \
+    ../runtimerender/Qt3DSRenderContextCore.cpp \
+    ../runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.cpp \
+    ../runtimerender/Qt3DSDistanceFieldRenderer.cpp \
+    ../runtimerender/Qt3DSFontDatabase.cpp \
+    ../runtimerender/Qt3DSDistanceFieldGlyphCacheManager.cpp \
+    ../runtimerender/Qt3DSDistanceFieldGlyphCache.cpp \
+    ../engine/Qt3DSRuntimeView.cpp
+
+HEADERS += \
+    ../foundation/ConvertUTF.h \
+    ../foundation/FileTools.h \
+    ../foundation/StringTools.h \
+    ../foundation/IOStreams.h \
+    ../foundation/Qt3DSLogging.h \
+    ../foundation/Qt3DSFoundation.h \
+    ../foundation/Qt3DSMathUtils.h \
+    ../foundation/Qt3DSPerfTimer.h \
+    ../foundation/Qt3DSSystem.h \
+    ../foundation/Socket.h \
+    ../foundation/StringTable.h \
+    ../foundation/XML.h \
+    ../foundation/AutoDeallocatorAllocator.h \
+    ../foundation/FastAllocator.h \
+    ../foundation/PoolingAllocator.h \
+    ../foundation/PreAllocatedAllocator.h \
+    ../foundation/Qt3DS.h \
+    ../foundation/Qt3DSAllocator.h \
+    ../foundation/Qt3DSAllocatorCallback.h \
+    ../foundation/Qt3DSAssert.h \
+    ../foundation/Qt3DSAtomic.h \
+    ../foundation/Qt3DSBasicTemplates.h \
+    ../foundation/Qt3DSBounds3.h \
+    ../foundation/Qt3DSBroadcastingAllocator.h \
+    ../foundation/Qt3DSContainers.h \
+    ../foundation/Qt3DSDataRef.h \
+    ../foundation/Qt3DSDiscriminatedUnion.h \
+    ../foundation/Qt3DSFastIPC.h \
+    ../foundation/Qt3DSFlags.h \
+    ../foundation/Qt3DSFPU.h \
+    ../foundation/Qt3DSIndexableLinkedList.h \
+    ../foundation/Qt3DSIntrinsics.h \
+    ../foundation/Qt3DSInvasiveLinkedList.h \
+    ../foundation/Qt3DSInvasiveSet.h \
+    ../foundation/Qt3DSIPC.h \
+    ../foundation/Qt3DSMat33.h \
+    ../foundation/Qt3DSMat44.h \
+    ../foundation/Qt3DSMath.h \
+    ../foundation/Qt3DSMemoryBuffer.h \
+    ../foundation/Qt3DSMutex.h \
+    ../foundation/Qt3DSNoCopy.h \
+    ../foundation/Qt3DSOption.h \
+    ../foundation/Qt3DSPlane.h \
+    ../foundation/Qt3DSPool.h \
+    ../foundation/Qt3DSPreprocessor.h \
+    ../foundation/Qt3DSQuat.h \
+    ../foundation/Qt3DSRefCounted.h \
+    ../foundation/Qt3DSSemaphore.h \
+    ../foundation/Qt3DSSimpleTypes.h \
+    ../foundation/Qt3DSStringTokenizer.h \
+    ../foundation/Qt3DSSync.h \
+    ../foundation/Qt3DSThread.h \
+    ../foundation/Qt3DSTime.h \
+    ../foundation/Qt3DSTransform.h \
+    ../foundation/Qt3DSUnionCast.h \
+    ../foundation/Qt3DSUtilities.h \
+    ../foundation/Qt3DSVec2.h \
+    ../foundation/Qt3DSVec3.h \
+    ../foundation/Qt3DSVec4.h \
+    ../foundation/Qt3DSVersionNumber.h \
+    ../foundation/SerializationTypes.h \
+    ../foundation/StrConvertUTF.h \
+    ../foundation/StringConversion.h \
+    ../foundation/StringConversionImpl.h \
+    ../foundation/TaggedPointer.h \
+    ../foundation/ThreadSafeQueue.h \
+    ../foundation/TrackingAllocator.h \
+    ../foundation/Utils.h \
+    ../runtimerender/q3dsqmlrender.h \
+    ../engine/Qt3DSRenderRuntimeBinding.h \
+    ../engine/Qt3DSRenderRuntimeBindingImpl.h \
+    ../engine/Qt3DSTegraInputEngine.h \
+    ../runtime/Qt3DSActivationManager.h \
+    ../runtime/Qt3DSAnimationSystem.h \
+    ../runtime/Qt3DSApplication.h \
+    ../runtime/Qt3DSAttributeHashes.h \
+    ../runtime/Qt3DSComponentManager.h \
+    ../runtime/Qt3DSElementSystem.h \
+    ../runtime/Qt3DSEventCallbacks.h \
+    ../runtime/Qt3DSInputEngine.h \
+    ../runtime/Qt3DSLogicSystem.h \
+    ../runtime/Qt3DSCommandHelper.h \
+    ../runtime/Qt3DSElementHelper.h \
+    ../runtime/Qt3DSOutputMemoryStream.h \
+    ../runtime/Qt3DSParametersSystem.h \
+    ../runtime/Qt3DSPresentation.h \
+    ../runtime/Qt3DSPresentationFrameData.h \
+    ../runtime/Qt3DSQmlElementHelper.h \
+    ../runtime/Qt3DSQmlEngine.h \
+    ../runtime/Qt3DSSlideSystem.h \
+    ../runtime/Qt3DSTimePolicy.h \
+    ../runtime/Qt3DSApplicationValues.h \
+    ../runtime/Qt3DSIComponentManager.h \
+    ../runtime/Qt3DSIInputSystem.h \
+    ../runtime/Qt3DSInputDefs.h \
+    ../runtime/Qt3DSInputEventTypes.h \
+    ../runtime/Qt3DSIStateful.h \
+    ../runtime/Qt3DSIText.h \
+    ../runtime/Qt3DSKernelTypes.h \
+    ../runtime/q3dsvariantconfig_p.h \
+    ../runtime/q3dsmaterialdefinitionparser.h \
+    ../runtimerender/graphobjects/Qt3DSRenderCamera.h \
+    ../runtimerender/graphobjects/Qt3DSRenderCustomMaterial.h \
+    ../runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h \
+    ../runtimerender/graphobjects/Qt3DSRenderDynamicObject.h \
+    ../runtimerender/graphobjects/Qt3DSRenderEffect.h \
+    ../runtimerender/graphobjects/Qt3DSRenderGraphObject.h \
+    ../runtimerender/graphobjects/Qt3DSRenderImage.h \
+    ../runtimerender/graphobjects/Qt3DSRenderLayer.h \
+    ../runtimerender/graphobjects/Qt3DSRenderLight.h \
+    ../runtimerender/graphobjects/Qt3DSRenderLightmaps.h \
+    ../runtimerender/graphobjects/Qt3DSRenderMaterialDirty.h \
+    ../runtimerender/graphobjects/Qt3DSRenderModel.h \
+    ../runtimerender/graphobjects/Qt3DSRenderNode.h \
+    ../runtimerender/graphobjects/Qt3DSRenderPath.h \
+    ../runtimerender/graphobjects/Qt3DSRenderPathSubPath.h \
+    ../runtimerender/graphobjects/Qt3DSRenderPresentation.h \
+    ../runtimerender/graphobjects/Qt3DSRenderReferencedMaterial.h \
+    ../runtimerender/graphobjects/Qt3DSRenderScene.h \
+    ../runtimerender/graphobjects/Qt3DSRenderText.h \
+    ../runtimerender/Qt3DSOffscreenRenderKey.h \
+    ../runtimerender/Qt3DSOffscreenRenderManager.h \
+    ../runtimerender/Qt3DSOldNBustedRenderPlugin.h \
+    ../runtimerender/Qt3DSRender.h \
+    ../runtimerender/Qt3DSRenderableImage.h \
+    ../runtimerender/Qt3DSRenderClippingFrustum.h \
+    ../runtimerender/Qt3DSRenderCustomMaterialRenderContext.h \
+    ../runtimerender/Qt3DSRenderCustomMaterialShaderGenerator.h \
+    ../runtimerender/Qt3DSRenderCustomMaterialSystem.h \
+    ../runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.h \
+    ../runtimerender/Qt3DSRenderDynamicObjectSystem.h \
+    ../runtimerender/Qt3DSRenderDynamicObjectSystemCommands.h \
+    ../runtimerender/Qt3DSRenderDynamicObjectSystemUtil.h \
+    ../runtimerender/Qt3DSRenderEffectSystem.h \
+    ../runtimerender/Qt3DSRenderer.h \
+    ../runtimerender/Qt3DSRendererUtil.h \
+    ../runtimerender/Qt3DSRenderEulerAngles.h \
+    ../runtimerender/Qt3DSRenderGraphObjectPickQuery.h \
+    ../runtimerender/Qt3DSRenderGraphObjectSerializer.h \
+    ../runtimerender/Qt3DSRenderGraphObjectTypes.h \
+    ../runtimerender/Qt3DSRenderImageScaler.h \
+    ../runtimerender/Qt3DSRenderImageTextureData.h \
+    ../runtimerender/Qt3DSRenderInputStreamFactory.h \
+    ../runtimerender/Qt3DSRenderMaterialHelpers.h \
+    ../runtimerender/Qt3DSRenderMaterialShaderGenerator.h \
+    ../runtimerender/Qt3DSRenderMesh.h \
+    ../runtimerender/Qt3DSRenderPathManager.h \
+    ../runtimerender/Qt3DSRenderPathMath.h \
+    ../runtimerender/Qt3DSRenderPathRenderContext.h \
+    ../runtimerender/Qt3DSRenderPixelGraphicsRenderer.h \
+    ../runtimerender/Qt3DSRenderPixelGraphicsTypes.h \
+    ../runtimerender/Qt3DSRenderPlugin.h \
+    ../runtimerender/Qt3DSRenderPluginCInterface.h \
+    ../runtimerender/Qt3DSRenderPluginGraphObject.h \
+    ../runtimerender/Qt3DSRenderPluginPropertyValue.h \
+    ../runtimerender/Qt3DSRenderProfiler.h \
+    ../runtimerender/Qt3DSRenderRay.h \
+    ../runtimerender/Qt3DSRenderRenderList.h \
+    ../runtimerender/Qt3DSRenderRotationHelper.h \
+    ../runtimerender/Qt3DSRenderShaderCache.h \
+    ../runtimerender/Qt3DSRenderShaderCodeGenerator.h \
+    ../runtimerender/Qt3DSRenderShaderCodeGeneratorV2.h \
+    ../runtimerender/Qt3DSRenderShaderKeys.h \
+    ../runtimerender/Qt3DSRenderShadowMap.h \
+    ../runtimerender/Qt3DSRenderSubpresentation.h \
+    ../runtimerender/Qt3DSRenderSubPresentationHelper.h \
+    ../runtimerender/Qt3DSRenderTaggedPointer.h \
+    ../runtimerender/Qt3DSRenderTessModeValues.h \
+    ../runtimerender/Qt3DSRenderTextTextureAtlas.h \
+    ../runtimerender/Qt3DSRenderTextTextureCache.h \
+    ../runtimerender/Qt3DSRenderTextTypes.h \
+    ../runtimerender/Qt3DSRenderTextureAtlas.h \
+    ../runtimerender/Qt3DSRenderThreadPool.h \
+    ../runtimerender/Qt3DSRenderUIPLoader.h \
+    ../runtimerender/Qt3DSRenderUIPSharedTranslation.h \
+    ../runtimerender/Qt3DSRenderWidgets.h \
+    ../runtimerender/Qt3DSTextRenderer.h \
+    ../runtimerender/rendererimpl/Qt3DSRenderableObjects.h \
+    ../runtimerender/rendererimpl/Qt3DSRendererImpl.h \
+    ../runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.h \
+    ../runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderHelper.h \
+    ../runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.h \
+    ../runtimerender/rendererimpl/Qt3DSRendererImplShaders.h \
+    ../runtimerender/rendererimpl/Qt3DSVertexPipelineImpl.h \
+    ../runtimerender/resourcemanager/Qt3DSRenderBufferLoader.h \
+    ../runtimerender/resourcemanager/Qt3DSRenderBufferManager.h \
+    ../runtimerender/resourcemanager/Qt3DSRenderImageBatchLoader.h \
+    ../runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.h \
+    ../runtimerender/resourcemanager/Qt3DSRenderLoadedTextureDDS.h \
+    ../runtimerender/resourcemanager/Qt3DSRenderLoadedTextureFreeImageCompat.h \
+    ../runtimerender/resourcemanager/Qt3DSRenderPrefilterTexture.h \
+    ../runtimerender/resourcemanager/Qt3DSRenderResourceBufferObjects.h \
+    ../runtimerender/resourcemanager/Qt3DSRenderResourceManager.h \
+    ../runtimerender/resourcemanager/Qt3DSRenderResourceTexture2D.h \
+    ../system/Qt3DSArray.h \
+    ../system/Qt3DSAssert.h \
+    ../system/Qt3DSAudioPlayer.h \
+    ../system/Qt3DSBasicPluginDLL.h \
+    ../system/Qt3DSBezierEval.h \
+    ../system/Qt3DSBoundingBox.h \
+    ../system/Qt3DSCircularArray.h \
+    ../system/Qt3DSColor.h \
+    ../system/Qt3DSConfig.h \
+    ../system/Qt3DSCubicRoots.h \
+    ../system/Qt3DSCubicRootsImpl.h \
+    ../system/Qt3DSDataLogger.h \
+    ../system/Qt3DSDataLogger.hpp \
+    ../system/Qt3DSDataLoggerEnums.h \
+    ../system/Qt3DSDataLoggerViewer.h \
+    ../system/Qt3DSDLLManager.h \
+    ../system/Qt3DSEGLTimer.h \
+    ../system/Qt3DSEndian.h \
+    ../system/Qt3DSEulerAngles.h \
+    ../system/Qt3DSFile.h \
+    ../system/Qt3DSFileStream.h \
+    ../system/Qt3DSFixedArray.h \
+    ../system/Qt3DSFNDTimer.h \
+    ../system/Qt3DSFunctionWrappers.h \
+    ../system/Qt3DSHash.h \
+    ../system/Qt3DSIFileStream.h \
+    ../system/Qt3DSIStream.h \
+    ../system/Qt3DSITimer.h \
+    ../system/Qt3DSMacros.h \
+    ../system/Qt3DSMatrix.h \
+    ../system/Qt3DSMemory.h \
+    ../system/Qt3DSMemoryFilter.h \
+    ../system/Qt3DSMemoryHeap.h \
+    ../system/Qt3DSMemoryManager.h \
+    ../system/Qt3DSMemoryPool.h \
+    ../system/Qt3DSMemoryProbe.h \
+    ../system/Qt3DSMemorySettings.h \
+    ../system/Qt3DSMemoryStatistics.h \
+    ../system/Qt3DSMemoryTracker.h \
+    ../system/Qt3DSPlatformSpecific.h \
+    ../system/Qt3DSTimer.h \
+    ../system/Qt3DSTypes.h \
+    ../system/Qt3DSVector3.h \
+    ../system/Qt3DSArray.inl \
+    ../system/Qt3DSCircularArray.inl \
+    ../system/Qt3DSFixedArray.inl \
+    ../state/Qt3DSState.h \
+    ../state/Qt3DSStateTypes.h \
+    ../state/Qt3DSStateScriptContext.h \
+    ../state/Qt3DSStateVisualBindingContextCommands.h \
+    ../uipparser/Qt3DSIPresentation.h \
+    ../uipparser/Qt3DSUIPParser.h \
+    ../uipparser/Qt3DSUIPParserActionHelper.h \
+    ../uipparser/Qt3DSUIPParserImpl.h \
+    ../uipparser/Qt3DSUIPParserObjectRefHelper.h \
+    ../runtime/Qt3DSCommandEventTypes.h \
+    ../runtime/Qt3DSEvent.h \
+    ../runtime/Qt3DSFrameworkTypes.h \
+    ../runtime/Qt3DSInputFrame.h \
+    ../runtime/Qt3DSIScene.h \
+    ../runtime/Qt3DSIScriptBridge.h \
+    ../runtime/Qt3DSPickFrame.h \
+    ../runtime/Qt3DSRuntimeFactory.h \
+    ../runtime/Qt3DSSceneManager.h \
+    ../engine/Qt3DSEGLInfo.h \
+    ../engine/Qt3DSEGLWindowSystem.h \
+    ../engine/Qt3DSPluginDLL.h \
+    ../engine/Qt3DSWindowSystem.h \
+    ../runtimerender/Qt3DSRenderContextCore.h \
+    ../runtimerender/Qt3DSRenderLightConstantProperties.h \
+    ../runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.h \
+    ../runtimerender/Qt3DSDistanceFieldRenderer.h \
+    ../runtimerender/Qt3DSFontDatabase_p.h \
+    ../runtimerender/Qt3DSDistanceFieldGlyphCacheManager_p.h \
+    ../runtimerender/Qt3DSDistanceFieldGlyphCache_p.h \
+    ../engine/Qt3DSRuntimeView.h
+
+win32 {
+SOURCES += \
+    ../foundation/windows/Qt3DSWindowsAtomic.cpp \
+    ../foundation/windows/Qt3DSWindowsFPU.cpp \
+    ../foundation/windows/Qt3DSWindowsMutex.cpp \
+    ../foundation/windows/Qt3DSWindowsSemaphore.cpp \
+    ../foundation/windows/Qt3DSWindowsSync.cpp \
+    ../foundation/windows/Qt3DSWindowsThread.cpp \
+    ../foundation/windows/Qt3DSWindowsTime.cpp
+
+HEADERS += \
+    ../foundation/windows/Qt3DSWindowsAoS.h \
+    ../foundation/windows/Qt3DSWindowsFile.h \
+    ../foundation/windows/Qt3DSWindowsInclude.h \
+    ../foundation/windows/Qt3DSWindowsInlineAoS.h \
+    ../foundation/windows/Qt3DSWindowsIntrinsics.h \
+    ../foundation/windows/Qt3DSWindowsString.h \
+    ../foundation/windows/Qt3DSWindowsTrigConstants.h
+}
+
+macos: SOURCES += \
+    ../foundation/macos/Qt3DSUnixAtomic.cpp \
+    ../foundation/macos/Qt3DSUnixFPU.cpp \
+    ../foundation/macos/Qt3DSUnixMutex.cpp \
+    ../foundation/macos/Qt3DSUnixSemaphore.cpp \
+    ../foundation/macos/Qt3DSUnixSync.cpp \
+    ../foundation/linux/Qt3DSLinuxThread.cpp \
+    ../foundation/macos/Qt3DSUnixTime.cpp
+
+linux|integrity|qnx {
+SOURCES += \
+    ../foundation/linux/Qt3DSLinuxAtomic.cpp \
+    ../foundation/linux/Qt3DSLinuxFPU.cpp \
+    ../foundation/linux/Qt3DSLinuxMutex.cpp \
+    ../foundation/linux/Qt3DSLinuxSemaphore.cpp \
+    ../foundation/linux/Qt3DSLinuxSync.cpp \
+    ../foundation/linux/Qt3DSLinuxThread.cpp \
+    ../foundation/linux/Qt3DSLinuxTime.cpp
+
+HEADERS += \
+    ../foundation/linux/Qt3DSLinuxAoS.h \
+    ../foundation/linux/Qt3DSLinuxFile.h \
+    ../foundation/linux/Qt3DSLinuxInlineAoS.h \
+    ../foundation/linux/Qt3DSLinuxIntrinsics.h \
+    ../foundation/linux/Qt3DSLinuxString.h \
+    ../foundation/linux/Qt3DSLinuxTrigConstants.h
+}
+
+# Libs
+SOURCES += \
+    ../platformspecific/$$PlatformSpecificDir/libs/nv_math/nv_math.cpp \
+    ../platformspecific/$$PlatformSpecificDir/libs/nv_math/nv_matrix.cpp \
+    ../platformspecific/$$PlatformSpecificDir/libs/nv_math/nv_quat.cpp
+
+# RenderBase
+SOURCES += \
+    ../render/Qt3DSRenderAtomicCounterBuffer.cpp \
+    ../render/Qt3DSRenderAttribLayout.cpp \
+    ../render/Qt3DSRenderBaseTypes.cpp \
+    ../render/Qt3DSRenderComputeShader.cpp \
+    ../render/Qt3DSRenderConstantBuffer.cpp \
+    ../render/Qt3DSRenderContext.cpp \
+    ../render/Qt3DSRenderDataBuffer.cpp \
+    ../render/Qt3DSRenderDepthStencilState.cpp \
+    ../render/Qt3DSRenderDrawIndirectBuffer.cpp \
+    ../render/Qt3DSRenderFragmentShader.cpp \
+    ../render/Qt3DSRenderFrameBuffer.cpp \
+    ../render/Qt3DSRenderGeometryShader.cpp \
+    ../render/Qt3DSRenderImageTexture.cpp \
+    ../render/Qt3DSRenderIndexBuffer.cpp \
+    ../render/Qt3DSRenderInputAssembler.cpp \
+    ../render/Qt3DSRenderOcclusionQuery.cpp \
+    ../render/Qt3DSRenderPathFontSpecification.cpp \
+    ../render/Qt3DSRenderPathFontText.cpp \
+    ../render/Qt3DSRenderPathRender.cpp \
+    ../render/Qt3DSRenderPathSpecification.cpp \
+    ../render/Qt3DSRenderProgramPipeline.cpp \
+    ../render/Qt3DSRenderQueryBase.cpp \
+    ../render/Qt3DSRenderRasterizerState.cpp \
+    ../render/Qt3DSRenderRenderBuffer.cpp \
+    ../render/Qt3DSRenderSampler.cpp \
+    ../render/Qt3DSRenderShaderProgram.cpp \
+    ../render/Qt3DSRenderStorageBuffer.cpp \
+    ../render/Qt3DSRenderSync.cpp \
+    ../render/Qt3DSRenderTessellationShader.cpp \
+    ../render/Qt3DSRenderTexture2D.cpp \
+    ../render/Qt3DSRenderTexture2DArray.cpp \
+    ../render/Qt3DSRenderTextureBase.cpp \
+    ../render/Qt3DSRenderTextureCube.cpp \
+    ../render/Qt3DSRenderTimerQuery.cpp \
+    ../render/Qt3DSRenderVertexBuffer.cpp \
+    ../render/Qt3DSRenderVertexShader.cpp
+
+HEADERS += \
+    ../render/Qt3DSRenderAtomicCounterBuffer.h \
+    ../render/Qt3DSRenderAttribLayout.h \
+    ../render/Qt3DSRenderBaseTypes.h \
+    ../render/Qt3DSRenderComputeShader.h \
+    ../render/Qt3DSRenderConstantBuffer.h \
+    ../render/Qt3DSRenderContext.h \
+    ../render/Qt3DSRenderDataBuffer.h \
+    ../render/Qt3DSRenderDepthStencilState.h \
+    ../render/Qt3DSRenderDrawable.h \
+    ../render/Qt3DSRenderDrawIndirectBuffer.h \
+    ../render/Qt3DSRenderFragmentShader.h \
+    ../render/Qt3DSRenderFrameBuffer.h \
+    ../render/Qt3DSRenderGeometryShader.h \
+    ../render/Qt3DSRenderImageTexture.h \
+    ../render/Qt3DSRenderIndexBuffer.h \
+    ../render/Qt3DSRenderInputAssembler.h \
+    ../render/Qt3DSRenderOcclusionQuery.h \
+    ../render/Qt3DSRenderPathFontSpecification.h \
+    ../render/Qt3DSRenderPathFontText.h \
+    ../render/Qt3DSRenderPathRender.h \
+    ../render/Qt3DSRenderPathSpecification.h \
+    ../render/Qt3DSRenderProgramPipeline.h \
+    ../render/Qt3DSRenderQueryBase.h \
+    ../render/Qt3DSRenderRasterizerState.h \
+    ../render/Qt3DSRenderRenderBuffer.h \
+    ../render/Qt3DSRenderSampler.h \
+    ../render/Qt3DSRenderShader.h \
+    ../render/Qt3DSRenderShaderConstant.h \
+    ../render/Qt3DSRenderShaderProgram.h \
+    ../render/Qt3DSRenderStorageBuffer.h \
+    ../render/Qt3DSRenderSync.h \
+    ../render/Qt3DSRenderTessellationShader.h \
+    ../render/Qt3DSRenderTexture2D.h \
+    ../render/Qt3DSRenderTexture2DArray.h \
+    ../render/Qt3DSRenderTextureBase.h \
+    ../render/Qt3DSRenderTextureCube.h \
+    ../render/Qt3DSRenderTimerQuery.h \
+    ../render/Qt3DSRenderVertexBuffer.h \
+    ../render/Qt3DSRenderVertexShader.h \
+    ../render/glg/Qt3DSGLImplObjects.h
+
+# Render
+SOURCES += \
+    ../render/backends/gl/Qt3DSOpenGLExtensions.cpp \
+    ../render/backends/gl/Qt3DSRenderBackendGL3.cpp \
+    ../render/backends/gl/Qt3DSRenderBackendGL4.cpp \
+    ../render/backends/gl/Qt3DSRenderBackendGLBase.cpp \
+    ../render/backends/gl/Qt3DSRenderContextGL.cpp \
+    ../render/backends/software/Qt3DSRenderBackendNULL.cpp \
+    ../render/backends/gl/Q3DSRenderBackendGLES2.cpp
+
+HEADERS += \
+    ../render/backends/Qt3DSRenderBackend.h \
+    ../render/backends/gl/Qt3DSOpenGLPrefix.h \
+    ../render/backends/gl/Qt3DSOpenGLUtil.h \
+    ../render/backends/gl/Qt3DSOpenGLExtensions.h \
+    ../render/backends/gl/Qt3DSRenderBackendGL3.h \
+    ../render/backends/gl/Qt3DSRenderBackendGL4.h \
+    ../render/backends/gl/Qt3DSRenderBackendGLBase.h \
+    ../render/backends/gl/Qt3DSRenderBackendInputAssemblerGL.h \
+    ../render/backends/gl/Qt3DSRenderBackendRenderStatesGL.h \
+    ../render/backends/gl/Qt3DSRenderBackendShaderProgramGL.h \
+    ../render/backends/software/Qt3DSRenderBackendNULL.h \
+    ../render/backends/gl/Q3DSRenderBackendGLES2.h
+
+# DataModel
+SOURCES += \
+    ../datamodel/Qt3DSMetadata.cpp \
+    ../importlib/Qt3DSImportMesh.cpp \
+    ../importlib/Qt3DSImportMeshBuilder.cpp \
+    ../importlib/Qt3DSImportPath.cpp \
+    ../dm/systems/Qt3DSDMMetaData.cpp \
+    ../dm/systems/Qt3DSDMXML.cpp \
+    ../dm/systems/Qt3DSDMStringTable.cpp \
+    ../dm/systems/Qt3DSDMComposerTypeDefinitions.cpp \
+    ../dm/systems/Qt3DSDMValue.cpp \
+    ../dm/systems/cores/SimpleDataCore.cpp
+
+HEADERS += \
+    ../datamodel/Qt3DSMetadata.h \
+    ../datamodel/DocumentResourceManagerScriptParser.h \
+    ../importlib/Qt3DSImportMesh.h \
+    ../importlib/Qt3DSImportPath.h \
+    ../dm/systems/Qt3DSDMMetaData.h \
+    ../dm/systems/Qt3DSDMXML.h \
+    ../dm/systems/Qt3DSDMStringTable.h \
+    ../dm/systems/Qt3DSDMHandles.h \
+    ../dm/systems/Qt3DSDMComposerTypeDefinitions.h \
+    ../dm/systems/Qt3DSDMValue.h \
+    ../dm/systems/cores/SimpleDataCore.h
+
+# Engine
+HEADERS += \
+    ../engine/EnginePrefix.h
+
+# Event
+SOURCES += \
+    ../event/EventFactory.cpp \
+    ../event/EventPoller.cpp \
+    ../event/EventSystemC.cpp
+
+HEADERS += \
+    ../event/EventPollingSystem.h \
+    ../event/EventSystem.h \
+    ../event/EventSystemC.h
+
+# Render
+HEADERS += \
+    ../runtimerender/android/DynamicLibLoader.h \
+    ../runtimerender/linux/DynamicLibLoader.h \
+    ../runtimerender/macos/DynamicLibLoader.h \
+    ../runtimerender/qnx/DynamicLibLoader.h \
+    ../runtimerender/windows/DynamicLibLoader.h
+
+# Runtime
+HEADERS += \
+    ../runtime/RuntimePrefix.h \
+    ../runtime/q3dsqmlscript.h \
+    ../runtime/q3dsqmlbehavior.h
+
+SOURCES += \
+    ../runtime/q3dsqmlscript.cpp \
+    ../runtime/q3dsqmlbehavior.cpp
+
+# System
+HEADERS += \
+    ../system/SystemPrefix.h
+
+DISTFILES += \
+    ../runtime/Qt3DSAttributeHashes.txt
diff --git a/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/NvVec.h b/src/Runtime/ogl-runtime/src/platformspecific/android/jni/libs/nv_math/NvVec.h
index 4e5b09ce..4e5b09ce 100644
--- a/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/NvVec.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/android/jni/libs/nv_math/NvVec.h
diff --git a/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/misc.h b/src/Runtime/ogl-runtime/src/platformspecific/android/jni/libs/nv_math/misc.h
index 983410f3..983410f3 100644
--- a/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/misc.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/android/jni/libs/nv_math/misc.h
diff --git a/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_math.cpp b/src/Runtime/ogl-runtime/src/platformspecific/android/jni/libs/nv_math/nv_math.cpp
index b83cb39e..b83cb39e 100644
--- a/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_math.cpp
+++ b/src/Runtime/ogl-runtime/src/platformspecific/android/jni/libs/nv_math/nv_math.cpp
diff --git a/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_math.h b/src/Runtime/ogl-runtime/src/platformspecific/android/jni/libs/nv_math/nv_math.h
index cf2d8b30..cf2d8b30 100644
--- a/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_math.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/android/jni/libs/nv_math/nv_math.h
diff --git a/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_matrix.cpp b/src/Runtime/ogl-runtime/src/platformspecific/android/jni/libs/nv_math/nv_matrix.cpp
index e208ac31..e208ac31 100644
--- a/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_matrix.cpp
+++ b/src/Runtime/ogl-runtime/src/platformspecific/android/jni/libs/nv_math/nv_matrix.cpp
diff --git a/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_matrix.h b/src/Runtime/ogl-runtime/src/platformspecific/android/jni/libs/nv_math/nv_matrix.h
index 2a8e186e..2a8e186e 100644
--- a/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_matrix.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/android/jni/libs/nv_math/nv_matrix.h
diff --git a/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_quat.cpp b/src/Runtime/ogl-runtime/src/platformspecific/android/jni/libs/nv_math/nv_quat.cpp
index 6dc6d1a7..6dc6d1a7 100644
--- a/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_quat.cpp
+++ b/src/Runtime/ogl-runtime/src/platformspecific/android/jni/libs/nv_math/nv_quat.cpp
diff --git a/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_quat.h b/src/Runtime/ogl-runtime/src/platformspecific/android/jni/libs/nv_math/nv_quat.h
index 688c30a7..688c30a7 100644
--- a/src/Runtime/Source/platformspecific/android/jni/libs/nv_math/nv_quat.h
+++ b/src/Runtime/ogl-runtime/src/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/ogl-runtime/src/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/ogl-runtime/src/platformspecific/linux/assets/courier+lucida_256.abc
diff --git a/src/Runtime/Source/platformspecific/linux/assets/courier+lucida_256.dds b/src/Runtime/ogl-runtime/src/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/ogl-runtime/src/platformspecific/linux/assets/courier+lucida_256.dds
diff --git a/src/Runtime/Source/platformspecific/linux/assets/courier+lucida_512.abc b/src/Runtime/ogl-runtime/src/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/ogl-runtime/src/platformspecific/linux/assets/courier+lucida_512.abc
diff --git a/src/Runtime/Source/platformspecific/linux/assets/courier+lucida_512.dds b/src/Runtime/ogl-runtime/src/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/ogl-runtime/src/platformspecific/linux/assets/courier+lucida_512.dds
diff --git a/src/Runtime/Source/platformspecific/linux/assets/font.frag b/src/Runtime/ogl-runtime/src/platformspecific/linux/assets/font.frag
index e4673cf8..e4673cf8 100644
--- a/src/Runtime/Source/platformspecific/linux/assets/font.frag
+++ b/src/Runtime/ogl-runtime/src/platformspecific/linux/assets/font.frag
diff --git a/src/Runtime/Source/platformspecific/linux/assets/font.vert b/src/Runtime/ogl-runtime/src/platformspecific/linux/assets/font.vert
index 9f307a2f..9f307a2f 100644
--- a/src/Runtime/Source/platformspecific/linux/assets/font.vert
+++ b/src/Runtime/ogl-runtime/src/platformspecific/linux/assets/font.vert
diff --git a/src/Runtime/Source/platformspecific/linux/libs/nv_color.h b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_color.h
index b9347529..b9347529 100644
--- a/src/Runtime/Source/platformspecific/linux/libs/nv_color.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_color.h
diff --git a/src/Runtime/Source/platformspecific/linux/libs/nv_debug.h b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_debug.h
index 2559dd6f..2559dd6f 100644
--- a/src/Runtime/Source/platformspecific/linux/libs/nv_debug.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_debug.h
diff --git a/src/Runtime/Source/platformspecific/linux/libs/nv_global.h b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_global.h
index 9d23d45f..9d23d45f 100644
--- a/src/Runtime/Source/platformspecific/linux/libs/nv_global.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_global.h
diff --git a/src/Runtime/Source/platformspecific/linux/libs/nv_math/NvVec.h b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_math/NvVec.h
index 4e5b09ce..4e5b09ce 100644
--- a/src/Runtime/Source/platformspecific/linux/libs/nv_math/NvVec.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_math/NvVec.h
diff --git a/src/Runtime/Source/platformspecific/linux/libs/nv_math/misc.h b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_math/misc.h
index 983410f3..983410f3 100644
--- a/src/Runtime/Source/platformspecific/linux/libs/nv_math/misc.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_math/misc.h
diff --git a/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_math.cpp b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_math/nv_math.cpp
index b83cb39e..b83cb39e 100644
--- a/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_math.cpp
+++ b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_math/nv_math.cpp
diff --git a/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_math.h b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_math/nv_math.h
index 2ef7bba0..2ef7bba0 100644
--- a/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_math.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_math/nv_math.h
diff --git a/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_matrix.cpp b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_math/nv_matrix.cpp
index e208ac31..e208ac31 100644
--- a/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_matrix.cpp
+++ b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_math/nv_matrix.cpp
diff --git a/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_matrix.h b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_math/nv_matrix.h
index 5f567f06..5f567f06 100644
--- a/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_matrix.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_math/nv_matrix.h
diff --git a/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_quat.cpp b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_math/nv_quat.cpp
index e66420c6..e66420c6 100644
--- a/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_quat.cpp
+++ b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_math/nv_quat.cpp
diff --git a/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_quat.h b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_math/nv_quat.h
index 2e97c717..2e97c717 100644
--- a/src/Runtime/Source/platformspecific/linux/libs/nv_math/nv_quat.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_math/nv_quat.h
diff --git a/src/Runtime/Source/platformspecific/linux/libs/nv_types.h b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_types.h
index 1d1b0300..1d1b0300 100644
--- a/src/Runtime/Source/platformspecific/linux/libs/nv_types.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/linux/libs/nv_types.h
diff --git a/src/Runtime/Source/platformspecific/macos/assets/courier+lucida_256.abc b/src/Runtime/ogl-runtime/src/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/ogl-runtime/src/platformspecific/macos/assets/courier+lucida_256.abc
diff --git a/src/Runtime/Source/platformspecific/macos/assets/courier+lucida_256.dds b/src/Runtime/ogl-runtime/src/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/ogl-runtime/src/platformspecific/macos/assets/courier+lucida_256.dds
diff --git a/src/Runtime/Source/platformspecific/macos/assets/courier+lucida_512.abc b/src/Runtime/ogl-runtime/src/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/ogl-runtime/src/platformspecific/macos/assets/courier+lucida_512.abc
diff --git a/src/Runtime/Source/platformspecific/macos/assets/courier+lucida_512.dds b/src/Runtime/ogl-runtime/src/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/ogl-runtime/src/platformspecific/macos/assets/courier+lucida_512.dds
diff --git a/src/Runtime/Source/platformspecific/macos/assets/font.frag b/src/Runtime/ogl-runtime/src/platformspecific/macos/assets/font.frag
index e4673cf8..e4673cf8 100644
--- a/src/Runtime/Source/platformspecific/macos/assets/font.frag
+++ b/src/Runtime/ogl-runtime/src/platformspecific/macos/assets/font.frag
diff --git a/src/Runtime/Source/platformspecific/macos/assets/font.vert b/src/Runtime/ogl-runtime/src/platformspecific/macos/assets/font.vert
index 9f307a2f..9f307a2f 100644
--- a/src/Runtime/Source/platformspecific/macos/assets/font.vert
+++ b/src/Runtime/ogl-runtime/src/platformspecific/macos/assets/font.vert
diff --git a/src/Runtime/Source/platformspecific/macos/libs/nv_color.h b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_color.h
index b9347529..b9347529 100644
--- a/src/Runtime/Source/platformspecific/macos/libs/nv_color.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_color.h
diff --git a/src/Runtime/Source/platformspecific/macos/libs/nv_debug.h b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_debug.h
index 2559dd6f..2559dd6f 100644
--- a/src/Runtime/Source/platformspecific/macos/libs/nv_debug.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_debug.h
diff --git a/src/Runtime/Source/platformspecific/macos/libs/nv_global.h b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_global.h
index 9d23d45f..9d23d45f 100644
--- a/src/Runtime/Source/platformspecific/macos/libs/nv_global.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_global.h
diff --git a/src/Runtime/Source/platformspecific/macos/libs/nv_math/NvVec.h b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_math/NvVec.h
index 4e5b09ce..4e5b09ce 100644
--- a/src/Runtime/Source/platformspecific/macos/libs/nv_math/NvVec.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_math/NvVec.h
diff --git a/src/Runtime/Source/platformspecific/macos/libs/nv_math/misc.h b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_math/misc.h
index 983410f3..983410f3 100644
--- a/src/Runtime/Source/platformspecific/macos/libs/nv_math/misc.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_math/misc.h
diff --git a/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_math.cpp b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_math/nv_math.cpp
index b83cb39e..b83cb39e 100644
--- a/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_math.cpp
+++ b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_math/nv_math.cpp
diff --git a/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_math.h b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_math/nv_math.h
index e777e409..e777e409 100644
--- a/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_math.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_math/nv_math.h
diff --git a/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_matrix.cpp b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_math/nv_matrix.cpp
index e208ac31..e208ac31 100644
--- a/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_matrix.cpp
+++ b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_math/nv_matrix.cpp
diff --git a/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_matrix.h b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_math/nv_matrix.h
index 0709f117..0709f117 100644
--- a/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_matrix.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_math/nv_matrix.h
diff --git a/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_quat.cpp b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_math/nv_quat.cpp
index ec497941..ec497941 100644
--- a/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_quat.cpp
+++ b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_math/nv_quat.cpp
diff --git a/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_quat.h b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_math/nv_quat.h
index 2afdcb71..2afdcb71 100644
--- a/src/Runtime/Source/platformspecific/macos/libs/nv_math/nv_quat.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_math/nv_quat.h
diff --git a/src/Runtime/Source/platformspecific/macos/libs/nv_types.h b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_types.h
index 1d1b0300..1d1b0300 100644
--- a/src/Runtime/Source/platformspecific/macos/libs/nv_types.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/macos/libs/nv_types.h
diff --git a/src/Runtime/Source/platformspecific/windows/assets/courier+lucida_256.abc b/src/Runtime/ogl-runtime/src/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/ogl-runtime/src/platformspecific/windows/assets/courier+lucida_256.abc
diff --git a/src/Runtime/Source/platformspecific/windows/assets/courier+lucida_256.dds b/src/Runtime/ogl-runtime/src/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/ogl-runtime/src/platformspecific/windows/assets/courier+lucida_256.dds
diff --git a/src/Runtime/Source/platformspecific/windows/assets/courier+lucida_512.abc b/src/Runtime/ogl-runtime/src/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/ogl-runtime/src/platformspecific/windows/assets/courier+lucida_512.abc
diff --git a/src/Runtime/Source/platformspecific/windows/assets/courier+lucida_512.dds b/src/Runtime/ogl-runtime/src/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/ogl-runtime/src/platformspecific/windows/assets/courier+lucida_512.dds
diff --git a/src/Runtime/Source/platformspecific/windows/assets/font.frag b/src/Runtime/ogl-runtime/src/platformspecific/windows/assets/font.frag
index e4673cf8..e4673cf8 100644
--- a/src/Runtime/Source/platformspecific/windows/assets/font.frag
+++ b/src/Runtime/ogl-runtime/src/platformspecific/windows/assets/font.frag
diff --git a/src/Runtime/Source/platformspecific/windows/assets/font.vert b/src/Runtime/ogl-runtime/src/platformspecific/windows/assets/font.vert
index 9f307a2f..9f307a2f 100644
--- a/src/Runtime/Source/platformspecific/windows/assets/font.vert
+++ b/src/Runtime/ogl-runtime/src/platformspecific/windows/assets/font.vert
diff --git a/src/Runtime/Source/platformspecific/windows/libs/nv_color.h b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_color.h
index b9347529..b9347529 100644
--- a/src/Runtime/Source/platformspecific/windows/libs/nv_color.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_color.h
diff --git a/src/Runtime/Source/platformspecific/windows/libs/nv_config/nv_config.h b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_config/nv_config.h
index fb0b88af..fb0b88af 100644
--- a/src/Runtime/Source/platformspecific/windows/libs/nv_config/nv_config.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_config/nv_config.h
diff --git a/src/Runtime/Source/platformspecific/windows/libs/nv_debug.h b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_debug.h
index 2559dd6f..2559dd6f 100644
--- a/src/Runtime/Source/platformspecific/windows/libs/nv_debug.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_debug.h
diff --git a/src/Runtime/Source/platformspecific/windows/libs/nv_global.h b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_global.h
index 9d23d45f..9d23d45f 100644
--- a/src/Runtime/Source/platformspecific/windows/libs/nv_global.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_global.h
diff --git a/src/Runtime/Source/platformspecific/windows/libs/nv_math/NvVec.h b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_math/NvVec.h
index 4e5b09ce..4e5b09ce 100644
--- a/src/Runtime/Source/platformspecific/windows/libs/nv_math/NvVec.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_math/NvVec.h
diff --git a/src/Runtime/Source/platformspecific/windows/libs/nv_math/misc.h b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_math/misc.h
index 983410f3..983410f3 100644
--- a/src/Runtime/Source/platformspecific/windows/libs/nv_math/misc.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_math/misc.h
diff --git a/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_math.cpp b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_math/nv_math.cpp
index b83cb39e..b83cb39e 100644
--- a/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_math.cpp
+++ b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_math/nv_math.cpp
diff --git a/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_math.h b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_math/nv_math.h
index ec729a79..ec729a79 100644
--- a/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_math.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_math/nv_math.h
diff --git a/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_matrix.cpp b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_math/nv_matrix.cpp
index e208ac31..e208ac31 100644
--- a/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_matrix.cpp
+++ b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_math/nv_matrix.cpp
diff --git a/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_matrix.h b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_math/nv_matrix.h
index 0e04568e..0e04568e 100644
--- a/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_matrix.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_math/nv_matrix.h
diff --git a/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_quat.cpp b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_math/nv_quat.cpp
index 9626eb8c..9626eb8c 100644
--- a/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_quat.cpp
+++ b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_math/nv_quat.cpp
diff --git a/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_quat.h b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_math/nv_quat.h
index 4c65cb9e..4c65cb9e 100644
--- a/src/Runtime/Source/platformspecific/windows/libs/nv_math/nv_quat.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_math/nv_quat.h
diff --git a/src/Runtime/Source/platformspecific/windows/libs/nv_types.h b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_types.h
index 1d1b0300..1d1b0300 100644
--- a/src/Runtime/Source/platformspecific/windows/libs/nv_types.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/windows/libs/nv_types.h
diff --git a/src/Runtime/Source/platformspecific/windows/viewer/Resource.h b/src/Runtime/ogl-runtime/src/platformspecific/windows/viewer/Resource.h
index 58c9336e..58c9336e 100644
--- a/src/Runtime/Source/platformspecific/windows/viewer/Resource.h
+++ b/src/Runtime/ogl-runtime/src/platformspecific/windows/viewer/Resource.h
diff --git a/src/QtExtras/qmlstreamer/q3dsincubationcontroller.h b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsincubationcontroller.h
index 733037c6..733037c6 100644
--- a/src/QtExtras/qmlstreamer/q3dsincubationcontroller.h
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsincubationcontroller.h
diff --git a/src/QtExtras/qmlstreamer/q3dsqmlstream.cpp b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstream.cpp
index e1b9e857..e1b9e857 100644
--- a/src/QtExtras/qmlstreamer/q3dsqmlstream.cpp
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstream.cpp
diff --git a/src/QtExtras/qmlstreamer/q3dsqmlstream.h b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstream.h
index 74825902..74825902 100644
--- a/src/QtExtras/qmlstreamer/q3dsqmlstream.h
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstream.h
diff --git a/src/QtExtras/qmlstreamer/q3dsqmlstreamer_global.h b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamer_global.h
index af12e6f0..af12e6f0 100644
--- a/src/QtExtras/qmlstreamer/q3dsqmlstreamer_global.h
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamer_global.h
diff --git a/src/QtExtras/qmlstreamer/q3dsqmlstreamerserviceimpl.cpp b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamerserviceimpl.cpp
index 78c0a36a..78c0a36a 100644
--- a/src/QtExtras/qmlstreamer/q3dsqmlstreamerserviceimpl.cpp
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamerserviceimpl.cpp
diff --git a/src/QtExtras/qmlstreamer/q3dsqmlstreamerserviceimpl.h b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamerserviceimpl.h
index a17bf340..a17bf340 100644
--- a/src/QtExtras/qmlstreamer/q3dsqmlstreamerserviceimpl.h
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamerserviceimpl.h
diff --git a/src/QtExtras/qmlstreamer/q3dsqmlstreamproducer.cpp b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamproducer.cpp
index 39eccb1b..39eccb1b 100644
--- a/src/QtExtras/qmlstreamer/q3dsqmlstreamproducer.cpp
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamproducer.cpp
diff --git a/src/QtExtras/qmlstreamer/q3dsqmlstreamproducer.h b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamproducer.h
index d3b330d1..d3b330d1 100644
--- a/src/QtExtras/qmlstreamer/q3dsqmlstreamproducer.h
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamproducer.h
diff --git a/src/QtExtras/qmlstreamer/q3dsqmlstreamproxy.cpp b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamproxy.cpp
index 9b8550cf..9b8550cf 100644
--- a/src/QtExtras/qmlstreamer/q3dsqmlstreamproxy.cpp
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamproxy.cpp
diff --git a/src/QtExtras/qmlstreamer/q3dsqmlstreamproxy.h b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamproxy.h
index 85a1cc6d..85a1cc6d 100644
--- a/src/QtExtras/qmlstreamer/q3dsqmlstreamproxy.h
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamproxy.h
diff --git a/src/QtExtras/qmlstreamer/q3dsqmlstreamrenderer.cpp b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamrenderer.cpp
index f1879a6e..f1879a6e 100644
--- a/src/QtExtras/qmlstreamer/q3dsqmlstreamrenderer.cpp
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamrenderer.cpp
diff --git a/src/QtExtras/qmlstreamer/q3dsqmlstreamrenderer.h b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamrenderer.h
index e9274794..e9274794 100644
--- a/src/QtExtras/qmlstreamer/q3dsqmlstreamrenderer.h
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamrenderer.h
diff --git a/src/QtExtras/qmlstreamer/q3dsqmlstreamservice.h b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamservice.h
index 2b44fe3b..2b44fe3b 100644
--- a/src/QtExtras/qmlstreamer/q3dsqmlstreamservice.h
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstreamservice.h
diff --git a/src/QtExtras/qmlstreamer/q3dsqmlsubpresentationsettings.cpp b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlsubpresentationsettings.cpp
index bde5ad31..bde5ad31 100644
--- a/src/QtExtras/qmlstreamer/q3dsqmlsubpresentationsettings.cpp
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlsubpresentationsettings.cpp
diff --git a/src/QtExtras/qmlstreamer/q3dsqmlsubpresentationsettings.h b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlsubpresentationsettings.h
index b295f2a0..b295f2a0 100644
--- a/src/QtExtras/qmlstreamer/q3dsqmlsubpresentationsettings.h
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlsubpresentationsettings.h
diff --git a/src/QtExtras/qmlstreamer/qmlstreamer.pro b/src/Runtime/ogl-runtime/src/qmlstreamer/qmlstreamer.pro
index 19b91a2b..5e82c7c0 100644
--- a/src/QtExtras/qmlstreamer/qmlstreamer.pro
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/qmlstreamer.pro
@@ -43,8 +43,8 @@ HEADERS += \
     q3dsqmlsubpresentationsettings.h
 
 INCLUDEPATH += \
-    $$PWD/../Runtime/Source/engine \
-    $$PWD/../Runtime/Source/system \
+    $$PWD/../Runtime/ogl-runtime/src/engine \
+    $$PWD/../Runtime/ogl-runtime/src/system \
     $$PWD/../QtExtras/qmlstreamer
 
 macos:QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
diff --git a/src/Runtime/Source/render/Examples/Qt3DSRenderClearColorExample.cpp b/src/Runtime/ogl-runtime/src/render/Examples/Qt3DSRenderClearColorExample.cpp
index f67cf717..f67cf717 100644
--- a/src/Runtime/Source/render/Examples/Qt3DSRenderClearColorExample.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Examples/Qt3DSRenderClearColorExample.cpp
diff --git a/src/Runtime/Source/render/Examples/Qt3DSRenderExample.cpp b/src/Runtime/ogl-runtime/src/render/Examples/Qt3DSRenderExample.cpp
index d866cda0..d866cda0 100644
--- a/src/Runtime/Source/render/Examples/Qt3DSRenderExample.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Examples/Qt3DSRenderExample.cpp
diff --git a/src/Runtime/Source/render/Examples/Qt3DSRenderExample.h b/src/Runtime/ogl-runtime/src/render/Examples/Qt3DSRenderExample.h
index 79bfd911..79bfd911 100644
--- a/src/Runtime/Source/render/Examples/Qt3DSRenderExample.h
+++ b/src/Runtime/ogl-runtime/src/render/Examples/Qt3DSRenderExample.h
diff --git a/src/Runtime/Source/render/Examples/Qt3DSRenderExampleTools.cpp b/src/Runtime/ogl-runtime/src/render/Examples/Qt3DSRenderExampleTools.cpp
index efae6f5e..efae6f5e 100644
--- a/src/Runtime/Source/render/Examples/Qt3DSRenderExampleTools.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Examples/Qt3DSRenderExampleTools.cpp
diff --git a/src/Runtime/Source/render/Examples/Qt3DSRenderExampleTools.h b/src/Runtime/ogl-runtime/src/render/Examples/Qt3DSRenderExampleTools.h
index 5b402868..5b402868 100644
--- a/src/Runtime/Source/render/Examples/Qt3DSRenderExampleTools.h
+++ b/src/Runtime/ogl-runtime/src/render/Examples/Qt3DSRenderExampleTools.h
diff --git a/src/Runtime/Source/render/Examples/Qt3DSRenderRenderToTextureExample.cpp b/src/Runtime/ogl-runtime/src/render/Examples/Qt3DSRenderRenderToTextureExample.cpp
index e2cb4149..e2cb4149 100644
--- a/src/Runtime/Source/render/Examples/Qt3DSRenderRenderToTextureExample.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Examples/Qt3DSRenderRenderToTextureExample.cpp
diff --git a/src/Runtime/Source/render/Examples/Qt3DSRenderSpinningCubeExample.cpp b/src/Runtime/ogl-runtime/src/render/Examples/Qt3DSRenderSpinningCubeExample.cpp
index 807f0821..807f0821 100644
--- a/src/Runtime/Source/render/Examples/Qt3DSRenderSpinningCubeExample.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Examples/Qt3DSRenderSpinningCubeExample.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderAtomicCounterBuffer.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderAtomicCounterBuffer.cpp
index 272c3e8c..272c3e8c 100644
--- a/src/Runtime/Source/render/Qt3DSRenderAtomicCounterBuffer.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderAtomicCounterBuffer.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderAtomicCounterBuffer.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderAtomicCounterBuffer.h
index 5ff449ea..5ff449ea 100644
--- a/src/Runtime/Source/render/Qt3DSRenderAtomicCounterBuffer.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderAtomicCounterBuffer.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderAttribLayout.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderAttribLayout.cpp
index 42641a04..42641a04 100644
--- a/src/Runtime/Source/render/Qt3DSRenderAttribLayout.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderAttribLayout.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderAttribLayout.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderAttribLayout.h
index da801c8e..da801c8e 100644
--- a/src/Runtime/Source/render/Qt3DSRenderAttribLayout.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderAttribLayout.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderBaseTypes.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderBaseTypes.cpp
index e881d27f..e881d27f 100644
--- a/src/Runtime/Source/render/Qt3DSRenderBaseTypes.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderBaseTypes.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderBaseTypes.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderBaseTypes.h
index fa5e6fcd..fa5e6fcd 100644
--- a/src/Runtime/Source/render/Qt3DSRenderBaseTypes.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderBaseTypes.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderComputeShader.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderComputeShader.cpp
index 01aef473..01aef473 100644
--- a/src/Runtime/Source/render/Qt3DSRenderComputeShader.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderComputeShader.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderComputeShader.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderComputeShader.h
index 1ab36bc0..1ab36bc0 100644
--- a/src/Runtime/Source/render/Qt3DSRenderComputeShader.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderComputeShader.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderConstantBuffer.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderConstantBuffer.cpp
index 1b3c43a9..1b3c43a9 100644
--- a/src/Runtime/Source/render/Qt3DSRenderConstantBuffer.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderConstantBuffer.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderConstantBuffer.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderConstantBuffer.h
index 5ede23b9..5ede23b9 100644
--- a/src/Runtime/Source/render/Qt3DSRenderConstantBuffer.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderConstantBuffer.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderContext.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderContext.cpp
index aa2cb30f..aa2cb30f 100644
--- a/src/Runtime/Source/render/Qt3DSRenderContext.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderContext.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderContext.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderContext.h
index dfaf1bb9..dfaf1bb9 100644
--- a/src/Runtime/Source/render/Qt3DSRenderContext.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderContext.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderDataBuffer.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderDataBuffer.cpp
index b00b0af0..b00b0af0 100644
--- a/src/Runtime/Source/render/Qt3DSRenderDataBuffer.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderDataBuffer.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderDataBuffer.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderDataBuffer.h
index 579e2361..579e2361 100644
--- a/src/Runtime/Source/render/Qt3DSRenderDataBuffer.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderDataBuffer.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderDepthStencilState.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderDepthStencilState.cpp
index 3ea47e23..3ea47e23 100644
--- a/src/Runtime/Source/render/Qt3DSRenderDepthStencilState.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderDepthStencilState.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderDepthStencilState.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderDepthStencilState.h
index e6b31981..e6b31981 100644
--- a/src/Runtime/Source/render/Qt3DSRenderDepthStencilState.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderDepthStencilState.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderDrawIndirectBuffer.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderDrawIndirectBuffer.cpp
index 9940003f..9940003f 100644
--- a/src/Runtime/Source/render/Qt3DSRenderDrawIndirectBuffer.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderDrawIndirectBuffer.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderDrawIndirectBuffer.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderDrawIndirectBuffer.h
index 81cd59d1..81cd59d1 100644
--- a/src/Runtime/Source/render/Qt3DSRenderDrawIndirectBuffer.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderDrawIndirectBuffer.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderDrawable.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderDrawable.h
index 0f78aacc..0f78aacc 100644
--- a/src/Runtime/Source/render/Qt3DSRenderDrawable.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderDrawable.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderFragmentShader.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderFragmentShader.cpp
index e2f31f1b..e2f31f1b 100644
--- a/src/Runtime/Source/render/Qt3DSRenderFragmentShader.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderFragmentShader.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderFragmentShader.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderFragmentShader.h
index f661605c..f661605c 100644
--- a/src/Runtime/Source/render/Qt3DSRenderFragmentShader.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderFragmentShader.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderFrameBuffer.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderFrameBuffer.cpp
index 0ab38428..0ab38428 100644
--- a/src/Runtime/Source/render/Qt3DSRenderFrameBuffer.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderFrameBuffer.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderFrameBuffer.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderFrameBuffer.h
index 1882a27d..1882a27d 100644
--- a/src/Runtime/Source/render/Qt3DSRenderFrameBuffer.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderFrameBuffer.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderGeometryShader.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderGeometryShader.cpp
index 50567287..50567287 100644
--- a/src/Runtime/Source/render/Qt3DSRenderGeometryShader.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderGeometryShader.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderGeometryShader.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderGeometryShader.h
index 2a643cfc..2a643cfc 100644
--- a/src/Runtime/Source/render/Qt3DSRenderGeometryShader.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderGeometryShader.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderImageTexture.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderImageTexture.cpp
index e987cc31..e987cc31 100644
--- a/src/Runtime/Source/render/Qt3DSRenderImageTexture.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderImageTexture.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderImageTexture.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderImageTexture.h
index 8b3469b0..8b3469b0 100644
--- a/src/Runtime/Source/render/Qt3DSRenderImageTexture.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderImageTexture.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderIndexBuffer.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderIndexBuffer.cpp
index 37f56bd2..37f56bd2 100644
--- a/src/Runtime/Source/render/Qt3DSRenderIndexBuffer.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderIndexBuffer.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderIndexBuffer.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderIndexBuffer.h
index 6b9c4711..6b9c4711 100644
--- a/src/Runtime/Source/render/Qt3DSRenderIndexBuffer.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderIndexBuffer.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderInputAssembler.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderInputAssembler.cpp
index e4d38b9d..e4d38b9d 100644
--- a/src/Runtime/Source/render/Qt3DSRenderInputAssembler.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderInputAssembler.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderInputAssembler.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderInputAssembler.h
index adac4c42..adac4c42 100644
--- a/src/Runtime/Source/render/Qt3DSRenderInputAssembler.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderInputAssembler.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderOcclusionQuery.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderOcclusionQuery.cpp
index d1b62d4c..d1b62d4c 100644
--- a/src/Runtime/Source/render/Qt3DSRenderOcclusionQuery.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderOcclusionQuery.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderOcclusionQuery.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderOcclusionQuery.h
index 04f64e97..04f64e97 100644
--- a/src/Runtime/Source/render/Qt3DSRenderOcclusionQuery.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderOcclusionQuery.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderPathFontSpecification.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderPathFontSpecification.cpp
index 3e9276aa..3e9276aa 100644
--- a/src/Runtime/Source/render/Qt3DSRenderPathFontSpecification.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderPathFontSpecification.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderPathFontSpecification.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderPathFontSpecification.h
index dad3f6bb..dad3f6bb 100644
--- a/src/Runtime/Source/render/Qt3DSRenderPathFontSpecification.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderPathFontSpecification.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderPathFontText.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderPathFontText.cpp
index aeaad13c..aeaad13c 100644
--- a/src/Runtime/Source/render/Qt3DSRenderPathFontText.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderPathFontText.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderPathFontText.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderPathFontText.h
index a1d103ac..a1d103ac 100644
--- a/src/Runtime/Source/render/Qt3DSRenderPathFontText.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderPathFontText.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderPathRender.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderPathRender.cpp
index 42982498..42982498 100644
--- a/src/Runtime/Source/render/Qt3DSRenderPathRender.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderPathRender.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderPathRender.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderPathRender.h
index c261ca31..c261ca31 100644
--- a/src/Runtime/Source/render/Qt3DSRenderPathRender.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderPathRender.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderPathSpecification.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderPathSpecification.cpp
index f4b26f11..f4b26f11 100644
--- a/src/Runtime/Source/render/Qt3DSRenderPathSpecification.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderPathSpecification.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderPathSpecification.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderPathSpecification.h
index 7c6faeda..7c6faeda 100644
--- a/src/Runtime/Source/render/Qt3DSRenderPathSpecification.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderPathSpecification.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderProgramPipeline.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderProgramPipeline.cpp
index b0a9f271..b0a9f271 100644
--- a/src/Runtime/Source/render/Qt3DSRenderProgramPipeline.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderProgramPipeline.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderProgramPipeline.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderProgramPipeline.h
index ce47146a..ce47146a 100644
--- a/src/Runtime/Source/render/Qt3DSRenderProgramPipeline.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderProgramPipeline.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderQueryBase.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderQueryBase.cpp
index f13bc499..f13bc499 100644
--- a/src/Runtime/Source/render/Qt3DSRenderQueryBase.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderQueryBase.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderQueryBase.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderQueryBase.h
index 7a7ead87..7a7ead87 100644
--- a/src/Runtime/Source/render/Qt3DSRenderQueryBase.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderQueryBase.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderRasterizerState.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderRasterizerState.cpp
index e7daf7f4..e7daf7f4 100644
--- a/src/Runtime/Source/render/Qt3DSRenderRasterizerState.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderRasterizerState.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderRasterizerState.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderRasterizerState.h
index 9b71ae42..9b71ae42 100644
--- a/src/Runtime/Source/render/Qt3DSRenderRasterizerState.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderRasterizerState.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderRenderBuffer.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderRenderBuffer.cpp
index b682bc1b..b682bc1b 100644
--- a/src/Runtime/Source/render/Qt3DSRenderRenderBuffer.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderRenderBuffer.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderRenderBuffer.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderRenderBuffer.h
index 41f4068a..41f4068a 100644
--- a/src/Runtime/Source/render/Qt3DSRenderRenderBuffer.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderRenderBuffer.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderSampler.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderSampler.cpp
index b02fc615..b02fc615 100644
--- a/src/Runtime/Source/render/Qt3DSRenderSampler.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderSampler.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderSampler.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderSampler.h
index 77d3f008..77d3f008 100644
--- a/src/Runtime/Source/render/Qt3DSRenderSampler.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderSampler.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderShader.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderShader.h
index 8d0a62c4..8d0a62c4 100644
--- a/src/Runtime/Source/render/Qt3DSRenderShader.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderShader.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderShaderConstant.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderShaderConstant.h
index 7fb57ffe..7fb57ffe 100644
--- a/src/Runtime/Source/render/Qt3DSRenderShaderConstant.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderShaderConstant.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderShaderProgram.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderShaderProgram.cpp
index 09f1094b..09f1094b 100644
--- a/src/Runtime/Source/render/Qt3DSRenderShaderProgram.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderShaderProgram.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderShaderProgram.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderShaderProgram.h
index 054db64b..054db64b 100644
--- a/src/Runtime/Source/render/Qt3DSRenderShaderProgram.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderShaderProgram.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderStorageBuffer.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderStorageBuffer.cpp
index ab632189..ab632189 100644
--- a/src/Runtime/Source/render/Qt3DSRenderStorageBuffer.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderStorageBuffer.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderStorageBuffer.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderStorageBuffer.h
index fefe6b08..fefe6b08 100644
--- a/src/Runtime/Source/render/Qt3DSRenderStorageBuffer.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderStorageBuffer.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderSync.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderSync.cpp
index 02d153a6..02d153a6 100644
--- a/src/Runtime/Source/render/Qt3DSRenderSync.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderSync.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderSync.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderSync.h
index 9dfeb28a..9dfeb28a 100644
--- a/src/Runtime/Source/render/Qt3DSRenderSync.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderSync.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderTessellationShader.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTessellationShader.cpp
index 7a0fd897..7a0fd897 100644
--- a/src/Runtime/Source/render/Qt3DSRenderTessellationShader.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTessellationShader.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderTessellationShader.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTessellationShader.h
index b69e56b1..b69e56b1 100644
--- a/src/Runtime/Source/render/Qt3DSRenderTessellationShader.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTessellationShader.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderTexture2D.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTexture2D.cpp
index c5ea4750..c5ea4750 100644
--- a/src/Runtime/Source/render/Qt3DSRenderTexture2D.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTexture2D.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderTexture2D.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTexture2D.h
index 29c7c1b4..29c7c1b4 100644
--- a/src/Runtime/Source/render/Qt3DSRenderTexture2D.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTexture2D.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderTexture2DArray.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTexture2DArray.cpp
index fc0dfa45..fc0dfa45 100644
--- a/src/Runtime/Source/render/Qt3DSRenderTexture2DArray.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTexture2DArray.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderTexture2DArray.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTexture2DArray.h
index 30ed6dbb..30ed6dbb 100644
--- a/src/Runtime/Source/render/Qt3DSRenderTexture2DArray.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTexture2DArray.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderTextureBase.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTextureBase.cpp
index c1c3e97d..c1c3e97d 100644
--- a/src/Runtime/Source/render/Qt3DSRenderTextureBase.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTextureBase.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderTextureBase.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTextureBase.h
index 872a634e..872a634e 100644
--- a/src/Runtime/Source/render/Qt3DSRenderTextureBase.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTextureBase.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderTextureCube.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTextureCube.cpp
index 0919daf3..0919daf3 100644
--- a/src/Runtime/Source/render/Qt3DSRenderTextureCube.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTextureCube.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderTextureCube.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTextureCube.h
index 7310d44d..7310d44d 100644
--- a/src/Runtime/Source/render/Qt3DSRenderTextureCube.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTextureCube.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderTimerQuery.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTimerQuery.cpp
index 4184436a..4184436a 100644
--- a/src/Runtime/Source/render/Qt3DSRenderTimerQuery.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTimerQuery.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderTimerQuery.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTimerQuery.h
index f909f374..f909f374 100644
--- a/src/Runtime/Source/render/Qt3DSRenderTimerQuery.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderTimerQuery.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderVertexBuffer.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderVertexBuffer.cpp
index 89d6204e..89d6204e 100644
--- a/src/Runtime/Source/render/Qt3DSRenderVertexBuffer.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderVertexBuffer.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderVertexBuffer.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderVertexBuffer.h
index 914afe27..914afe27 100644
--- a/src/Runtime/Source/render/Qt3DSRenderVertexBuffer.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderVertexBuffer.h
diff --git a/src/Runtime/Source/render/Qt3DSRenderVertexShader.cpp b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderVertexShader.cpp
index 3a53ad50..3a53ad50 100644
--- a/src/Runtime/Source/render/Qt3DSRenderVertexShader.cpp
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderVertexShader.cpp
diff --git a/src/Runtime/Source/render/Qt3DSRenderVertexShader.h b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderVertexShader.h
index 0a96045b..0a96045b 100644
--- a/src/Runtime/Source/render/Qt3DSRenderVertexShader.h
+++ b/src/Runtime/ogl-runtime/src/render/Qt3DSRenderVertexShader.h
diff --git a/src/Runtime/Source/render/backends/Qt3DSRenderBackend.h b/src/Runtime/ogl-runtime/src/render/backends/Qt3DSRenderBackend.h
index 12de5d88..12de5d88 100644
--- a/src/Runtime/Source/render/backends/Qt3DSRenderBackend.h
+++ b/src/Runtime/ogl-runtime/src/render/backends/Qt3DSRenderBackend.h
diff --git a/src/Runtime/Source/render/backends/gl/Q3DSRenderBackendGLES2.cpp b/src/Runtime/ogl-runtime/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp
index d38c330c..d38c330c 100644
--- a/src/Runtime/Source/render/backends/gl/Q3DSRenderBackendGLES2.cpp
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp
diff --git a/src/Runtime/Source/render/backends/gl/Q3DSRenderBackendGLES2.h b/src/Runtime/ogl-runtime/src/render/backends/gl/Q3DSRenderBackendGLES2.h
index 4890de0e..4890de0e 100644
--- a/src/Runtime/Source/render/backends/gl/Q3DSRenderBackendGLES2.h
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Q3DSRenderBackendGLES2.h
diff --git a/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLExtensions.cpp b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSOpenGLExtensions.cpp
index 564ecd5a..564ecd5a 100644
--- a/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLExtensions.cpp
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSOpenGLExtensions.cpp
diff --git a/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLExtensions.h b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSOpenGLExtensions.h
index c9ba76a6..c9ba76a6 100644
--- a/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLExtensions.h
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSOpenGLExtensions.h
diff --git a/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLPrefix.h b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSOpenGLPrefix.h
index 0e6dc6d4..0e6dc6d4 100644
--- a/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLPrefix.h
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSOpenGLPrefix.h
diff --git a/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLTokens.h b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSOpenGLTokens.h
index 882e2761..882e2761 100644
--- a/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLTokens.h
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSOpenGLTokens.h
diff --git a/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLUtil.h b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSOpenGLUtil.h
index 32f7dad7..32f7dad7 100644
--- a/src/Runtime/Source/render/backends/gl/Qt3DSOpenGLUtil.h
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSOpenGLUtil.h
diff --git a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGL3.cpp b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendGL3.cpp
index f49f3a16..f49f3a16 100644
--- a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGL3.cpp
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendGL3.cpp
diff --git a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGL3.h b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendGL3.h
index 7147b341..7147b341 100644
--- a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGL3.h
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendGL3.h
diff --git a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGL4.cpp b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendGL4.cpp
index 083fc35e..083fc35e 100644
--- a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGL4.cpp
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendGL4.cpp
diff --git a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGL4.h b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendGL4.h
index bfdc03b7..bfdc03b7 100644
--- a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGL4.h
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendGL4.h
diff --git a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGLBase.cpp b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp
index ba25ae7e..ba25ae7e 100644
--- a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGLBase.cpp
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp
diff --git a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGLBase.h b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendGLBase.h
index 28e4dbb1..28e4dbb1 100644
--- a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendGLBase.h
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendGLBase.h
diff --git a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendInputAssemblerGL.h b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendInputAssemblerGL.h
index e14111af..e14111af 100644
--- a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendInputAssemblerGL.h
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendInputAssemblerGL.h
diff --git a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendRenderStatesGL.h b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendRenderStatesGL.h
index 3a74a8e3..3a74a8e3 100644
--- a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendRenderStatesGL.h
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendRenderStatesGL.h
diff --git a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendShaderProgramGL.h b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendShaderProgramGL.h
index f7caffd8..f7caffd8 100644
--- a/src/Runtime/Source/render/backends/gl/Qt3DSRenderBackendShaderProgramGL.h
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderBackendShaderProgramGL.h
diff --git a/src/Runtime/Source/render/backends/gl/Qt3DSRenderContextGL.cpp b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderContextGL.cpp
index 88670ef7..88670ef7 100644
--- a/src/Runtime/Source/render/backends/gl/Qt3DSRenderContextGL.cpp
+++ b/src/Runtime/ogl-runtime/src/render/backends/gl/Qt3DSRenderContextGL.cpp
diff --git a/src/Runtime/Source/render/backends/software/Qt3DSRenderBackendNULL.cpp b/src/Runtime/ogl-runtime/src/render/backends/software/Qt3DSRenderBackendNULL.cpp
index af93e928..af93e928 100644
--- a/src/Runtime/Source/render/backends/software/Qt3DSRenderBackendNULL.cpp
+++ b/src/Runtime/ogl-runtime/src/render/backends/software/Qt3DSRenderBackendNULL.cpp
diff --git a/src/Runtime/Source/render/backends/software/Qt3DSRenderBackendNULL.h b/src/Runtime/ogl-runtime/src/render/backends/software/Qt3DSRenderBackendNULL.h
index 397ecfb1..397ecfb1 100644
--- a/src/Runtime/Source/render/backends/software/Qt3DSRenderBackendNULL.h
+++ b/src/Runtime/ogl-runtime/src/render/backends/software/Qt3DSRenderBackendNULL.h
diff --git a/src/Runtime/Source/render/glg/Qt3DSGLImplObjects.h b/src/Runtime/ogl-runtime/src/render/glg/Qt3DSGLImplObjects.h
index 28f246fd..28f246fd 100644
--- a/src/Runtime/Source/render/glg/Qt3DSGLImplObjects.h
+++ b/src/Runtime/ogl-runtime/src/render/glg/Qt3DSGLImplObjects.h
diff --git a/src/Runtime/Source/runtime/Qt3DSActivationManager.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSActivationManager.cpp
index 3d052742..3d052742 100644
--- a/src/Runtime/Source/runtime/Qt3DSActivationManager.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSActivationManager.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSActivationManager.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSActivationManager.h
index f343ac9b..f343ac9b 100644
--- a/src/Runtime/Source/runtime/Qt3DSActivationManager.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSActivationManager.h
diff --git a/src/Runtime/Source/runtime/Qt3DSAnimationSystem.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSAnimationSystem.cpp
index 84d1c6db..84d1c6db 100644
--- a/src/Runtime/Source/runtime/Qt3DSAnimationSystem.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSAnimationSystem.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSAnimationSystem.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSAnimationSystem.h
index 24542ad9..24542ad9 100644
--- a/src/Runtime/Source/runtime/Qt3DSAnimationSystem.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSAnimationSystem.h
diff --git a/src/Runtime/Source/runtime/Qt3DSApplication.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSApplication.cpp
index df2f00fa..df2f00fa 100644
--- a/src/Runtime/Source/runtime/Qt3DSApplication.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSApplication.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSApplication.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSApplication.h
index 39cd3c4b..39cd3c4b 100644
--- a/src/Runtime/Source/runtime/Qt3DSApplication.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSApplication.h
diff --git a/src/Runtime/Source/runtime/Qt3DSApplicationValues.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSApplicationValues.h
index 80e8f73f..80e8f73f 100644
--- a/src/Runtime/Source/runtime/Qt3DSApplicationValues.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSApplicationValues.h
diff --git a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSAttributeHashes.cpp
index 1daddc10..1daddc10 100644
--- a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSAttributeHashes.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSAttributeHashes.h
index 1f712a8c..1f712a8c 100644
--- a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSAttributeHashes.h
diff --git a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.txt b/src/Runtime/ogl-runtime/src/runtime/Qt3DSAttributeHashes.txt
index 4168bbdc..4168bbdc 100644
--- a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.txt
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSAttributeHashes.txt
diff --git a/src/Runtime/Source/runtime/Qt3DSCommandEventTypes.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSCommandEventTypes.h
index 01a12b44..01a12b44 100644
--- a/src/Runtime/Source/runtime/Qt3DSCommandEventTypes.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSCommandEventTypes.h
diff --git a/src/Runtime/Source/runtime/Qt3DSCommandHelper.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSCommandHelper.cpp
index 53c7648a..53c7648a 100644
--- a/src/Runtime/Source/runtime/Qt3DSCommandHelper.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSCommandHelper.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSCommandHelper.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSCommandHelper.h
index 412a51a1..412a51a1 100644
--- a/src/Runtime/Source/runtime/Qt3DSCommandHelper.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSCommandHelper.h
diff --git a/src/Runtime/Source/runtime/Qt3DSComponentManager.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSComponentManager.cpp
index d7ce0b6a..d7ce0b6a 100644
--- a/src/Runtime/Source/runtime/Qt3DSComponentManager.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSComponentManager.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSComponentManager.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSComponentManager.h
index 865b8aa9..865b8aa9 100644
--- a/src/Runtime/Source/runtime/Qt3DSComponentManager.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSComponentManager.h
diff --git a/src/Runtime/Source/runtime/Qt3DSElementHelper.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSElementHelper.cpp
index acf8849e..acf8849e 100644
--- a/src/Runtime/Source/runtime/Qt3DSElementHelper.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSElementHelper.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSElementHelper.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSElementHelper.h
index df2afddb..df2afddb 100644
--- a/src/Runtime/Source/runtime/Qt3DSElementHelper.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSElementHelper.h
diff --git a/src/Runtime/Source/runtime/Qt3DSElementSystem.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSElementSystem.cpp
index d8e18338..d8e18338 100644
--- a/src/Runtime/Source/runtime/Qt3DSElementSystem.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSElementSystem.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSElementSystem.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSElementSystem.h
index 12ebebd9..12ebebd9 100644
--- a/src/Runtime/Source/runtime/Qt3DSElementSystem.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSElementSystem.h
diff --git a/src/Runtime/Source/runtime/Qt3DSEvent.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSEvent.h
index aef317a5..aef317a5 100644
--- a/src/Runtime/Source/runtime/Qt3DSEvent.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSEvent.h
diff --git a/src/Runtime/Source/runtime/Qt3DSEventCallbacks.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSEventCallbacks.cpp
index 25d720ea..25d720ea 100644
--- a/src/Runtime/Source/runtime/Qt3DSEventCallbacks.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSEventCallbacks.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSEventCallbacks.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSEventCallbacks.h
index 5c17477d..5c17477d 100644
--- a/src/Runtime/Source/runtime/Qt3DSEventCallbacks.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSEventCallbacks.h
diff --git a/src/Runtime/Source/runtime/Qt3DSFrameworkTypes.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSFrameworkTypes.h
index 8cb5c3b8..8cb5c3b8 100644
--- a/src/Runtime/Source/runtime/Qt3DSFrameworkTypes.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSFrameworkTypes.h
diff --git a/src/Runtime/Source/runtime/Qt3DSIComponentManager.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSIComponentManager.h
index 8185da2d..8185da2d 100644
--- a/src/Runtime/Source/runtime/Qt3DSIComponentManager.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSIComponentManager.h
diff --git a/src/Runtime/Source/runtime/Qt3DSIInputSystem.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSIInputSystem.h
index 6cd201fb..6cd201fb 100644
--- a/src/Runtime/Source/runtime/Qt3DSIInputSystem.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSIInputSystem.h
diff --git a/src/Runtime/Source/runtime/Qt3DSIScene.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSIScene.h
index 7494ab0f..7494ab0f 100644
--- a/src/Runtime/Source/runtime/Qt3DSIScene.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSIScene.h
diff --git a/src/Runtime/Source/runtime/Qt3DSIScriptBridge.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSIScriptBridge.h
index abbfcd5b..abbfcd5b 100644
--- a/src/Runtime/Source/runtime/Qt3DSIScriptBridge.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSIScriptBridge.h
diff --git a/src/Runtime/Source/runtime/Qt3DSIStateful.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSIStateful.h
index 0eca293e..0eca293e 100644
--- a/src/Runtime/Source/runtime/Qt3DSIStateful.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSIStateful.h
diff --git a/src/Runtime/Source/runtime/Qt3DSIText.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSIText.h
index c4694fe2..c4694fe2 100644
--- a/src/Runtime/Source/runtime/Qt3DSIText.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSIText.h
diff --git a/src/Runtime/Source/runtime/Qt3DSInputDefs.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSInputDefs.h
index 447e424b..447e424b 100644
--- a/src/Runtime/Source/runtime/Qt3DSInputDefs.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSInputDefs.h
diff --git a/src/Runtime/Source/runtime/Qt3DSInputEngine.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSInputEngine.cpp
index d3cbe423..d3cbe423 100644
--- a/src/Runtime/Source/runtime/Qt3DSInputEngine.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSInputEngine.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSInputEngine.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSInputEngine.h
index bf75e5a1..bf75e5a1 100644
--- a/src/Runtime/Source/runtime/Qt3DSInputEngine.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSInputEngine.h
diff --git a/src/Runtime/Source/runtime/Qt3DSInputEventTypes.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSInputEventTypes.h
index 0b3c3981..0b3c3981 100644
--- a/src/Runtime/Source/runtime/Qt3DSInputEventTypes.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSInputEventTypes.h
diff --git a/src/Runtime/Source/runtime/Qt3DSInputFrame.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSInputFrame.h
index f80f3ebc..f80f3ebc 100644
--- a/src/Runtime/Source/runtime/Qt3DSInputFrame.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSInputFrame.h
diff --git a/src/Runtime/Source/runtime/Qt3DSKernelTypes.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSKernelTypes.h
index 0ad4ec61..0ad4ec61 100644
--- a/src/Runtime/Source/runtime/Qt3DSKernelTypes.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSKernelTypes.h
diff --git a/src/Runtime/Source/runtime/Qt3DSLogicSystem.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSLogicSystem.cpp
index 4a8341b4..4a8341b4 100644
--- a/src/Runtime/Source/runtime/Qt3DSLogicSystem.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSLogicSystem.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSLogicSystem.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSLogicSystem.h
index af13c91f..af13c91f 100644
--- a/src/Runtime/Source/runtime/Qt3DSLogicSystem.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSLogicSystem.h
diff --git a/src/Runtime/Source/runtime/Qt3DSOutputMemoryStream.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSOutputMemoryStream.cpp
index 06d0eee6..06d0eee6 100644
--- a/src/Runtime/Source/runtime/Qt3DSOutputMemoryStream.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSOutputMemoryStream.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSOutputMemoryStream.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSOutputMemoryStream.h
index da28245f..da28245f 100644
--- a/src/Runtime/Source/runtime/Qt3DSOutputMemoryStream.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSOutputMemoryStream.h
diff --git a/src/Runtime/Source/runtime/Qt3DSParametersSystem.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSParametersSystem.cpp
index 84b642cd..84b642cd 100644
--- a/src/Runtime/Source/runtime/Qt3DSParametersSystem.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSParametersSystem.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSParametersSystem.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSParametersSystem.h
index 50a4652d..50a4652d 100644
--- a/src/Runtime/Source/runtime/Qt3DSParametersSystem.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSParametersSystem.h
diff --git a/src/Runtime/Source/runtime/Qt3DSPickFrame.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSPickFrame.h
index 15da72c9..15da72c9 100644
--- a/src/Runtime/Source/runtime/Qt3DSPickFrame.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSPickFrame.h
diff --git a/src/Runtime/Source/runtime/Qt3DSPresentation.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSPresentation.cpp
index 0792119b..0792119b 100644
--- a/src/Runtime/Source/runtime/Qt3DSPresentation.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSPresentation.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSPresentation.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSPresentation.h
index 76b0a6e7..76b0a6e7 100644
--- a/src/Runtime/Source/runtime/Qt3DSPresentation.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSPresentation.h
diff --git a/src/Runtime/Source/runtime/Qt3DSPresentationFrameData.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSPresentationFrameData.cpp
index 649462aa..649462aa 100644
--- a/src/Runtime/Source/runtime/Qt3DSPresentationFrameData.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSPresentationFrameData.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSPresentationFrameData.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSPresentationFrameData.h
index 332cc84a..332cc84a 100644
--- a/src/Runtime/Source/runtime/Qt3DSPresentationFrameData.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSPresentationFrameData.h
diff --git a/src/Runtime/Source/runtime/Qt3DSQmlElementHelper.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSQmlElementHelper.cpp
index 9b58a733..9b58a733 100644
--- a/src/Runtime/Source/runtime/Qt3DSQmlElementHelper.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSQmlElementHelper.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSQmlElementHelper.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSQmlElementHelper.h
index ec36c8ed..ec36c8ed 100644
--- a/src/Runtime/Source/runtime/Qt3DSQmlElementHelper.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSQmlElementHelper.h
diff --git a/src/Runtime/Source/runtime/Qt3DSQmlEngine.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSQmlEngine.cpp
index e5aecc74..e5aecc74 100644
--- a/src/Runtime/Source/runtime/Qt3DSQmlEngine.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSQmlEngine.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSQmlEngine.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSQmlEngine.h
index a5ad382b..a5ad382b 100644
--- a/src/Runtime/Source/runtime/Qt3DSQmlEngine.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSQmlEngine.h
diff --git a/src/Runtime/Source/runtime/Qt3DSRuntimeFactory.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSRuntimeFactory.h
index fb46240c..fb46240c 100644
--- a/src/Runtime/Source/runtime/Qt3DSRuntimeFactory.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSRuntimeFactory.h
diff --git a/src/Runtime/Source/runtime/Qt3DSSceneManager.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSSceneManager.h
index 7d8297f4..7d8297f4 100644
--- a/src/Runtime/Source/runtime/Qt3DSSceneManager.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSSceneManager.h
diff --git a/src/Runtime/Source/runtime/Qt3DSSlideSystem.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSSlideSystem.cpp
index 33c7544d..33c7544d 100644
--- a/src/Runtime/Source/runtime/Qt3DSSlideSystem.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSSlideSystem.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSSlideSystem.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSSlideSystem.h
index d3accbd3..d3accbd3 100644
--- a/src/Runtime/Source/runtime/Qt3DSSlideSystem.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSSlideSystem.h
diff --git a/src/Runtime/Source/runtime/Qt3DSTimePolicy.cpp b/src/Runtime/ogl-runtime/src/runtime/Qt3DSTimePolicy.cpp
index e1efb8e0..e1efb8e0 100644
--- a/src/Runtime/Source/runtime/Qt3DSTimePolicy.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSTimePolicy.cpp
diff --git a/src/Runtime/Source/runtime/Qt3DSTimePolicy.h b/src/Runtime/ogl-runtime/src/runtime/Qt3DSTimePolicy.h
index 6a137196..6a137196 100644
--- a/src/Runtime/Source/runtime/Qt3DSTimePolicy.h
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSTimePolicy.h
diff --git a/src/Runtime/Source/runtime/RuntimePrefix.h b/src/Runtime/ogl-runtime/src/runtime/RuntimePrefix.h
index bf729ebf..bf729ebf 100644
--- a/src/Runtime/Source/runtime/RuntimePrefix.h
+++ b/src/Runtime/ogl-runtime/src/runtime/RuntimePrefix.h
diff --git a/src/Runtime/Source/runtime/q3dsmaterialdefinitionparser.cpp b/src/Runtime/ogl-runtime/src/runtime/q3dsmaterialdefinitionparser.cpp
index 913a24ec..913a24ec 100644
--- a/src/Runtime/Source/runtime/q3dsmaterialdefinitionparser.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/q3dsmaterialdefinitionparser.cpp
diff --git a/src/Runtime/Source/runtime/q3dsmaterialdefinitionparser.h b/src/Runtime/ogl-runtime/src/runtime/q3dsmaterialdefinitionparser.h
index f6d98bbf..f6d98bbf 100644
--- a/src/Runtime/Source/runtime/q3dsmaterialdefinitionparser.h
+++ b/src/Runtime/ogl-runtime/src/runtime/q3dsmaterialdefinitionparser.h
diff --git a/src/Runtime/Source/runtime/q3dsqmlbehavior.cpp b/src/Runtime/ogl-runtime/src/runtime/q3dsqmlbehavior.cpp
index 83b706eb..83b706eb 100644
--- a/src/Runtime/Source/runtime/q3dsqmlbehavior.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/q3dsqmlbehavior.cpp
diff --git a/src/Runtime/Source/runtime/q3dsqmlbehavior.h b/src/Runtime/ogl-runtime/src/runtime/q3dsqmlbehavior.h
index 76f4a4a0..76f4a4a0 100644
--- a/src/Runtime/Source/runtime/q3dsqmlbehavior.h
+++ b/src/Runtime/ogl-runtime/src/runtime/q3dsqmlbehavior.h
diff --git a/src/Runtime/Source/runtime/q3dsqmlscript.cpp b/src/Runtime/ogl-runtime/src/runtime/q3dsqmlscript.cpp
index 725c7520..725c7520 100644
--- a/src/Runtime/Source/runtime/q3dsqmlscript.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/q3dsqmlscript.cpp
diff --git a/src/Runtime/Source/runtime/q3dsqmlscript.h b/src/Runtime/ogl-runtime/src/runtime/q3dsqmlscript.h
index 3ad1118f..3ad1118f 100644
--- a/src/Runtime/Source/runtime/q3dsqmlscript.h
+++ b/src/Runtime/ogl-runtime/src/runtime/q3dsqmlscript.h
diff --git a/src/Runtime/Source/runtime/q3dsvariantconfig.cpp b/src/Runtime/ogl-runtime/src/runtime/q3dsvariantconfig.cpp
index e1fa04c6..e1fa04c6 100644
--- a/src/Runtime/Source/runtime/q3dsvariantconfig.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/q3dsvariantconfig.cpp
diff --git a/src/Runtime/Source/runtime/q3dsvariantconfig_p.h b/src/Runtime/ogl-runtime/src/runtime/q3dsvariantconfig_p.h
index 1905f44a..1905f44a 100644
--- a/src/Runtime/Source/runtime/q3dsvariantconfig_p.h
+++ b/src/Runtime/ogl-runtime/src/runtime/q3dsvariantconfig_p.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp
index 3779aa56..3779aa56 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldGlyphCacheManager.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSDistanceFieldGlyphCacheManager.cpp
index 750301dc..750301dc 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldGlyphCacheManager.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSDistanceFieldGlyphCacheManager.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldGlyphCacheManager_p.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSDistanceFieldGlyphCacheManager_p.h
index 19d3c088..19d3c088 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldGlyphCacheManager_p.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSDistanceFieldGlyphCacheManager_p.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h
index 679d3ad7..679d3ad7 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldRenderer.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSDistanceFieldRenderer.cpp
index 290964b2..290964b2 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldRenderer.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSDistanceFieldRenderer.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldRenderer.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSDistanceFieldRenderer.h
index 3af19a98..3af19a98 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldRenderer.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSDistanceFieldRenderer.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSFontDatabase.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSFontDatabase.cpp
index b44cdbd1..b44cdbd1 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSFontDatabase.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSFontDatabase.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSFontDatabase_p.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSFontDatabase_p.h
index 73e03624..73e03624 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSFontDatabase_p.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSFontDatabase_p.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSOffscreenRenderKey.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSOffscreenRenderKey.h
index 555c2689..555c2689 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSOffscreenRenderKey.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSOffscreenRenderKey.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSOffscreenRenderManager.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSOffscreenRenderManager.cpp
index 7d66c7a3..7d66c7a3 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSOffscreenRenderManager.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSOffscreenRenderManager.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSOffscreenRenderManager.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSOffscreenRenderManager.h
index 6d821624..6d821624 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSOffscreenRenderManager.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSOffscreenRenderManager.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSOldNBustedRenderPlugin.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSOldNBustedRenderPlugin.cpp
index 4028373b..4028373b 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSOldNBustedRenderPlugin.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSOldNBustedRenderPlugin.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSOldNBustedRenderPlugin.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSOldNBustedRenderPlugin.h
index 2753bac6..2753bac6 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSOldNBustedRenderPlugin.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSOldNBustedRenderPlugin.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSOnscreenTextRenderer.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSOnscreenTextRenderer.cpp
index 4b74c511..4b74c511 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSOnscreenTextRenderer.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSOnscreenTextRenderer.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSQtTextRenderer.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSQtTextRenderer.cpp
index 029ccea2..029ccea2 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSQtTextRenderer.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSQtTextRenderer.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRender.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRender.h
index e07dc6ec..e07dc6ec 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRender.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRender.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderClippingFrustum.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderClippingFrustum.cpp
index 86375566..86375566 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderClippingFrustum.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderClippingFrustum.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderClippingFrustum.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderClippingFrustum.h
index b788ad24..b788ad24 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderClippingFrustum.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderClippingFrustum.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderContextCore.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderContextCore.cpp
index 33e1bf6c..33e1bf6c 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderContextCore.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderContextCore.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderContextCore.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderContextCore.h
index 302571d2..302571d2 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderContextCore.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderContextCore.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialRenderContext.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderCustomMaterialRenderContext.h
index 5283660c..5283660c 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialRenderContext.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderCustomMaterialRenderContext.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialShaderGenerator.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderCustomMaterialShaderGenerator.cpp
index 62205ecd..62205ecd 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialShaderGenerator.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderCustomMaterialShaderGenerator.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialShaderGenerator.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderCustomMaterialShaderGenerator.h
index 44e2c064..44e2c064 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialShaderGenerator.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderCustomMaterialShaderGenerator.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialSystem.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderCustomMaterialSystem.cpp
index aaf799fd..aaf799fd 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialSystem.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderCustomMaterialSystem.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialSystem.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderCustomMaterialSystem.h
index 6fe522fd..6fe522fd 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderCustomMaterialSystem.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderCustomMaterialSystem.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.cpp
index 221f3296..221f3296 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.h
index 7453e1db..7453e1db 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderDynamicObjectSystem.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderDynamicObjectSystem.cpp
index 92c337a0..92c337a0 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderDynamicObjectSystem.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderDynamicObjectSystem.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderDynamicObjectSystem.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderDynamicObjectSystem.h
index cfe022ee..cfe022ee 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderDynamicObjectSystem.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderDynamicObjectSystem.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderDynamicObjectSystemCommands.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderDynamicObjectSystemCommands.h
index 857dfa97..857dfa97 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderDynamicObjectSystemCommands.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderDynamicObjectSystemCommands.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderDynamicObjectSystemUtil.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderDynamicObjectSystemUtil.h
index b00b9963..b00b9963 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderDynamicObjectSystemUtil.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderDynamicObjectSystemUtil.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderEffectSystem.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderEffectSystem.cpp
index 65f52a64..65f52a64 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderEffectSystem.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderEffectSystem.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderEffectSystem.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderEffectSystem.h
index 879addc9..879addc9 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderEffectSystem.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderEffectSystem.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderEulerAngles.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderEulerAngles.cpp
index 2732f031..2732f031 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderEulerAngles.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderEulerAngles.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderEulerAngles.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderEulerAngles.h
index bf271e29..bf271e29 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderEulerAngles.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderEulerAngles.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderGpuProfiler.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderGpuProfiler.cpp
index 740d8a71..740d8a71 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderGpuProfiler.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderGpuProfiler.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderGraphObjectPickQuery.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderGraphObjectPickQuery.h
index e63cad3f..e63cad3f 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderGraphObjectPickQuery.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderGraphObjectPickQuery.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderGraphObjectSerializer.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderGraphObjectSerializer.cpp
index 358c5aad..358c5aad 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderGraphObjectSerializer.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderGraphObjectSerializer.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderGraphObjectSerializer.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderGraphObjectSerializer.h
index 8f8420c1..8f8420c1 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderGraphObjectSerializer.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderGraphObjectSerializer.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderGraphObjectTypes.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderGraphObjectTypes.h
index 620f6c5d..620f6c5d 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderGraphObjectTypes.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderGraphObjectTypes.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderImageScaler.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderImageScaler.cpp
index d699179f..d699179f 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderImageScaler.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderImageScaler.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderImageScaler.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderImageScaler.h
index 27b51770..27b51770 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderImageScaler.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderImageScaler.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderImageTextureData.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderImageTextureData.h
index aaa73d7e..aaa73d7e 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderImageTextureData.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderImageTextureData.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderInputStreamFactory.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderInputStreamFactory.cpp
index 1a418b1e..1a418b1e 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderInputStreamFactory.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderInputStreamFactory.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderInputStreamFactory.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderInputStreamFactory.h
index e82134b8..e82134b8 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderInputStreamFactory.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderInputStreamFactory.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderLightConstantProperties.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderLightConstantProperties.h
index 4dcd62c5..4dcd62c5 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderLightConstantProperties.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderLightConstantProperties.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderMaterialHelpers.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderMaterialHelpers.h
index afb799e7..afb799e7 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderMaterialHelpers.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderMaterialHelpers.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderMaterialShaderGenerator.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderMaterialShaderGenerator.h
index e8b9880d..e8b9880d 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderMaterialShaderGenerator.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderMaterialShaderGenerator.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderMesh.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderMesh.h
index d6959ec8..d6959ec8 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderMesh.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderMesh.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderPathManager.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPathManager.cpp
index 5b2c51d4..5b2c51d4 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderPathManager.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPathManager.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderPathManager.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPathManager.h
index fc7e05f1..fc7e05f1 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderPathManager.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPathManager.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderPathMath.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPathMath.h
index e9eb2220..e9eb2220 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderPathMath.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPathMath.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderPathRenderContext.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPathRenderContext.h
index deeea281..deeea281 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderPathRenderContext.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPathRenderContext.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderPixelGraphicsRenderer.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPixelGraphicsRenderer.cpp
index 43f7c0b4..43f7c0b4 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderPixelGraphicsRenderer.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPixelGraphicsRenderer.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderPixelGraphicsRenderer.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPixelGraphicsRenderer.h
index b37cb26b..b37cb26b 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderPixelGraphicsRenderer.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPixelGraphicsRenderer.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderPixelGraphicsTypes.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPixelGraphicsTypes.cpp
index fe32437f..fe32437f 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderPixelGraphicsTypes.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPixelGraphicsTypes.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderPixelGraphicsTypes.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPixelGraphicsTypes.h
index 2c154c18..2c154c18 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderPixelGraphicsTypes.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPixelGraphicsTypes.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderPlugin.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPlugin.cpp
index e4e821f8..e4e821f8 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderPlugin.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPlugin.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderPlugin.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPlugin.h
index eb71f846..eb71f846 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderPlugin.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPlugin.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderPluginCInterface.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPluginCInterface.h
index ec7481a0..ec7481a0 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderPluginCInterface.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPluginCInterface.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderPluginGraphObject.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPluginGraphObject.h
index c0ea66b4..c0ea66b4 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderPluginGraphObject.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPluginGraphObject.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderPluginPropertyValue.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPluginPropertyValue.h
index a266e8d3..a266e8d3 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderPluginPropertyValue.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderPluginPropertyValue.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderProfiler.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderProfiler.h
index a5941c03..a5941c03 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderProfiler.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderProfiler.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderRay.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderRay.cpp
index 5376b8b9..5376b8b9 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderRay.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderRay.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderRay.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderRay.h
index 705f7089..705f7089 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderRay.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderRay.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderRenderList.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderRenderList.cpp
index 05a7b2c4..05a7b2c4 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderRenderList.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderRenderList.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderRenderList.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderRenderList.h
index 957c3d78..957c3d78 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderRenderList.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderRenderList.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderRotationHelper.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderRotationHelper.h
index 19ba8eb7..19ba8eb7 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderRotationHelper.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderRotationHelper.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCache.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShaderCache.cpp
index 1d947459..1d947459 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCache.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShaderCache.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCache.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShaderCache.h
index 47e76f36..47e76f36 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCache.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShaderCache.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCodeGenerator.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShaderCodeGenerator.cpp
index d84c37de..d84c37de 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCodeGenerator.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShaderCodeGenerator.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCodeGenerator.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShaderCodeGenerator.h
index d68a3699..d68a3699 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCodeGenerator.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShaderCodeGenerator.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCodeGeneratorV2.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShaderCodeGeneratorV2.cpp
index cfdf47ae..cfdf47ae 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCodeGeneratorV2.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShaderCodeGeneratorV2.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCodeGeneratorV2.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShaderCodeGeneratorV2.h
index 6a6e967e..6a6e967e 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCodeGeneratorV2.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShaderCodeGeneratorV2.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderShaderKeys.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShaderKeys.h
index 5d02e414..5d02e414 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderShaderKeys.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShaderKeys.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderShadowMap.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShadowMap.cpp
index 983af55c..983af55c 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderShadowMap.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShadowMap.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderShadowMap.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShadowMap.h
index c5ba2eaa..c5ba2eaa 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderShadowMap.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShadowMap.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderSubPresentationHelper.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderSubPresentationHelper.h
index d77c7a7f..d77c7a7f 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderSubPresentationHelper.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderSubPresentationHelper.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderSubpresentation.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderSubpresentation.cpp
index 0b9d42d3..0b9d42d3 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderSubpresentation.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderSubpresentation.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderSubpresentation.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderSubpresentation.h
index 4adac84f..4adac84f 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderSubpresentation.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderSubpresentation.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderTaggedPointer.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTaggedPointer.h
index 8dd8bdd0..8dd8bdd0 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderTaggedPointer.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTaggedPointer.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderTessModeValues.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTessModeValues.h
index 15ea03c9..15ea03c9 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderTessModeValues.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTessModeValues.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureAtlas.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTextTextureAtlas.cpp
index 81c1d232..81c1d232 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureAtlas.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTextTextureAtlas.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureAtlas.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTextTextureAtlas.h
index 7a3f1215..7a3f1215 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureAtlas.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTextTextureAtlas.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureCache.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTextTextureCache.cpp
index 8edbecaf..8edbecaf 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureCache.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTextTextureCache.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureCache.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTextTextureCache.h
index 45d40217..45d40217 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureCache.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTextTextureCache.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderTextTypes.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTextTypes.h
index bbaaa38d..bbaaa38d 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderTextTypes.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTextTypes.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderTextureAtlas.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTextureAtlas.cpp
index 062e7d57..062e7d57 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderTextureAtlas.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTextureAtlas.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderTextureAtlas.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTextureAtlas.h
index 46f7bdb5..46f7bdb5 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderTextureAtlas.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderTextureAtlas.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderThreadPool.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderThreadPool.cpp
index c9c73230..c9c73230 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderThreadPool.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderThreadPool.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderThreadPool.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderThreadPool.h
index 990106a7..990106a7 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderThreadPool.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderThreadPool.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderUIPLoader.cpp
index 9aad3973..9aad3973 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderUIPLoader.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderUIPLoader.h
index 2b70c687..2b70c687 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderUIPLoader.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderUIPSharedTranslation.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderUIPSharedTranslation.cpp
index a0594933..a0594933 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderUIPSharedTranslation.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderUIPSharedTranslation.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderUIPSharedTranslation.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderUIPSharedTranslation.h
index 16ce139d..16ce139d 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderUIPSharedTranslation.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderUIPSharedTranslation.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderWidgets.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderWidgets.cpp
index 311b2189..311b2189 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderWidgets.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderWidgets.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderWidgets.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderWidgets.h
index 28cb3322..28cb3322 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderWidgets.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderWidgets.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderableImage.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderableImage.h
index 5d4aa1c4..5d4aa1c4 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderableImage.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderableImage.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderer.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderer.h
index db3eee83..db3eee83 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderer.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderer.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRendererUtil.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRendererUtil.cpp
index 7bc108e0..7bc108e0 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRendererUtil.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRendererUtil.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRendererUtil.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRendererUtil.h
index 96f36426..96f36426 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRendererUtil.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRendererUtil.h
diff --git a/src/Runtime/Source/runtimerender/Qt3DSTextRenderer.cpp b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSTextRenderer.cpp
index 91a5eb78..91a5eb78 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSTextRenderer.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSTextRenderer.cpp
diff --git a/src/Runtime/Source/runtimerender/Qt3DSTextRenderer.h b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSTextRenderer.h
index 11c9ec6e..11c9ec6e 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSTextRenderer.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSTextRenderer.h
diff --git a/src/Runtime/Source/runtimerender/android/DynamicLibLoader.h b/src/Runtime/ogl-runtime/src/runtimerender/android/DynamicLibLoader.h
index c968419a..c968419a 100644
--- a/src/Runtime/Source/runtimerender/android/DynamicLibLoader.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/android/DynamicLibLoader.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderCamera.cpp b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderCamera.cpp
index b9f9c200..b9f9c200 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderCamera.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderCamera.cpp
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderCamera.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderCamera.h
index be8d53e8..be8d53e8 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderCamera.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderCamera.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderCustomMaterial.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderCustomMaterial.h
index 593c7573..593c7573 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderCustomMaterial.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderCustomMaterial.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.cpp b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.cpp
index e18a84d2..e18a84d2 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.cpp
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h
index 48c8d0ba..48c8d0ba 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDynamicObject.cpp b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderDynamicObject.cpp
index 2e1e6a07..2e1e6a07 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDynamicObject.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderDynamicObject.cpp
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDynamicObject.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderDynamicObject.h
index 92ab3b2a..92ab3b2a 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDynamicObject.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderDynamicObject.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderEffect.cpp b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderEffect.cpp
index f074b6b1..f074b6b1 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderEffect.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderEffect.cpp
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderEffect.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderEffect.h
index c11c214c..c11c214c 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderEffect.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderEffect.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderGraphObject.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderGraphObject.h
index 58c48ed1..58c48ed1 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderGraphObject.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderGraphObject.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderImage.cpp b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp
index 1cbd6015..1cbd6015 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderImage.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderImage.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderImage.h
index 9b71d3f1..9b71d3f1 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderImage.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderImage.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLayer.cpp b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderLayer.cpp
index 36a826cb..36a826cb 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLayer.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderLayer.cpp
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLayer.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderLayer.h
index 5c08e917..5c08e917 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLayer.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderLayer.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLight.cpp b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderLight.cpp
index 5c983243..5c983243 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLight.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderLight.cpp
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLight.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderLight.h
index 10f2b866..10f2b866 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLight.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderLight.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLightmaps.cpp b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderLightmaps.cpp
index 0e5e6c60..0e5e6c60 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLightmaps.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderLightmaps.cpp
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLightmaps.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderLightmaps.h
index 4480aea4..4480aea4 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderLightmaps.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderLightmaps.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderMaterialDirty.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderMaterialDirty.h
index c04c1b6b..c04c1b6b 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderMaterialDirty.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderMaterialDirty.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderModel.cpp b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderModel.cpp
index a78396c5..a78396c5 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderModel.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderModel.cpp
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderModel.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderModel.h
index cc5c4e27..cc5c4e27 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderModel.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderModel.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderNode.cpp b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderNode.cpp
index bf47bb8d..bf47bb8d 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderNode.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderNode.cpp
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderNode.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderNode.h
index 87a1500c..87a1500c 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderNode.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderNode.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPath.cpp b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderPath.cpp
index bc637680..bc637680 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPath.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderPath.cpp
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPath.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderPath.h
index 7db3ef50..7db3ef50 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPath.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderPath.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPathSubPath.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderPathSubPath.h
index ed1f9beb..ed1f9beb 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPathSubPath.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderPathSubPath.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPresentation.cpp b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderPresentation.cpp
index 6403959e..6403959e 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPresentation.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderPresentation.cpp
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPresentation.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderPresentation.h
index 2403e3b8..2403e3b8 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderPresentation.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderPresentation.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderReferencedMaterial.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderReferencedMaterial.h
index d2043f0d..d2043f0d 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderReferencedMaterial.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderReferencedMaterial.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderScene.cpp b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderScene.cpp
index 7917bd7a..7917bd7a 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderScene.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderScene.cpp
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderScene.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderScene.h
index 8c4d3fec..8c4d3fec 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderScene.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderScene.h
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.cpp b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderText.cpp
index 40a20c48..40a20c48 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderText.cpp
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.h b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderText.h
index 13f5748a..13f5748a 100644
--- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/graphobjects/Qt3DSRenderText.h
diff --git a/src/Runtime/Source/runtimerender/linux/DynamicLibLoader.h b/src/Runtime/ogl-runtime/src/runtimerender/linux/DynamicLibLoader.h
index cc5d077c..cc5d077c 100644
--- a/src/Runtime/Source/runtimerender/linux/DynamicLibLoader.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/linux/DynamicLibLoader.h
diff --git a/src/Runtime/Source/runtimerender/macos/DynamicLibLoader.h b/src/Runtime/ogl-runtime/src/runtimerender/macos/DynamicLibLoader.h
index c968419a..c968419a 100644
--- a/src/Runtime/Source/runtimerender/macos/DynamicLibLoader.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/macos/DynamicLibLoader.h
diff --git a/src/Runtime/Source/runtimerender/q3dsqmlrender.cpp b/src/Runtime/ogl-runtime/src/runtimerender/q3dsqmlrender.cpp
index f1bdd4d9..f1bdd4d9 100644
--- a/src/Runtime/Source/runtimerender/q3dsqmlrender.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/q3dsqmlrender.cpp
diff --git a/src/Runtime/Source/runtimerender/q3dsqmlrender.h b/src/Runtime/ogl-runtime/src/runtimerender/q3dsqmlrender.h
index 99b395de..99b395de 100644
--- a/src/Runtime/Source/runtimerender/q3dsqmlrender.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/q3dsqmlrender.h
diff --git a/src/Runtime/Source/runtimerender/qnx/DynamicLibLoader.h b/src/Runtime/ogl-runtime/src/runtimerender/qnx/DynamicLibLoader.h
index c968419a..c968419a 100644
--- a/src/Runtime/Source/runtimerender/qnx/DynamicLibLoader.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/qnx/DynamicLibLoader.h
diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.cpp b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRenderableObjects.cpp
index fff7e32f..fff7e32f 100644
--- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRenderableObjects.cpp
diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.h b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRenderableObjects.h
index a369f7a1..a369f7a1 100644
--- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRenderableObjects.h
diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImpl.cpp b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImpl.cpp
index 0b3f6655..0b3f6655 100644
--- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImpl.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImpl.cpp
diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImpl.h b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImpl.h
index 906afd69..906afd69 100644
--- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImpl.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImpl.h
diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.cpp b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.cpp
index 362a6027..362a6027 100644
--- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.cpp
diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.h b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.h
index 4e237b0b..4e237b0b 100644
--- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.h
diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderHelper.cpp b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderHelper.cpp
index 07ee5132..07ee5132 100644
--- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderHelper.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderHelper.cpp
diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderHelper.h b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderHelper.h
index 616ebe1a..616ebe1a 100644
--- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderHelper.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderHelper.h
diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.cpp b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
index 4f274574..4f274574 100644
--- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.h b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.h
index 5b8d6e10..5b8d6e10 100644
--- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.h
diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplShaders.cpp b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplShaders.cpp
index a3d3fab5..a3d3fab5 100644
--- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplShaders.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplShaders.cpp
diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplShaders.h b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplShaders.h
index 1ac85dbf..1ac85dbf 100644
--- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplShaders.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplShaders.h
diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSVertexPipelineImpl.h b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSVertexPipelineImpl.h
index a9b5e7b2..a9b5e7b2 100644
--- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSVertexPipelineImpl.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSVertexPipelineImpl.h
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferLoader.cpp b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderBufferLoader.cpp
index 963186ff..963186ff 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferLoader.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderBufferLoader.cpp
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferLoader.h b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderBufferLoader.h
index 8d75e259..8d75e259 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferLoader.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderBufferLoader.h
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp
index eb23f3d0..eb23f3d0 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferManager.h b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderBufferManager.h
index 070ab675..070ab675 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferManager.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderBufferManager.h
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderImageBatchLoader.cpp b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderImageBatchLoader.cpp
index e2cfbed1..e2cfbed1 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderImageBatchLoader.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderImageBatchLoader.cpp
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderImageBatchLoader.h b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderImageBatchLoader.h
index bc1773ce..bc1773ce 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderImageBatchLoader.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderImageBatchLoader.h
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.cpp b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.cpp
index 11762733..11762733 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.cpp
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.h b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.h
index f0194000..f0194000 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.h
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureBMP.cpp b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureBMP.cpp
index 29e75a89..29e75a89 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureBMP.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureBMP.cpp
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureDDS.cpp b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureDDS.cpp
index 19d41d11..19d41d11 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureDDS.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureDDS.cpp
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureDDS.h b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureDDS.h
index 8490b474..8490b474 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureDDS.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureDDS.h
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureFreeImageCompat.h b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureFreeImageCompat.h
index 13f317bd..13f317bd 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureFreeImageCompat.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureFreeImageCompat.h
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureGIF.cpp b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureGIF.cpp
index ece4d3a3..ece4d3a3 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureGIF.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureGIF.cpp
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureHDR.cpp b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureHDR.cpp
index defff295..defff295 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureHDR.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureHDR.cpp
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.cpp b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.cpp
index b1d4b050..b1d4b050 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.cpp
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.h b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.h
index 3a2d7628..3a2d7628 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTextureKTX.h
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderPrefilterTexture.cpp b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderPrefilterTexture.cpp
index 023964f5..023964f5 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderPrefilterTexture.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderPrefilterTexture.cpp
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderPrefilterTexture.h b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderPrefilterTexture.h
index e633eb14..e633eb14 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderPrefilterTexture.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderPrefilterTexture.h
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceBufferObjects.cpp b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderResourceBufferObjects.cpp
index 25fbb414..25fbb414 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceBufferObjects.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderResourceBufferObjects.cpp
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceBufferObjects.h b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderResourceBufferObjects.h
index fb54c4dc..fb54c4dc 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceBufferObjects.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderResourceBufferObjects.h
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceManager.cpp b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderResourceManager.cpp
index 35936885..35936885 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceManager.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderResourceManager.cpp
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceManager.h b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderResourceManager.h
index 675d644c..675d644c 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceManager.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderResourceManager.h
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceTexture2D.cpp b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderResourceTexture2D.cpp
index e877cbc9..e877cbc9 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceTexture2D.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderResourceTexture2D.cpp
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceTexture2D.h b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderResourceTexture2D.h
index eb54713a..eb54713a 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderResourceTexture2D.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/resourcemanager/Qt3DSRenderResourceTexture2D.h
diff --git a/src/Runtime/Source/runtimerender/windows/DynamicLibLoader.h b/src/Runtime/ogl-runtime/src/runtimerender/windows/DynamicLibLoader.h
index 09b028bc..09b028bc 100644
--- a/src/Runtime/Source/runtimerender/windows/DynamicLibLoader.h
+++ b/src/Runtime/ogl-runtime/src/runtimerender/windows/DynamicLibLoader.h
diff --git a/src/Runtime/ogl-runtime/src/src.pro b/src/Runtime/ogl-runtime/src/src.pro
new file mode 100644
index 00000000..0cb56c88
--- /dev/null
+++ b/src/Runtime/ogl-runtime/src/src.pro
@@ -0,0 +1,10 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS += \
+    3rdparty \
+    dm \
+    qmlstreamer \
+    ogl-runtime-static \
+    ogl-runtime-dylib \
+    api
diff --git a/src/Runtime/Source/state/Qt3DSState.h b/src/Runtime/ogl-runtime/src/state/Qt3DSState.h
index 7f10f941..7f10f941 100644
--- a/src/Runtime/Source/state/Qt3DSState.h
+++ b/src/Runtime/ogl-runtime/src/state/Qt3DSState.h
diff --git a/src/Runtime/Source/state/Qt3DSStateScriptContext.h b/src/Runtime/ogl-runtime/src/state/Qt3DSStateScriptContext.h
index 49b119ea..49b119ea 100644
--- a/src/Runtime/Source/state/Qt3DSStateScriptContext.h
+++ b/src/Runtime/ogl-runtime/src/state/Qt3DSStateScriptContext.h
diff --git a/src/Runtime/Source/state/Qt3DSStateTypes.h b/src/Runtime/ogl-runtime/src/state/Qt3DSStateTypes.h
index 26aee0e0..26aee0e0 100644
--- a/src/Runtime/Source/state/Qt3DSStateTypes.h
+++ b/src/Runtime/ogl-runtime/src/state/Qt3DSStateTypes.h
diff --git a/src/Runtime/Source/state/Qt3DSStateVisualBindingContextCommands.h b/src/Runtime/ogl-runtime/src/state/Qt3DSStateVisualBindingContextCommands.h
index 4d08f695..4d08f695 100644
--- a/src/Runtime/Source/state/Qt3DSStateVisualBindingContextCommands.h
+++ b/src/Runtime/ogl-runtime/src/state/Qt3DSStateVisualBindingContextCommands.h
diff --git a/src/Runtime/Source/system/Qt3DSArray.h b/src/Runtime/ogl-runtime/src/system/Qt3DSArray.h
index 805b8b0a..805b8b0a 100644
--- a/src/Runtime/Source/system/Qt3DSArray.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSArray.h
diff --git a/src/Runtime/Source/system/Qt3DSArray.inl b/src/Runtime/ogl-runtime/src/system/Qt3DSArray.inl
index a9667fd2..a9667fd2 100644
--- a/src/Runtime/Source/system/Qt3DSArray.inl
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSArray.inl
diff --git a/src/Runtime/Source/system/Qt3DSAssert.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSAssert.cpp
index 63d38768..63d38768 100644
--- a/src/Runtime/Source/system/Qt3DSAssert.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSAssert.cpp
diff --git a/src/Runtime/Source/system/Qt3DSAssert.h b/src/Runtime/ogl-runtime/src/system/Qt3DSAssert.h
index a64ca7f6..a64ca7f6 100644
--- a/src/Runtime/Source/system/Qt3DSAssert.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSAssert.h
diff --git a/src/Runtime/Source/system/Qt3DSAudioPlayer.h b/src/Runtime/ogl-runtime/src/system/Qt3DSAudioPlayer.h
index 3b6f3ef8..3b6f3ef8 100644
--- a/src/Runtime/Source/system/Qt3DSAudioPlayer.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSAudioPlayer.h
diff --git a/src/Runtime/Source/system/Qt3DSBasicPluginDLL.h b/src/Runtime/ogl-runtime/src/system/Qt3DSBasicPluginDLL.h
index 63a2d1f6..63a2d1f6 100644
--- a/src/Runtime/Source/system/Qt3DSBasicPluginDLL.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSBasicPluginDLL.h
diff --git a/src/Runtime/Source/system/Qt3DSBezierEval.h b/src/Runtime/ogl-runtime/src/system/Qt3DSBezierEval.h
index c4d733a3..c4d733a3 100644
--- a/src/Runtime/Source/system/Qt3DSBezierEval.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSBezierEval.h
diff --git a/src/Runtime/Source/system/Qt3DSBoundingBox.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSBoundingBox.cpp
index 2a9331d1..2a9331d1 100644
--- a/src/Runtime/Source/system/Qt3DSBoundingBox.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSBoundingBox.cpp
diff --git a/src/Runtime/Source/system/Qt3DSBoundingBox.h b/src/Runtime/ogl-runtime/src/system/Qt3DSBoundingBox.h
index 988a9ba8..988a9ba8 100644
--- a/src/Runtime/Source/system/Qt3DSBoundingBox.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSBoundingBox.h
diff --git a/src/Runtime/Source/system/Qt3DSCircularArray.h b/src/Runtime/ogl-runtime/src/system/Qt3DSCircularArray.h
index be921673..be921673 100644
--- a/src/Runtime/Source/system/Qt3DSCircularArray.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSCircularArray.h
diff --git a/src/Runtime/Source/system/Qt3DSCircularArray.inl b/src/Runtime/ogl-runtime/src/system/Qt3DSCircularArray.inl
index 0d7f081f..0d7f081f 100644
--- a/src/Runtime/Source/system/Qt3DSCircularArray.inl
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSCircularArray.inl
diff --git a/src/Runtime/Source/system/Qt3DSColor.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSColor.cpp
index a44d488b..a44d488b 100644
--- a/src/Runtime/Source/system/Qt3DSColor.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSColor.cpp
diff --git a/src/Runtime/Source/system/Qt3DSColor.h b/src/Runtime/ogl-runtime/src/system/Qt3DSColor.h
index b917f46b..b917f46b 100644
--- a/src/Runtime/Source/system/Qt3DSColor.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSColor.h
diff --git a/src/Runtime/Source/system/Qt3DSConfig.h b/src/Runtime/ogl-runtime/src/system/Qt3DSConfig.h
index 49c644da..49c644da 100644
--- a/src/Runtime/Source/system/Qt3DSConfig.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSConfig.h
diff --git a/src/Runtime/Source/system/Qt3DSCubicRoots.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSCubicRoots.cpp
index ebcc54b8..ebcc54b8 100644
--- a/src/Runtime/Source/system/Qt3DSCubicRoots.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSCubicRoots.cpp
diff --git a/src/Runtime/Source/system/Qt3DSCubicRoots.h b/src/Runtime/ogl-runtime/src/system/Qt3DSCubicRoots.h
index b5ac0530..b5ac0530 100644
--- a/src/Runtime/Source/system/Qt3DSCubicRoots.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSCubicRoots.h
diff --git a/src/Runtime/Source/system/Qt3DSCubicRootsImpl.h b/src/Runtime/ogl-runtime/src/system/Qt3DSCubicRootsImpl.h
index 8cca59f9..8cca59f9 100644
--- a/src/Runtime/Source/system/Qt3DSCubicRootsImpl.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSCubicRootsImpl.h
diff --git a/src/Runtime/Source/system/Qt3DSDLLManager.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSDLLManager.cpp
index c6f6d80d..c6f6d80d 100644
--- a/src/Runtime/Source/system/Qt3DSDLLManager.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSDLLManager.cpp
diff --git a/src/Runtime/Source/system/Qt3DSDLLManager.h b/src/Runtime/ogl-runtime/src/system/Qt3DSDLLManager.h
index d670af2e..d670af2e 100644
--- a/src/Runtime/Source/system/Qt3DSDLLManager.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSDLLManager.h
diff --git a/src/Runtime/Source/system/Qt3DSDataLogger.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSDataLogger.cpp
index 2f45f012..2f45f012 100644
--- a/src/Runtime/Source/system/Qt3DSDataLogger.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSDataLogger.cpp
diff --git a/src/Runtime/Source/system/Qt3DSDataLogger.h b/src/Runtime/ogl-runtime/src/system/Qt3DSDataLogger.h
index b834edab..b834edab 100644
--- a/src/Runtime/Source/system/Qt3DSDataLogger.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSDataLogger.h
diff --git a/src/Runtime/Source/system/Qt3DSDataLogger.hpp b/src/Runtime/ogl-runtime/src/system/Qt3DSDataLogger.hpp
index 0900c4a4..0900c4a4 100644
--- a/src/Runtime/Source/system/Qt3DSDataLogger.hpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSDataLogger.hpp
diff --git a/src/Runtime/Source/system/Qt3DSDataLoggerEnums.h b/src/Runtime/ogl-runtime/src/system/Qt3DSDataLoggerEnums.h
index 27320e19..27320e19 100644
--- a/src/Runtime/Source/system/Qt3DSDataLoggerEnums.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSDataLoggerEnums.h
diff --git a/src/Runtime/Source/system/Qt3DSDataLoggerViewer.h b/src/Runtime/ogl-runtime/src/system/Qt3DSDataLoggerViewer.h
index 0eaf9f6a..0eaf9f6a 100644
--- a/src/Runtime/Source/system/Qt3DSDataLoggerViewer.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSDataLoggerViewer.h
diff --git a/src/Runtime/Source/system/Qt3DSEGLTimer.h b/src/Runtime/ogl-runtime/src/system/Qt3DSEGLTimer.h
index 4c9f4ce2..4c9f4ce2 100644
--- a/src/Runtime/Source/system/Qt3DSEGLTimer.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSEGLTimer.h
diff --git a/src/Runtime/Source/system/Qt3DSEndian.h b/src/Runtime/ogl-runtime/src/system/Qt3DSEndian.h
index f8913a72..f8913a72 100644
--- a/src/Runtime/Source/system/Qt3DSEndian.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSEndian.h
diff --git a/src/Runtime/Source/system/Qt3DSEulerAngles.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSEulerAngles.cpp
index 7c4364fc..7c4364fc 100644
--- a/src/Runtime/Source/system/Qt3DSEulerAngles.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSEulerAngles.cpp
diff --git a/src/Runtime/Source/system/Qt3DSEulerAngles.h b/src/Runtime/ogl-runtime/src/system/Qt3DSEulerAngles.h
index d0f53c56..d0f53c56 100644
--- a/src/Runtime/Source/system/Qt3DSEulerAngles.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSEulerAngles.h
diff --git a/src/Runtime/Source/system/Qt3DSFNDTimer.h b/src/Runtime/ogl-runtime/src/system/Qt3DSFNDTimer.h
index 8241e2ed..8241e2ed 100644
--- a/src/Runtime/Source/system/Qt3DSFNDTimer.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSFNDTimer.h
diff --git a/src/Runtime/Source/system/Qt3DSFile.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSFile.cpp
index a26b7351..a26b7351 100644
--- a/src/Runtime/Source/system/Qt3DSFile.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSFile.cpp
diff --git a/src/Runtime/Source/system/Qt3DSFile.h b/src/Runtime/ogl-runtime/src/system/Qt3DSFile.h
index e970cd2d..e970cd2d 100644
--- a/src/Runtime/Source/system/Qt3DSFile.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSFile.h
diff --git a/src/Runtime/Source/system/Qt3DSFileStream.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSFileStream.cpp
index 202e4ae7..202e4ae7 100644
--- a/src/Runtime/Source/system/Qt3DSFileStream.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSFileStream.cpp
diff --git a/src/Runtime/Source/system/Qt3DSFileStream.h b/src/Runtime/ogl-runtime/src/system/Qt3DSFileStream.h
index 49e272f4..49e272f4 100644
--- a/src/Runtime/Source/system/Qt3DSFileStream.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSFileStream.h
diff --git a/src/Runtime/Source/system/Qt3DSFixedArray.h b/src/Runtime/ogl-runtime/src/system/Qt3DSFixedArray.h
index 9f971d81..9f971d81 100644
--- a/src/Runtime/Source/system/Qt3DSFixedArray.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSFixedArray.h
diff --git a/src/Runtime/Source/system/Qt3DSFixedArray.inl b/src/Runtime/ogl-runtime/src/system/Qt3DSFixedArray.inl
index 55242243..55242243 100644
--- a/src/Runtime/Source/system/Qt3DSFixedArray.inl
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSFixedArray.inl
diff --git a/src/Runtime/Source/system/Qt3DSFunctionWrappers.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSFunctionWrappers.cpp
index e96c3ce1..e96c3ce1 100644
--- a/src/Runtime/Source/system/Qt3DSFunctionWrappers.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSFunctionWrappers.cpp
diff --git a/src/Runtime/Source/system/Qt3DSFunctionWrappers.h b/src/Runtime/ogl-runtime/src/system/Qt3DSFunctionWrappers.h
index 8fff62de..8fff62de 100644
--- a/src/Runtime/Source/system/Qt3DSFunctionWrappers.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSFunctionWrappers.h
diff --git a/src/Runtime/Source/system/Qt3DSHash.h b/src/Runtime/ogl-runtime/src/system/Qt3DSHash.h
index 8baa2dba..8baa2dba 100644
--- a/src/Runtime/Source/system/Qt3DSHash.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSHash.h
diff --git a/src/Runtime/Source/system/Qt3DSIFileStream.h b/src/Runtime/ogl-runtime/src/system/Qt3DSIFileStream.h
index 0b432601..0b432601 100644
--- a/src/Runtime/Source/system/Qt3DSIFileStream.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSIFileStream.h
diff --git a/src/Runtime/Source/system/Qt3DSIStream.h b/src/Runtime/ogl-runtime/src/system/Qt3DSIStream.h
index a4c11955..a4c11955 100644
--- a/src/Runtime/Source/system/Qt3DSIStream.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSIStream.h
diff --git a/src/Runtime/Source/system/Qt3DSITimer.h b/src/Runtime/ogl-runtime/src/system/Qt3DSITimer.h
index e73fbb95..e73fbb95 100644
--- a/src/Runtime/Source/system/Qt3DSITimer.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSITimer.h
diff --git a/src/Runtime/Source/system/Qt3DSMacros.h b/src/Runtime/ogl-runtime/src/system/Qt3DSMacros.h
index fbc40b4d..fbc40b4d 100644
--- a/src/Runtime/Source/system/Qt3DSMacros.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMacros.h
diff --git a/src/Runtime/Source/system/Qt3DSMatrix.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSMatrix.cpp
index b5310d0e..b5310d0e 100644
--- a/src/Runtime/Source/system/Qt3DSMatrix.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMatrix.cpp
diff --git a/src/Runtime/Source/system/Qt3DSMatrix.h b/src/Runtime/ogl-runtime/src/system/Qt3DSMatrix.h
index 4ef74420..4ef74420 100644
--- a/src/Runtime/Source/system/Qt3DSMatrix.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMatrix.h
diff --git a/src/Runtime/Source/system/Qt3DSMemory.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSMemory.cpp
index 17fa5c86..17fa5c86 100644
--- a/src/Runtime/Source/system/Qt3DSMemory.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemory.cpp
diff --git a/src/Runtime/Source/system/Qt3DSMemory.h b/src/Runtime/ogl-runtime/src/system/Qt3DSMemory.h
index cc04bf73..cc04bf73 100644
--- a/src/Runtime/Source/system/Qt3DSMemory.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemory.h
diff --git a/src/Runtime/Source/system/Qt3DSMemoryFilter.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryFilter.cpp
index f6d6591c..f6d6591c 100644
--- a/src/Runtime/Source/system/Qt3DSMemoryFilter.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryFilter.cpp
diff --git a/src/Runtime/Source/system/Qt3DSMemoryFilter.h b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryFilter.h
index df9367da..df9367da 100644
--- a/src/Runtime/Source/system/Qt3DSMemoryFilter.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryFilter.h
diff --git a/src/Runtime/Source/system/Qt3DSMemoryHeap.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryHeap.cpp
index 4ab36178..4ab36178 100644
--- a/src/Runtime/Source/system/Qt3DSMemoryHeap.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryHeap.cpp
diff --git a/src/Runtime/Source/system/Qt3DSMemoryHeap.h b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryHeap.h
index ba7c1306..ba7c1306 100644
--- a/src/Runtime/Source/system/Qt3DSMemoryHeap.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryHeap.h
diff --git a/src/Runtime/Source/system/Qt3DSMemoryManager.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryManager.cpp
index a1ace59e..a1ace59e 100644
--- a/src/Runtime/Source/system/Qt3DSMemoryManager.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryManager.cpp
diff --git a/src/Runtime/Source/system/Qt3DSMemoryManager.h b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryManager.h
index fa54fce7..fa54fce7 100644
--- a/src/Runtime/Source/system/Qt3DSMemoryManager.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryManager.h
diff --git a/src/Runtime/Source/system/Qt3DSMemoryPool.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryPool.cpp
index 44545d45..44545d45 100644
--- a/src/Runtime/Source/system/Qt3DSMemoryPool.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryPool.cpp
diff --git a/src/Runtime/Source/system/Qt3DSMemoryPool.h b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryPool.h
index 01b2e418..01b2e418 100644
--- a/src/Runtime/Source/system/Qt3DSMemoryPool.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryPool.h
diff --git a/src/Runtime/Source/system/Qt3DSMemoryProbe.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryProbe.cpp
index 4e977ee1..4e977ee1 100644
--- a/src/Runtime/Source/system/Qt3DSMemoryProbe.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryProbe.cpp
diff --git a/src/Runtime/Source/system/Qt3DSMemoryProbe.h b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryProbe.h
index 5f0844e8..5f0844e8 100644
--- a/src/Runtime/Source/system/Qt3DSMemoryProbe.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryProbe.h
diff --git a/src/Runtime/Source/system/Qt3DSMemorySettings.h b/src/Runtime/ogl-runtime/src/system/Qt3DSMemorySettings.h
index 54002424..54002424 100644
--- a/src/Runtime/Source/system/Qt3DSMemorySettings.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemorySettings.h
diff --git a/src/Runtime/Source/system/Qt3DSMemoryStatistics.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryStatistics.cpp
index 2f5eba0e..2f5eba0e 100644
--- a/src/Runtime/Source/system/Qt3DSMemoryStatistics.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryStatistics.cpp
diff --git a/src/Runtime/Source/system/Qt3DSMemoryStatistics.h b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryStatistics.h
index 81e30434..81e30434 100644
--- a/src/Runtime/Source/system/Qt3DSMemoryStatistics.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryStatistics.h
diff --git a/src/Runtime/Source/system/Qt3DSMemoryTracker.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryTracker.cpp
index 8aef9519..8aef9519 100644
--- a/src/Runtime/Source/system/Qt3DSMemoryTracker.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryTracker.cpp
diff --git a/src/Runtime/Source/system/Qt3DSMemoryTracker.h b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryTracker.h
index ee6ce699..ee6ce699 100644
--- a/src/Runtime/Source/system/Qt3DSMemoryTracker.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSMemoryTracker.h
diff --git a/src/Runtime/Source/system/Qt3DSPlatformSpecific.h b/src/Runtime/ogl-runtime/src/system/Qt3DSPlatformSpecific.h
index 3fc34016..3fc34016 100644
--- a/src/Runtime/Source/system/Qt3DSPlatformSpecific.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSPlatformSpecific.h
diff --git a/src/Runtime/Source/system/Qt3DSTimer.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSTimer.cpp
index d9e82eb9..d9e82eb9 100644
--- a/src/Runtime/Source/system/Qt3DSTimer.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSTimer.cpp
diff --git a/src/Runtime/Source/system/Qt3DSTimer.h b/src/Runtime/ogl-runtime/src/system/Qt3DSTimer.h
index 278bd4b4..278bd4b4 100644
--- a/src/Runtime/Source/system/Qt3DSTimer.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSTimer.h
diff --git a/src/Runtime/Source/system/Qt3DSTypes.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSTypes.cpp
index 25d41c8b..25d41c8b 100644
--- a/src/Runtime/Source/system/Qt3DSTypes.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSTypes.cpp
diff --git a/src/Runtime/Source/system/Qt3DSTypes.h b/src/Runtime/ogl-runtime/src/system/Qt3DSTypes.h
index 65d57da8..65d57da8 100644
--- a/src/Runtime/Source/system/Qt3DSTypes.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSTypes.h
diff --git a/src/Runtime/Source/system/Qt3DSVector3.cpp b/src/Runtime/ogl-runtime/src/system/Qt3DSVector3.cpp
index 2d790f95..2d790f95 100644
--- a/src/Runtime/Source/system/Qt3DSVector3.cpp
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSVector3.cpp
diff --git a/src/Runtime/Source/system/Qt3DSVector3.h b/src/Runtime/ogl-runtime/src/system/Qt3DSVector3.h
index 08df028b..08df028b 100644
--- a/src/Runtime/Source/system/Qt3DSVector3.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSVector3.h
diff --git a/src/Runtime/Source/system/SystemPrefix.h b/src/Runtime/ogl-runtime/src/system/SystemPrefix.h
index aa1ba185..aa1ba185 100644
--- a/src/Runtime/Source/system/SystemPrefix.h
+++ b/src/Runtime/ogl-runtime/src/system/SystemPrefix.h
diff --git a/src/Runtime/Source/uipparser/Qt3DSIPresentation.h b/src/Runtime/ogl-runtime/src/uipparser/Qt3DSIPresentation.h
index a9d36446..a9d36446 100644
--- a/src/Runtime/Source/uipparser/Qt3DSIPresentation.h
+++ b/src/Runtime/ogl-runtime/src/uipparser/Qt3DSIPresentation.h
diff --git a/src/Runtime/Source/uipparser/Qt3DSUIPParser.h b/src/Runtime/ogl-runtime/src/uipparser/Qt3DSUIPParser.h
index c3b4611b..c3b4611b 100644
--- a/src/Runtime/Source/uipparser/Qt3DSUIPParser.h
+++ b/src/Runtime/ogl-runtime/src/uipparser/Qt3DSUIPParser.h
diff --git a/src/Runtime/Source/uipparser/Qt3DSUIPParserActionHelper.cpp b/src/Runtime/ogl-runtime/src/uipparser/Qt3DSUIPParserActionHelper.cpp
index ab6d751d..ab6d751d 100644
--- a/src/Runtime/Source/uipparser/Qt3DSUIPParserActionHelper.cpp
+++ b/src/Runtime/ogl-runtime/src/uipparser/Qt3DSUIPParserActionHelper.cpp
diff --git a/src/Runtime/Source/uipparser/Qt3DSUIPParserActionHelper.h b/src/Runtime/ogl-runtime/src/uipparser/Qt3DSUIPParserActionHelper.h
index 3d9d44ce..3d9d44ce 100644
--- a/src/Runtime/Source/uipparser/Qt3DSUIPParserActionHelper.h
+++ b/src/Runtime/ogl-runtime/src/uipparser/Qt3DSUIPParserActionHelper.h
diff --git a/src/Runtime/Source/uipparser/Qt3DSUIPParserImpl.cpp b/src/Runtime/ogl-runtime/src/uipparser/Qt3DSUIPParserImpl.cpp
index 9f7641b0..9f7641b0 100644
--- a/src/Runtime/Source/uipparser/Qt3DSUIPParserImpl.cpp
+++ b/src/Runtime/ogl-runtime/src/uipparser/Qt3DSUIPParserImpl.cpp
diff --git a/src/Runtime/Source/uipparser/Qt3DSUIPParserImpl.h b/src/Runtime/ogl-runtime/src/uipparser/Qt3DSUIPParserImpl.h
index 585dd857..585dd857 100644
--- a/src/Runtime/Source/uipparser/Qt3DSUIPParserImpl.h
+++ b/src/Runtime/ogl-runtime/src/uipparser/Qt3DSUIPParserImpl.h
diff --git a/src/Runtime/Source/uipparser/Qt3DSUIPParserObjectRefHelper.cpp b/src/Runtime/ogl-runtime/src/uipparser/Qt3DSUIPParserObjectRefHelper.cpp
index 19af2a9d..19af2a9d 100644
--- a/src/Runtime/Source/uipparser/Qt3DSUIPParserObjectRefHelper.cpp
+++ b/src/Runtime/ogl-runtime/src/uipparser/Qt3DSUIPParserObjectRefHelper.cpp
diff --git a/src/Runtime/Source/uipparser/Qt3DSUIPParserObjectRefHelper.h b/src/Runtime/ogl-runtime/src/uipparser/Qt3DSUIPParserObjectRefHelper.h
index fcd16985..fcd16985 100644
--- a/src/Runtime/Source/uipparser/Qt3DSUIPParserObjectRefHelper.h
+++ b/src/Runtime/ogl-runtime/src/uipparser/Qt3DSUIPParserObjectRefHelper.h
diff --git a/src/Runtime/Source/viewer/Qt3DSAudioPlayerImpl.cpp b/src/Runtime/ogl-runtime/src/viewer/Qt3DSAudioPlayerImpl.cpp
index b9fb9763..b9fb9763 100644
--- a/src/Runtime/Source/viewer/Qt3DSAudioPlayerImpl.cpp
+++ b/src/Runtime/ogl-runtime/src/viewer/Qt3DSAudioPlayerImpl.cpp
diff --git a/src/Runtime/Source/viewer/Qt3DSAudioPlayerImpl.h b/src/Runtime/ogl-runtime/src/viewer/Qt3DSAudioPlayerImpl.h
index bba5bd6a..bba5bd6a 100644
--- a/src/Runtime/Source/viewer/Qt3DSAudioPlayerImpl.h
+++ b/src/Runtime/ogl-runtime/src/viewer/Qt3DSAudioPlayerImpl.h
diff --git a/src/Runtime/Source/viewer/Qt3DSViewerApp.cpp b/src/Runtime/ogl-runtime/src/viewer/Qt3DSViewerApp.cpp
index 094f140f..094f140f 100644
--- a/src/Runtime/Source/viewer/Qt3DSViewerApp.cpp
+++ b/src/Runtime/ogl-runtime/src/viewer/Qt3DSViewerApp.cpp
diff --git a/src/Runtime/Source/viewer/Qt3DSViewerApp.h b/src/Runtime/ogl-runtime/src/viewer/Qt3DSViewerApp.h
index 975e3b12..975e3b12 100644
--- a/src/Runtime/Source/viewer/Qt3DSViewerApp.h
+++ b/src/Runtime/ogl-runtime/src/viewer/Qt3DSViewerApp.h
diff --git a/src/Runtime/Source/viewer/Qt3DSViewerTimer.h b/src/Runtime/ogl-runtime/src/viewer/Qt3DSViewerTimer.h
index de679ce9..de679ce9 100644
--- a/src/Runtime/Source/viewer/Qt3DSViewerTimer.h
+++ b/src/Runtime/ogl-runtime/src/viewer/Qt3DSViewerTimer.h
diff --git a/src/Runtime/Source/viewer/qt3dsruntimeglobal.h b/src/Runtime/ogl-runtime/src/viewer/qt3dsruntimeglobal.h
index 6732c85d..6732c85d 100644
--- a/src/Runtime/Source/viewer/qt3dsruntimeglobal.h
+++ b/src/Runtime/ogl-runtime/src/viewer/qt3dsruntimeglobal.h
diff --git a/src/Runtime/testres.qrc b/src/Runtime/ogl-runtime/testres.qrc
index 7b3c20bc..7b3c20bc 100644
--- a/src/Runtime/testres.qrc
+++ b/src/Runtime/ogl-runtime/testres.qrc
diff --git a/src/Runtime/AttributeHashes/AttributeHashes.cpp b/src/Runtime/ogl-runtime/tools/attributehashes/AttributeHashes.cpp
index 47d33ac7..b72b0b02 100644
--- a/src/Runtime/AttributeHashes/AttributeHashes.cpp
+++ b/src/Runtime/ogl-runtime/tools/attributehashes/AttributeHashes.cpp
@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
     std::ifstream theText(g_Text);
     if (!theText) {
         fprintf(stderr, "Failed: Could not input text file, set working directory to "
-                        "src\\Runtime\\Source\\runtime and try again.\n");
+                        "src\\Runtime\\ogl-runtime\\src\\runtime and try again.\n");
         return -1;
     }
 
diff --git a/src/Runtime/AttributeHashes/AttributeHashes.pro b/src/Runtime/ogl-runtime/tools/attributehashes/attributehashes.pro
index 3be119d7..986084e0 100644
--- a/src/Runtime/AttributeHashes/AttributeHashes.pro
+++ b/src/Runtime/ogl-runtime/tools/attributehashes/attributehashes.pro
@@ -7,7 +7,7 @@ LIBS += \
     -lws2_32
 }
 
-include(../commoninclude.pri)
+include(../../commoninclude.pri)
 
 SOURCES += AttributeHashes.cpp
 
diff --git a/src/Viewer/Viewer.pro b/src/Runtime/ogl-runtime/tools/tools.pro
index 736f0dc3..7c62eaea 100644
--- a/src/Viewer/Viewer.pro
+++ b/src/Runtime/ogl-runtime/tools/tools.pro
@@ -2,5 +2,9 @@ TEMPLATE = subdirs
 CONFIG += ordered
 
 !boot2qt:!integrity:!qnx {
-    SUBDIRS += Qt3DViewer
+    SUBDIRS += viewer
+}
+
+win32 {
+    SUBDIRS += attributehashes
 }
diff --git a/src/Viewer/Qt3DViewer/Viewer.qrc b/src/Runtime/ogl-runtime/tools/viewer/Viewer.qrc
index c808dca5..c808dca5 100644
--- a/src/Viewer/Qt3DViewer/Viewer.qrc
+++ b/src/Runtime/ogl-runtime/tools/viewer/Viewer.qrc
diff --git a/src/Viewer/Qt3DViewer/android/AndroidManifest.xml b/src/Runtime/ogl-runtime/tools/viewer/android/AndroidManifest.xml
index 3697a9a7..3697a9a7 100644
--- a/src/Viewer/Qt3DViewer/android/AndroidManifest.xml
+++ b/src/Runtime/ogl-runtime/tools/viewer/android/AndroidManifest.xml
diff --git a/src/Viewer/Qt3DViewer/main.cpp b/src/Runtime/ogl-runtime/tools/viewer/main.cpp
index 12abd3b2..12abd3b2 100644
--- a/src/Viewer/Qt3DViewer/main.cpp
+++ b/src/Runtime/ogl-runtime/tools/viewer/main.cpp
diff --git a/src/Viewer/Qt3DViewer/qml/StyledButton.qml b/src/Runtime/ogl-runtime/tools/viewer/qml/StyledButton.qml
index 400179de..400179de 100644
--- a/src/Viewer/Qt3DViewer/qml/StyledButton.qml
+++ b/src/Runtime/ogl-runtime/tools/viewer/qml/StyledButton.qml
diff --git a/src/Viewer/Qt3DViewer/qml/StyledMenu.qml b/src/Runtime/ogl-runtime/tools/viewer/qml/StyledMenu.qml
index 6275dbc6..6275dbc6 100644
--- a/src/Viewer/Qt3DViewer/qml/StyledMenu.qml
+++ b/src/Runtime/ogl-runtime/tools/viewer/qml/StyledMenu.qml
diff --git a/src/Viewer/Qt3DViewer/qml/StyledMenuButton.qml b/src/Runtime/ogl-runtime/tools/viewer/qml/StyledMenuButton.qml
index b5290c3d..b5290c3d 100644
--- a/src/Viewer/Qt3DViewer/qml/StyledMenuButton.qml
+++ b/src/Runtime/ogl-runtime/tools/viewer/qml/StyledMenuButton.qml
diff --git a/src/Viewer/Qt3DViewer/qml/StyledMenuItem.qml b/src/Runtime/ogl-runtime/tools/viewer/qml/StyledMenuItem.qml
index 79049a90..79049a90 100644
--- a/src/Viewer/Qt3DViewer/qml/StyledMenuItem.qml
+++ b/src/Runtime/ogl-runtime/tools/viewer/qml/StyledMenuItem.qml
diff --git a/src/Viewer/Qt3DViewer/qml/StyledMenuSeparator.qml b/src/Runtime/ogl-runtime/tools/viewer/qml/StyledMenuSeparator.qml
index 344d6678..344d6678 100644
--- a/src/Viewer/Qt3DViewer/qml/StyledMenuSeparator.qml
+++ b/src/Runtime/ogl-runtime/tools/viewer/qml/StyledMenuSeparator.qml
diff --git a/src/Viewer/Qt3DViewer/qml/main.qml b/src/Runtime/ogl-runtime/tools/viewer/qml/main.qml
index 1357f396..1357f396 100644
--- a/src/Viewer/Qt3DViewer/qml/main.qml
+++ b/src/Runtime/ogl-runtime/tools/viewer/qml/main.qml
diff --git a/src/Viewer/Qt3DViewer/remotedeploymentreceiver.cpp b/src/Runtime/ogl-runtime/tools/viewer/remotedeploymentreceiver.cpp
index cdfa5b05..cdfa5b05 100644
--- a/src/Viewer/Qt3DViewer/remotedeploymentreceiver.cpp
+++ b/src/Runtime/ogl-runtime/tools/viewer/remotedeploymentreceiver.cpp
diff --git a/src/Viewer/Qt3DViewer/remotedeploymentreceiver.h b/src/Runtime/ogl-runtime/tools/viewer/remotedeploymentreceiver.h
index 49f7de3f..49f7de3f 100644
--- a/src/Viewer/Qt3DViewer/remotedeploymentreceiver.h
+++ b/src/Runtime/ogl-runtime/tools/viewer/remotedeploymentreceiver.h
diff --git a/src/Viewer/Qt3DViewer/resources/images/3D-studio-viewer.ico b/src/Runtime/ogl-runtime/tools/viewer/resources/images/3D-studio-viewer.ico
index c15cd68a..c15cd68a 100644
--- a/src/Viewer/Qt3DViewer/resources/images/3D-studio-viewer.ico
+++ b/src/Runtime/ogl-runtime/tools/viewer/resources/images/3D-studio-viewer.ico
diff --git a/src/Viewer/Qt3DViewer/resources/images/3D-studio-viewer.svg b/src/Runtime/ogl-runtime/tools/viewer/resources/images/3D-studio-viewer.svg
index 69a14f48..69a14f48 100644
--- a/src/Viewer/Qt3DViewer/resources/images/3D-studio-viewer.svg
+++ b/src/Runtime/ogl-runtime/tools/viewer/resources/images/3D-studio-viewer.svg
diff --git a/src/Viewer/Qt3DViewer/resources/images/arrow.png b/src/Runtime/ogl-runtime/tools/viewer/resources/images/arrow.png
index 40ebda88..40ebda88 100644
--- a/src/Viewer/Qt3DViewer/resources/images/arrow.png
+++ b/src/Runtime/ogl-runtime/tools/viewer/resources/images/arrow.png
diff --git a/src/Viewer/Qt3DViewer/resources/images/arrow@2x.png b/src/Runtime/ogl-runtime/tools/viewer/resources/images/arrow@2x.png
index 1a21ee06..1a21ee06 100644
--- a/src/Viewer/Qt3DViewer/resources/images/arrow@2x.png
+++ b/src/Runtime/ogl-runtime/tools/viewer/resources/images/arrow@2x.png
diff --git a/src/Viewer/Qt3DViewer/resources/images/check.png b/src/Runtime/ogl-runtime/tools/viewer/resources/images/check.png
index 5c1ef70a..5c1ef70a 100644
--- a/src/Viewer/Qt3DViewer/resources/images/check.png
+++ b/src/Runtime/ogl-runtime/tools/viewer/resources/images/check.png
diff --git a/src/Viewer/Qt3DViewer/resources/images/check@2x.png b/src/Runtime/ogl-runtime/tools/viewer/resources/images/check@2x.png
index ed730bfe..ed730bfe 100644
--- a/src/Viewer/Qt3DViewer/resources/images/check@2x.png
+++ b/src/Runtime/ogl-runtime/tools/viewer/resources/images/check@2x.png
diff --git a/src/Viewer/Qt3DViewer/resources/images/viewer.icns b/src/Runtime/ogl-runtime/tools/viewer/resources/images/viewer.icns
index b718d75c..b718d75c 100644
--- a/src/Viewer/Qt3DViewer/resources/images/viewer.icns
+++ b/src/Runtime/ogl-runtime/tools/viewer/resources/images/viewer.icns
diff --git a/src/Viewer/Qt3DViewer/viewer.cpp b/src/Runtime/ogl-runtime/tools/viewer/viewer.cpp
index bb6af59f..bb6af59f 100644
--- a/src/Viewer/Qt3DViewer/viewer.cpp
+++ b/src/Runtime/ogl-runtime/tools/viewer/viewer.cpp
diff --git a/src/Viewer/Qt3DViewer/viewer.h b/src/Runtime/ogl-runtime/tools/viewer/viewer.h
index 1ce514ad..1ce514ad 100644
--- a/src/Viewer/Qt3DViewer/viewer.h
+++ b/src/Runtime/ogl-runtime/tools/viewer/viewer.h
diff --git a/src/Runtime/ogl-runtime/tools/viewer/viewer.pro b/src/Runtime/ogl-runtime/tools/viewer/viewer.pro
new file mode 100644
index 00000000..cad56640
--- /dev/null
+++ b/src/Runtime/ogl-runtime/tools/viewer/viewer.pro
@@ -0,0 +1,49 @@
+include($$PWD/../../commoninclude.pri)
+
+TEMPLATE = app
+TARGET = Qt3DViewer
+QT += qml quickcontrols2 studio3d-private
+
+INCLUDEPATH += $$PWD/../../src/api/studio3dqml
+INCLUDEPATH += $$PWD/../../src/api/studio3d
+
+RESOURCES += Viewer.qrc
+RC_ICONS = resources/images/3D-studio-viewer.ico
+
+ICON = resources/images/viewer.icns
+
+SOURCES += \
+    $$PWD/../../src/api/studio3dqml/q3dsstudio3d.cpp \
+    $$PWD/../../src/api/studio3dqml/q3dsrenderer.cpp \
+    $$PWD/../../src/api/studio3dqml/q3dspresentationitem.cpp \
+    main.cpp \
+    viewer.cpp \
+    remotedeploymentreceiver.cpp
+
+HEADERS += \
+    $$PWD/../../src/api/studio3dqml/q3dsstudio3d_p.h \
+    $$PWD/../../src/api/studio3dqml/q3dsrenderer_p.h \
+    $$PWD/../../src/api/studio3dqml/q3dspresentationitem_p.h \
+    viewer.h \
+    remotedeploymentreceiver.h
+
+android: {
+SOURCES += \
+    $$PWD/../../src/api/studio3d/q3dsviewersettings.cpp \
+    $$PWD/../../src/api/studio3d/q3dspresentation.cpp \
+    $$PWD/../../src/api/studio3d/q3dsdatainput.cpp
+
+HEADERS += \
+    $$PWD/../../src/api/studio3d/q3dsviewersettings.h \
+    $$PWD/../../src/api/studio3d/q3dspresentation.h \
+    $$PWD/../../src/api/studio3d/q3dsdatainput.h
+}
+
+LIBS += \
+    -lqt3dsopengl$$qtPlatformTargetSuffix() \
+    -lqt3dsqmlstreamer$$qtPlatformTargetSuffix()
+
+macos:QMAKE_RPATHDIR += @executable_path/../../../../lib
+
+target.path = $$[QT_INSTALL_BINS]
+INSTALLS += target
diff --git a/src/Runtime/ogl-runtime/utils.pri b/src/Runtime/ogl-runtime/utils.pri
new file mode 100644
index 00000000..8d56baa4
--- /dev/null
+++ b/src/Runtime/ogl-runtime/utils.pri
@@ -0,0 +1,8 @@
+# Add our static libs to target dependencies so we detect changes to them
+defineReplace(fixLibPredeps) {
+    # TODO Needs something more clever once debug libs are correctly suffixed
+    for(lib, $${2}) {
+        PREDEPS *= $${1}/$${QMAKE_PREFIX_STATICLIB}$${lib}$$qtPlatformTargetSuffix().$${QMAKE_EXTENSION_STATICLIB}
+    }
+    return($$PREDEPS)
+}
diff --git a/src/Viewer/Qt3DViewer/Qt3DViewer.pro b/src/Viewer/Qt3DViewer/Qt3DViewer.pro
deleted file mode 100644
index 25345d3c..00000000
--- a/src/Viewer/Qt3DViewer/Qt3DViewer.pro
+++ /dev/null
@@ -1,49 +0,0 @@
-include($$PWD/../../Runtime/commoninclude.pri)
-
-TEMPLATE = app
-TARGET = Qt3DViewer
-QT += qml quickcontrols2 studio3d-private
-
-INCLUDEPATH += $$PWD/../../Runtime/api/studio3dqml
-INCLUDEPATH += $$PWD/../../Runtime/api/studio3d
-
-RESOURCES += Viewer.qrc
-RC_ICONS = resources/images/3D-studio-viewer.ico
-
-ICON = resources/images/viewer.icns
-
-SOURCES += \
-    $$PWD/../../Runtime/api/studio3dqml/q3dsstudio3d.cpp \
-    $$PWD/../../Runtime/api/studio3dqml/q3dsrenderer.cpp \
-    $$PWD/../../Runtime/api/studio3dqml/q3dspresentationitem.cpp \
-    main.cpp \
-    viewer.cpp \
-    remotedeploymentreceiver.cpp
-
-HEADERS += \
-    $$PWD/../../Runtime/api/studio3dqml/q3dsstudio3d_p.h \
-    $$PWD/../../Runtime/api/studio3dqml/q3dsrenderer_p.h \
-    $$PWD/../../Runtime/api/studio3dqml/q3dspresentationitem_p.h \
-    viewer.h \
-    remotedeploymentreceiver.h
-
-android: {
-SOURCES += \
-    $$PWD/../../Runtime/api/studio3d/q3dsviewersettings.cpp \
-    $$PWD/../../Runtime/api/studio3d/q3dspresentation.cpp \
-    $$PWD/../../Runtime/api/studio3d/q3dsdatainput.cpp
-
-HEADERS += \
-    $$PWD/../../Runtime/api/studio3d/q3dsviewersettings.h \
-    $$PWD/../../Runtime/api/studio3d/q3dspresentation.h \
-    $$PWD/../../Runtime/api/studio3d/q3dsdatainput.h
-}
-
-LIBS += \
-    -lqt3dsopengl$$qtPlatformTargetSuffix() \
-    -lqt3dsqmlstreamer$$qtPlatformTargetSuffix()
-
-macos:QMAKE_RPATHDIR += @executable_path/../../../../lib
-
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
diff --git a/src/commonplatform.pri b/src/commonplatform.pri
index cec9d152..28ceff7a 100644
--- a/src/commonplatform.pri
+++ b/src/commonplatform.pri
@@ -28,7 +28,7 @@ integrity: {
     DEFINES += _INTEGRITYPLATFORM
 }
 
-INCLUDEPATH += $$PWD/Runtime/Source/platformspecific/$$PlatformSpecificDir
+INCLUDEPATH += $$PWD/Runtime/ogl-runtime/src/platformspecific/$$PlatformSpecificDir
 
 THIRDPARTY_DIR = $$(QT3DSTUDIO_3RDPARTY_DIR)
 isEmpty(THIRDPARTY_DIR) {
diff --git a/src/src.pro b/src/src.pro
index b17d1d0e..836a3c96 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -2,9 +2,7 @@ TEMPLATE = subdirs
 CONFIG += ordered
 SUBDIRS += \
     3rdparty \
-    QtExtras \
     Runtime \
-    Viewer \
     shared
 
 !cross_compile:!qnx:!mingw {
diff --git a/sync.profile b/sync.profile
index f58c0325..ac018a40 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,5 +1,5 @@
 %modules = ( # path to module name map
-    "QtStudio3D" => "$basedir/src/Runtime/api/studio3d",
+    "QtStudio3D" => "$basedir/src/Runtime/ogl-runtime/src/api/studio3d",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
diff --git a/tests/auto/qtextras/qt3dsqmlstream/qt3dsqmlstream.pro b/tests/auto/qtextras/qt3dsqmlstream/qt3dsqmlstream.pro
index 6e180f80..1ca4f737 100644
--- a/tests/auto/qtextras/qt3dsqmlstream/qt3dsqmlstream.pro
+++ b/tests/auto/qtextras/qt3dsqmlstream/qt3dsqmlstream.pro
@@ -9,7 +9,7 @@ QT += testlib quick
 SOURCES += tst_qt3dsqmlstream.cpp
 
 INCLUDEPATH += \
-    $$PWD/../../../../src/QtExtras/qmlstreamer
+    $$PWD/../../../../src/Runtime/ogl-runtime/src/qmlstreamer
 
 LIBS += \
     -lqt3dsqmlstreamer$$qtPlatformTargetSuffix()
diff --git a/tests/auto/runtime/runtime.pro b/tests/auto/runtime/runtime.pro
index d64161d1..8f4451ed 100644
--- a/tests/auto/runtime/runtime.pro
+++ b/tests/auto/runtime/runtime.pro
@@ -10,7 +10,7 @@ RESOURCES += \
     $$PWD/../../../src/Runtime/platformres.qrc
 
 INCLUDEPATH += \
-    $$PWD/../../../src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl
+    $$PWD/../../../src/Runtime/ogl-runtime/src/Qt3DSRuntimeRender/RendererImpl
 
 HEADERS += \
     base/Qt3DSRenderTestAtomicCounterBuffer.h \