1030 files changed, 3831 insertions, 6133 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/doc/src/03-studio/1-toolbar.qdoc b/doc/src/03-studio/1-toolbar.qdoc
index 8357cc63..df59f339 100644
--- a/doc/src/03-studio/1-toolbar.qdoc
+++ b/doc/src/03-studio/1-toolbar.qdoc
@@ -240,16 +240,20 @@ palette.
 The preview toolbar buttons are used to preview your presentation.
 \list
   \li
-  The \b{Preview} button (keyboard shortcut: \c{F5})
-  will launch the Qt 3D Studio Viewer application and preview the
+  The \b{Filter Variants} button (keyboard shortcut: \c{F7}) will open the variant tags panel.
+  Read more in the \l{Using Variant Tags} section.
+  \li
+  The \b{Preview with OpenGL Runtime} button (keyboard shortcut: \c{F5})
+  will launch the OpenGL Runtime Viewer application and preview the
   application for the presentation.
   \li
   The \b{Remote Preview} button (keyboard shortcut: \c{F6})will launch the presentation on the
   connected remote device Qt 3D Studio Viewer application. This button is only enabled if you are
   connected to a remote device.
   \li
-  The \b{Filter Variants} button (keyboard shortcut: \c{F7}) will open the variant tags panel.
-  Read more in the \l{Using Variant Tags} section.
+  The \b{Preview with Qt 3D Runtime} button
+  will launch the Qt 3D Runtime Viewer application and preview the
+  application for the presentation.
 \endlist
 
 \note If there is no \c{.uia} file in the folder for the presentation, then the
diff --git a/doc/src/images/Studio-Toolbar-Preview.png b/doc/src/images/Studio-Toolbar-Preview.png
index d70d0e08..5d2c116f 100644
--- a/doc/src/images/Studio-Toolbar-Preview.png
+++ b/doc/src/images/Studio-Toolbar-Preview.png
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/3rdparty/utf8cpp/2.3.2/doc/ReleaseNotes b/src/3rdparty/utf8cpp/2.3.2/doc/ReleaseNotes
deleted file mode 100644
index 15a4ae81..00000000
--- a/src/3rdparty/utf8cpp/2.3.2/doc/ReleaseNotes
+++ /dev/null
@@ -1,11 +0,0 @@
-utf8 cpp library
-Release 2.3.2
-
-A bug fix release plus minor performance improvements. Thanks to all who reported bugs. 
-
-Changes from version 2.3.1
-- Bug fix [3506114]: potential crash in replace_invalid
-- Bug fix [3426789]: documentation typo
-- Bug fix [3215839]: name clash with std::next
-
-Files included in the release: utf8.h, core.h, checked.h, unchecked.h, utf8cpp.html, ReleaseNotes
diff --git a/src/3rdparty/utf8cpp/2.3.2/doc/utf8cpp.html b/src/3rdparty/utf8cpp/2.3.2/doc/utf8cpp.html
deleted file mode 100644
index 06849b1d..00000000
--- a/src/3rdparty/utf8cpp/2.3.2/doc/utf8cpp.html
+++ /dev/null
@@ -1,1795 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Linux/x86 (vers 1st November 2002), see www.w3.org">
-    <meta name="description" content=
-    "A simple, portable and lightweigt C++ library for easy handling of UTF-8 encoded strings">
-    <meta name="keywords" content="UTF-8 C++ portable utf8 unicode generic templates">
-    <meta name="author" content="Nemanja Trifunovic">
-    <title>
-      UTF8-CPP: UTF-8 with C++ in a Portable Way
-    </title>
-    <style type="text/css">
-    <!--
-    span.return_value {
-      color: brown;
-    }
-    span.keyword {
-      color: blue;
-    }
-    span.preprocessor {
-      color: navy;
-    }
-    span.literal {
-      color: olive;
-    }
-    span.comment {
-      color: green;
-    }
-    code {
-      font-weight: bold; 
-    }
-    ul.toc {
-      list-style-type: none;
-    }
-    p.version {
-      font-size: small;
-      font-style: italic;
-    }
-    -->
-        </style>
-  </head>
-  <body>
-    <h1>
-      UTF8-CPP: UTF-8 with C++ in a Portable Way
-    </h1>
-    <p>
-      <a href="https://sourceforge.net/projects/utfcpp">The Sourceforge project page</a>
-    </p>
-    <div id="toc">
-      <h2>
-        Table of Contents
-      </h2>
-      <ul class="toc">
-        <li>
-          <a href="#introduction">Introduction</a>
-        </li>
-        <li>
-          <a href="#examples">Examples of Use</a>
-          <ul class="toc">
-            <li>
-              <a href=#introsample>Introductionary Sample </a>
-            </li>
-            <li>
-              <a href=#validfile>Checking if a file contains valid UTF-8 text</a>
-            </li>
-            <li>
-              <a href=#fixinvalid>Ensure that a string contains valid UTF-8 text</a>
-            </li>
-          </ul>
-        <li>
-          <a href="#reference">Reference</a>
-          <ul class="toc">
-            <li>
-              <a href="#funutf8">Functions From utf8 Namespace </a>
-            </li>
-            <li>
-              <a href="#typesutf8">Types From utf8 Namespace </a>
-            </li>
-            <li>
-              <a href="#fununchecked">Functions From utf8::unchecked Namespace </a>
-            </li>
-            <li>
-              <a href="#typesunchecked">Types From utf8::unchecked Namespace </a>
-            </li>
-          </ul>
-        </li>
-        <li>
-          <a href="#points">Points of Interest</a>
-        </li>
-        <li>
-          <a href="#conclusion">Conclusion</a>
-        </li>
-        <li>
-          <a href="#links">Links</a>
-        </li>
-      </ul>
-    </div>
-    <h2 id="introduction">
-      Introduction
-    </h2>
-    <p>
-      Many C++ developers miss an easy and portable way of handling Unicode encoded
-      strings. The original C++ Standard (known as C++98 or C++03) is Unicode agnostic,
-      and while some work is being done to introduce Unicode to the next incarnation
-      called C++0x, for the moment nothing of the sort is available. In the meantime,
-      developers use third party libraries like ICU, OS specific capabilities, or simply
-      roll out their own solutions.
-    </p>
-    <p>
-      In order to easily handle UTF-8 encoded Unicode strings, I came up with a small
-      generic library. For anybody used to work with STL algorithms and iterators, it should be
-      easy and natural to use. The code is freely available for any purpose - check out
-      the license at the beginning of the utf8.h file. If you run into
-      bugs or performance issues, please let me know and I'll do my best to address them.
-    </p>
-    <p>
-      The purpose of this article is not to offer an introduction to Unicode in general,
-      and UTF-8 in particular. If you are not familiar with Unicode, be sure to check out
-      <a href="http://www.unicode.org/">Unicode Home Page</a> or some other source of
-      information for Unicode. Also, it is not my aim to advocate the use of UTF-8
-      encoded strings in C++ programs; if you want to handle UTF-8 encoded strings from
-      C++, I am sure you have good reasons for it.
-    </p>
-    <h2 id="examples">
-      Examples of use
-    </h2>
-    <h3 id="introsample">
-      Introductionary Sample
-    </h3>
-    <p>
-      To illustrate the use of the library, let's start with a small but complete program 
-      that opens a file containing UTF-8 encoded text, reads it line by line, checks each line
-      for invalid UTF-8 byte sequences, and converts it to UTF-16 encoding and back to UTF-8:
-    </p>
-<pre>
-<span class="preprocessor">#include &lt;fstream&gt;</span>
-<span class="preprocessor">#include &lt;iostream&gt;</span>
-<span class="preprocessor">#include &lt;string&gt;</span>
-<span class="preprocessor">#include &lt;vector&gt;</span>
-<span class="preprocessor">#include "utf8.h"</span>
-<span class="keyword">using namespace</span> std;
-<span class="keyword">int</span> main(<span class="keyword">int</span> argc, <span class="keyword">char</span>** argv)
-{
-    <span class="keyword">if</span> (argc != <span class="literal">2</span>) {
-        cout &lt;&lt; <span class="literal">"\nUsage: docsample filename\n"</span>;
-        <span class="keyword">return</span> <span class="literal">0</span>;
-    }
-
-    <span class="keyword">const char</span>* test_file_path = argv[1];
-    <span class="comment">// Open the test file (contains UTF-8 encoded text)</span>
-    ifstream fs8(test_file_path);
-    <span class="keyword">if</span> (!fs8.is_open()) {
-    cout &lt;&lt; <span class=
-"literal">"Could not open "</span> &lt;&lt; test_file_path &lt;&lt; endl;
-    <span class="keyword">return</span> <span class="literal">0</span>;
-    }
-
-    <span class="keyword">unsigned</span> line_count = <span class="literal">1</span>;
-    string line;
-    <span class="comment">// Play with all the lines in the file</span>
-    <span class="keyword">while</span> (getline(fs8, line)) {
-       <span class="comment">// check for invalid utf-8 (for a simple yes/no check, there is also utf8::is_valid function)</span>
-        string::iterator end_it = utf8::find_invalid(line.begin(), line.end());
-        <span class="keyword">if</span> (end_it != line.end()) {
-            cout &lt;&lt; <span class=
-"literal">"Invalid UTF-8 encoding detected at line "</span> &lt;&lt; line_count &lt;&lt; <span
- class="literal">"\n"</span>;
-            cout &lt;&lt; <span class=
-"literal">"This part is fine: "</span> &lt;&lt; string(line.begin(), end_it) &lt;&lt; <span
- class="literal">"\n"</span>;
-        }
-
-        <span class="comment">// Get the line length (at least for the valid part)</span>
-        <span class="keyword">int</span> length = utf8::distance(line.begin(), end_it);
-        cout &lt;&lt; <span class=
-"literal">"Length of line "</span> &lt;&lt; line_count &lt;&lt; <span class=
-"literal">" is "</span> &lt;&lt; length &lt;&lt;  <span class="literal">"\n"</span>;
-
-        <span class="comment">// Convert it to utf-16</span>
-        vector&lt;unsigned short&gt; utf16line;
-        utf8::utf8to16(line.begin(), end_it, back_inserter(utf16line));
-
-        <span class="comment">// And back to utf-8</span>
-        string utf8line; 
-        utf8::utf16to8(utf16line.begin(), utf16line.end(), back_inserter(utf8line));
-
-        <span class="comment">// Confirm that the conversion went OK:</span>
-        <span class="keyword">if</span> (utf8line != string(line.begin(), end_it))
-            cout &lt;&lt; <span class=
-"literal">"Error in UTF-16 conversion at line: "</span> &lt;&lt; line_count &lt;&lt; <span
- class="literal">"\n"</span>;        
-
-        line_count++;
-    }
-    <span class="keyword">return</span> <span class="literal">0</span>;
-}
-</pre>
-    <p>
-      In the previous code sample, for each line we performed
-      a detection of invalid UTF-8 sequences with <code>find_invalid</code>; the number
-      of characters (more precisely - the number of Unicode code points, including the end
-      of line and even BOM if there is one) in each line was
-      determined with a use of <code>utf8::distance</code>; finally, we have converted
-      each line to UTF-16 encoding with <code>utf8to16</code> and back to UTF-8 with
-      <code>utf16to8</code>.
-    </p>
-    <h3 id="validfile">Checking if a file contains valid UTF-8 text</h3>
-<p>
-Here is a function that checks whether the content of a file is valid UTF-8 encoded text without
-reading the content into the memory:
-</p>
-<pre>    
-<span class="keyword">bool</span> valid_utf8_file(i<span class="keyword">const char</span>* file_name)
-{
-    ifstream ifs(file_name);
-    <span class="keyword">if</span> (!ifs)
-        <span class="keyword">return false</span>; <span class="comment">// even better, throw here</span>
-
-    istreambuf_iterator&lt;<span class="keyword">char</span>&gt; it(ifs.rdbuf());
-    istreambuf_iterator&lt;<span class="keyword">char</span>&gt; eos;
-
-    <span class="keyword">return</span> utf8::is_valid(it, eos);
-}
-</pre>
-<p>
-Because the function <code>utf8::is_valid()</code> works with input iterators, we were able
-to pass an <code>istreambuf_iterator</code> to it and read the content of the file directly 
-without loading it to the memory first.</p>
-<p>
-Note that other functions that take input iterator arguments can be used in a similar way. For
-instance, to read the content of a UTF-8 encoded text file and convert the text to UTF-16, just 
-do something like:
-</p>
-<pre>
-    utf8::utf8to16(it, eos, back_inserter(u16string));
-</pre>
-    <h3 id="fixinvalid">Ensure that a string contains valid UTF-8 text</h3>
-<p>
-If we have some text that "probably" contains UTF-8 encoded text and we want to
-replace any invalid UTF-8 sequence with a replacement character, something like 
-the following function may be used:
-</p>
-<pre>
-<span class="keyword">void</span> fix_utf8_string(std::string&amp; str)
-{
-    std::string temp;
-    utf8::replace_invalid(str.begin(), str.end(), back_inserter(temp));
-    str = temp;
-}
-</pre>
-<p>The function will replace any invalid UTF-8 sequence with a Unicode replacement character. 
-There is an overloaded function that enables the caller to supply their own replacement character.
-</p>
-    <h2 id="reference">
-      Reference
-    </h2>
-    <h3 id="funutf8">
-      Functions From utf8 Namespace
-    </h3>
-    <h4>
-      utf8::append
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Encodes a 32 bit code point as a UTF-8 sequence of octets and appends the sequence
-      to a UTF-8 string.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt;
-octet_iterator append(uint32_t cp, octet_iterator result);
-   
-</pre>
-    <p>
-	  <code>octet_iterator</code>: an output iterator.<br>
-      <code>cp</code>: a 32 bit integer representing a code point to append to the
-      sequence.<br>
-       <code>result</code>: an output iterator to the place in the sequence where to
-      append the code point.<br>
-       <span class="return_value">Return value</span>: an iterator pointing to the place
-      after the newly appended sequence.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">unsigned char</span> u[<span class="literal">5</span>] = {<span
-class="literal">0</span>,<span class="literal">0</span>,<span class=
-"literal">0</span>,<span class="literal">0</span>,<span class="literal">0</span>};
-<span class="keyword">unsigned char</span>* end = append(<span class=
-"literal">0x0448</span>, u);
-assert (u[<span class="literal">0</span>] == <span class=
-"literal">0xd1</span> &amp;&amp; u[<span class="literal">1</span>] == <span class=
-"literal">0x88</span> &amp;&amp; u[<span class="literal">2</span>] == <span class=
-"literal">0</span> &amp;&amp; u[<span class="literal">3</span>] == <span class=
-"literal">0</span> &amp;&amp; u[<span class="literal">4</span>] == <span class=
-"literal">0</span>);
-</pre>
-    <p>
-      Note that <code>append</code> does not allocate any memory - it is the burden of
-      the caller to make sure there is enough memory allocated for the operation. To make
-      things more interesting, <code>append</code> can add anywhere between 1 and 4
-      octets to the sequence. In practice, you would most often want to use
-      <code>std::back_inserter</code> to ensure that the necessary memory is allocated.
-    </p>
-    <p>
-      In case of an invalid code point, a <code>utf8::invalid_code_point</code> exception
-      is thrown.
-    </p>
-    <h4>
-      utf8::next
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Given the iterator to the beginning of the UTF-8 sequence, it returns the code
-      point and moves the iterator to the next position.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
-uint32_t next(octet_iterator&amp; it, octet_iterator end);
-   
-</pre>
-    <p>
-	  <code>octet_iterator</code>: an input iterator.<br>
-      <code>it</code>: a reference to an iterator pointing to the beginning of an UTF-8
-      encoded code point. After the function returns, it is incremented to point to the
-      beginning of the next code point.<br>
-       <code>end</code>: end of the UTF-8 sequence to be processed. If <code>it</code>
-      gets equal to <code>end</code> during the extraction of a code point, an
-      <code>utf8::not_enough_room</code> exception is thrown.<br>
-       <span class="return_value">Return value</span>: the 32 bit representation of the
-      processed UTF-8 code point.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span>* twochars = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88"</span>;
-<span class="keyword">char</span>* w = twochars;
-<span class="keyword">int</span> cp = next(w, twochars + <span class="literal">6</span>);
-assert (cp == <span class="literal">0x65e5</span>);
-assert (w == twochars + <span class="literal">3</span>);
-</pre>
-    <p>
-      This function is typically used to iterate through a UTF-8 encoded string.
-    </p>
-    <p>
-      In case of an invalid UTF-8 seqence, a <code>utf8::invalid_utf8</code> exception is
-      thrown.
-    </p>
-    <h4>
-      utf8::peek_next
-    </h4>
-    <p class="version">
-    Available in version 2.1 and later.
-    </p>
-    <p>
-      Given the iterator to the beginning of the UTF-8 sequence, it returns the code
-      point for the following sequence without changing the value of the iterator. 
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
-uint32_t peek_next(octet_iterator it, octet_iterator end);
-   
-</pre>
-    <p>
-	  <code>octet_iterator</code>: an input iterator.<br>
-      <code>it</code>: an iterator pointing to the beginning of an UTF-8
-      encoded code point.<br>
-       <code>end</code>: end of the UTF-8 sequence to be processed. If <code>it</code>
-      gets equal to <code>end</code> during the extraction of a code point, an
-      <code>utf8::not_enough_room</code> exception is thrown.<br>
-       <span class="return_value">Return value</span>: the 32 bit representation of the
-      processed UTF-8 code point.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span>* twochars = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88"</span>;
-<span class="keyword">char</span>* w = twochars;
-<span class="keyword">int</span> cp = peek_next(w, twochars + <span class="literal">6</span>);
-assert (cp == <span class="literal">0x65e5</span>);
-assert (w == twochars);
-</pre>
-    <p>
-      In case of an invalid UTF-8 seqence, a <code>utf8::invalid_utf8</code> exception is
-      thrown.
-    </p>
-    <h4>
-      utf8::prior
-    </h4>
-    <p class="version">
-    Available in version 1.02 and later.
-    </p>
-    <p>
-      Given a reference to an iterator pointing to an octet in a UTF-8 sequence, it
-      decreases the iterator until it hits the beginning of the previous UTF-8 encoded
-      code point and returns the 32 bits representation of the code point.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
-uint32_t prior(octet_iterator&amp; it, octet_iterator start);
-   
-</pre>
-    <p>
-	  <code>octet_iterator</code>: a bidirectional iterator.<br>
-      <code>it</code>: a reference pointing to an octet within a UTF-8 encoded string.
-      After the function returns, it is decremented to point to the beginning of the
-      previous code point.<br>
-       <code>start</code>: an iterator to the beginning of the sequence where the search
-      for the beginning of a code point is performed. It is a
-      safety measure to prevent passing the beginning of the string in the search for a
-      UTF-8 lead octet.<br>
-       <span class="return_value">Return value</span>: the 32 bit representation of the
-      previous code point.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span>* twochars = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88"</span>;
-<span class="keyword">unsigned char</span>* w = twochars + <span class=
-"literal">3</span>;
-<span class="keyword">int</span> cp = prior (w, twochars);
-assert (cp == <span class="literal">0x65e5</span>);
-assert (w == twochars);
-</pre>
-    <p> 
-      This function has two purposes: one is two iterate backwards through a UTF-8
-      encoded string. Note that it is usually a better idea to iterate forward instead,
-      since <code>utf8::next</code> is faster. The second purpose is to find a beginning
-      of a UTF-8 sequence if we have a random position within a string. Note that in that
-      case <code>utf8::prior</code> may not detect an invalid UTF-8 sequence in some scenarios:
-      for instance if there are superfluous trail octets, it will just skip them.
-    </p> 
-    <p>
-      <code>it</code> will typically point to the beginning of
-      a code point, and <code>start</code> will point to the
-      beginning of the string to ensure we don't go backwards too far. <code>it</code> is
-      decreased until it points to a lead UTF-8 octet, and then the UTF-8 sequence
-      beginning with that octet is decoded to a 32 bit representation and returned.
-    </p>
-    <p>
-      In case <code>start</code> is reached before a UTF-8 lead octet is hit, or if an
-      invalid UTF-8 sequence is started by the lead octet, an <code>invalid_utf8</code>
-      exception is thrown.
-    </p>
-    <p>In case <code>start</code> equals <code>it</code>, a <code>not_enough_room</code>
-      exception is thrown.
-    <h4>
-      utf8::previous
-    </h4>
-    <p class="version">
-    Deprecated in version 1.02 and later.
-    </p>
-    <p>
-      Given a reference to an iterator pointing to an octet in a UTF-8 seqence, it
-      decreases the iterator until it hits the beginning of the previous UTF-8 encoded
-      code point and returns the 32 bits representation of the code point.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
-uint32_t previous(octet_iterator&amp; it, octet_iterator pass_start);
-   
-</pre>
-    <p>
-	  <code>octet_iterator</code>: a random access iterator.<br>
-      <code>it</code>: a reference pointing to an octet within a UTF-8 encoded string.
-      After the function returns, it is decremented to point to the beginning of the
-      previous code point.<br>
-       <code>pass_start</code>: an iterator to the point in the sequence where the search
-      for the beginning of a code point is aborted if no result was reached. It is a
-      safety measure to prevent passing the beginning of the string in the search for a
-      UTF-8 lead octet.<br>
-       <span class="return_value">Return value</span>: the 32 bit representation of the
-      previous code point.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span>* twochars = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88"</span>;
-<span class="keyword">unsigned char</span>* w = twochars + <span class=
-"literal">3</span>;
-<span class="keyword">int</span> cp = previous (w, twochars - <span class=
-"literal">1</span>);
-assert (cp == <span class="literal">0x65e5</span>);
-assert (w == twochars);
-</pre>
-    <p>
-      <code>utf8::previous</code> is deprecated, and <code>utf8::prior</code> should
-      be used instead, although the existing code can continue using this function.
-      The problem is the parameter <code>pass_start</code> that points to the position
-      just before the beginning of the sequence. Standard containers don't have the 
-      concept of "pass start" and the function can not be used with their iterators.
-    </p>
-    <p>
-      <code>it</code> will typically point to the beginning of
-      a code point, and <code>pass_start</code> will point to the octet just before the
-      beginning of the string to ensure we don't go backwards too far. <code>it</code> is
-      decreased until it points to a lead UTF-8 octet, and then the UTF-8 sequence
-      beginning with that octet is decoded to a 32 bit representation and returned.
-    </p>
-    <p>
-      In case <code>pass_start</code> is reached before a UTF-8 lead octet is hit, or if an
-      invalid UTF-8 sequence is started by the lead octet, an <code>invalid_utf8</code>
-      exception is thrown
-    </p>
-    <h4>
-      utf8::advance
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Advances an iterator by the specified number of code points within an UTF-8
-      sequence.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator, typename distance_type&gt; 
-<span class=
-"keyword">void</span> advance (octet_iterator&amp; it, distance_type n, octet_iterator end);
-   
-</pre>
-    <p>
-      <code>octet_iterator</code>: an input iterator.<br>
-      <code>distance_type</code>: an integral type convertible to <code>octet_iterator</code>'s difference type.<br>
-      <code>it</code>: a reference to an iterator pointing to the beginning of an UTF-8
-      encoded code point. After the function returns, it is incremented to point to the
-      nth following code point.<br>
-       <code>n</code>: a positive integer that shows how many code points we want to
-      advance.<br>
-       <code>end</code>: end of the UTF-8 sequence to be processed. If <code>it</code>
-      gets equal to <code>end</code> during the extraction of a code point, an
-      <code>utf8::not_enough_room</code> exception is thrown.<br>
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span>* twochars = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88"</span>;
-<span class="keyword">unsigned char</span>* w = twochars;
-advance (w, <span class="literal">2</span>, twochars + <span class="literal">6</span>);
-assert (w == twochars + <span class="literal">5</span>);
-</pre>
-    <p>
-      This function works only "forward". In case of a negative <code>n</code>, there is
-      no effect.
-    </p>
-    <p>
-      In case of an invalid code point, a <code>utf8::invalid_code_point</code> exception
-      is thrown.
-    </p>
-    <h4>
-      utf8::distance
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Given the iterators to two UTF-8 encoded code points in a seqence, returns the
-      number of code points between them.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
-<span class=
-"keyword">typename</span> std::iterator_traits&lt;octet_iterator&gt;::difference_type distance (octet_iterator first, octet_iterator last);
-   
-</pre>
-    <p>
-      <code>octet_iterator</code>: an input iterator.<br>
-      <code>first</code>: an iterator to a beginning of a UTF-8 encoded code point.<br>
-      <code>last</code>: an iterator to a "post-end" of the last UTF-8 encoded code
-      point in the sequence we are trying to determine the length. It can be the
-      beginning of a new code point, or not.<br>
-       <span class="return_value">Return value</span> the distance between the iterators,
-      in code points.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span>* twochars = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88"</span>;
-size_t dist = utf8::distance(twochars, twochars + <span class="literal">5</span>);
-assert (dist == <span class="literal">2</span>);
-</pre>
-    <p>
-      This function is used to find the length (in code points) of a UTF-8 encoded
-      string. The reason it is called <em>distance</em>, rather than, say,
-      <em>length</em> is mainly because developers are used that <em>length</em> is an
-      O(1) function. Computing the length of an UTF-8 string is a linear operation, and
-      it looked better to model it after <code>std::distance</code> algorithm.
-    </p>
-    <p>
-      In case of an invalid UTF-8 seqence, a <code>utf8::invalid_utf8</code> exception is
-      thrown. If <code>last</code> does not point to the past-of-end of a UTF-8 seqence,
-      a <code>utf8::not_enough_room</code> exception is thrown.
-    </p>
-    <h4>
-      utf8::utf16to8
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Converts a UTF-16 encoded string to UTF-8.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> u16bit_iterator, <span class=
-"keyword">typename</span> octet_iterator&gt;
-octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result);
-   
-</pre>
-    <p>
-      <code>u16bit_iterator</code>: an input iterator.<br>
-      <code>octet_iterator</code>: an output iterator.<br>
-      <code>start</code>: an iterator pointing to the beginning of the UTF-16 encoded
-      string to convert.<br>
-       <code>end</code>: an iterator pointing to pass-the-end of the UTF-16 encoded
-      string to convert.<br>
-       <code>result</code>: an output iterator to the place in the UTF-8 string where to
-      append the result of conversion.<br>
-       <span class="return_value">Return value</span>: An iterator pointing to the place
-      after the appended UTF-8 string.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">unsigned short</span> utf16string[] = {<span class=
-"literal">0x41</span>, <span class="literal">0x0448</span>, <span class=
-"literal">0x65e5</span>, <span class="literal">0xd834</span>, <span class=
-"literal">0xdd1e</span>};
-vector&lt;<span class="keyword">unsigned char</span>&gt; utf8result;
-utf16to8(utf16string, utf16string + <span class=
-"literal">5</span>, back_inserter(utf8result));
-assert (utf8result.size() == <span class="literal">10</span>);    
-</pre>
-    <p>
-      In case of invalid UTF-16 sequence, a <code>utf8::invalid_utf16</code> exception is
-      thrown.
-    </p>
-    <h4>
-      utf8::utf8to16
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Converts an UTF-8 encoded string to UTF-16
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> u16bit_iterator, typename octet_iterator&gt;
-u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result);
-   
-</pre>
-    <p>
-      <code>octet_iterator</code>: an input iterator.<br>
-      <code>u16bit_iterator</code>: an output iterator.<br>
-      <code>start</code>: an iterator pointing to the beginning of the UTF-8 encoded
-      string to convert. &lt; br /&gt; <code>end</code>: an iterator pointing to
-      pass-the-end of the UTF-8 encoded string to convert.<br>
-       <code>result</code>: an output iterator to the place in the UTF-16 string where to
-      append the result of conversion.<br>
-       <span class="return_value">Return value</span>: An iterator pointing to the place
-      after the appended UTF-16 string.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span> utf8_with_surrogates[] = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88\xf0\x9d\x84\x9e"</span>;
-vector &lt;<span class="keyword">unsigned short</span>&gt; utf16result;
-utf8to16(utf8_with_surrogates, utf8_with_surrogates + <span class=
-"literal">9</span>, back_inserter(utf16result));
-assert (utf16result.size() == <span class="literal">4</span>);
-assert (utf16result[<span class="literal">2</span>] == <span class=
-"literal">0xd834</span>);
-assert (utf16result[<span class="literal">3</span>] == <span class=
-"literal">0xdd1e</span>);
-</pre>
-    <p>
-      In case of an invalid UTF-8 seqence, a <code>utf8::invalid_utf8</code> exception is
-      thrown. If <code>end</code> does not point to the past-of-end of a UTF-8 seqence, a
-      <code>utf8::not_enough_room</code> exception is thrown.
-    </p>
-    <h4>
-      utf8::utf32to8
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Converts a UTF-32 encoded string to UTF-8.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator, typename u32bit_iterator&gt;
-octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result);
-   
-</pre>
-    <p>
-      <code>octet_iterator</code>: an output iterator.<br>
-      <code>u32bit_iterator</code>: an input iterator.<br>
-      <code>start</code>: an iterator pointing to the beginning of the UTF-32 encoded
-      string to convert.<br>
-       <code>end</code>: an iterator pointing to pass-the-end of the UTF-32 encoded
-      string to convert.<br>
-       <code>result</code>: an output iterator to the place in the UTF-8 string where to
-      append the result of conversion.<br>
-       <span class="return_value">Return value</span>: An iterator pointing to the place
-      after the appended UTF-8 string.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">int</span> utf32string[] = {<span class=
-"literal">0x448</span>, <span class="literal">0x65E5</span>, <span class=
-"literal">0x10346</span>, <span class="literal">0</span>};
-vector&lt;<span class="keyword">unsigned char</span>&gt; utf8result;
-utf32to8(utf32string, utf32string + <span class=
-"literal">3</span>, back_inserter(utf8result));
-assert (utf8result.size() == <span class="literal">9</span>);
-</pre>
-    <p>
-      In case of invalid UTF-32 string, a <code>utf8::invalid_code_point</code> exception
-      is thrown.
-    </p>
-    <h4>
-      utf8::utf8to32
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Converts a UTF-8 encoded string to UTF-32.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator, <span class=
-"keyword">typename</span> u32bit_iterator&gt;
-u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result);
-   
-</pre>
-    <p>
-      <code>octet_iterator</code>: an input iterator.<br>
-      <code>u32bit_iterator</code>: an output iterator.<br>
-      <code>start</code>: an iterator pointing to the beginning of the UTF-8 encoded
-      string to convert.<br>
-       <code>end</code>: an iterator pointing to pass-the-end of the UTF-8 encoded string
-      to convert.<br>
-       <code>result</code>: an output iterator to the place in the UTF-32 string where to
-      append the result of conversion.<br>
-       <span class="return_value">Return value</span>: An iterator pointing to the place
-      after the appended UTF-32 string.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span>* twochars = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88"</span>;
-vector&lt;<span class="keyword">int</span>&gt; utf32result;
-utf8to32(twochars, twochars + <span class=
-"literal">5</span>, back_inserter(utf32result));
-assert (utf32result.size() == <span class="literal">2</span>);
-</pre>
-    <p>
-      In case of an invalid UTF-8 seqence, a <code>utf8::invalid_utf8</code> exception is
-      thrown. If <code>end</code> does not point to the past-of-end of a UTF-8 seqence, a
-      <code>utf8::not_enough_room</code> exception is thrown.
-    </p>
-    <h4>
-      utf8::find_invalid
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Detects an invalid sequence within a UTF-8 string.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
-octet_iterator find_invalid(octet_iterator start, octet_iterator end);
-</pre>
-    <p>
-      <code>octet_iterator</code>: an input iterator.<br>
-      <code>start</code>: an iterator pointing to the beginning of the UTF-8 string to
-      test for validity.<br>
-       <code>end</code>: an iterator pointing to pass-the-end of the UTF-8 string to test
-      for validity.<br>
-       <span class="return_value">Return value</span>: an iterator pointing to the first
-      invalid octet in the UTF-8 string. In case none were found, equals
-      <code>end</code>.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span> utf_invalid[] = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88\xfa"</span>;
-<span class=
-"keyword">char</span>* invalid = find_invalid(utf_invalid, utf_invalid + <span class=
-"literal">6</span>);
-assert (invalid == utf_invalid + <span class="literal">5</span>);
-</pre>
-    <p>
-      This function is typically used to make sure a UTF-8 string is valid before
-      processing it with other functions. It is especially important to call it if before
-      doing any of the <em>unchecked</em> operations on it.
-    </p>
-    <h4>
-      utf8::is_valid
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Checks whether a sequence of octets is a valid UTF-8 string.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
-<span class="keyword">bool</span> is_valid(octet_iterator start, octet_iterator end);
-   
-</pre>
-    <p>
-      <code>octet_iterator</code>: an input iterator.<br>
-      <code>start</code>: an iterator pointing to the beginning of the UTF-8 string to
-      test for validity.<br>
-       <code>end</code>: an iterator pointing to pass-the-end of the UTF-8 string to test
-      for validity.<br>
-       <span class="return_value">Return value</span>: <code>true</code> if the sequence
-      is a valid UTF-8 string; <code>false</code> if not.
-    </p>
-    Example of use: 
-<pre>
-<span class="keyword">char</span> utf_invalid[] = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88\xfa"</span>;
-<span class="keyword">bool</span> bvalid = is_valid(utf_invalid, utf_invalid + <span
-class="literal">6</span>);
-assert (bvalid == false);
-</pre>
-    <p>
-      <code>is_valid</code> is a shorthand for <code>find_invalid(start, end) ==
-      end;</code>. You may want to use it to make sure that a byte seqence is a valid
-      UTF-8 string without the need to know where it fails if it is not valid.
-    </p>
-    <h4>
-      utf8::replace_invalid
-    </h4>
-    <p class="version">
-    Available in version 2.0 and later.
-    </p>
-    <p>
-      Replaces all invalid UTF-8 sequences within a string with a replacement marker.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator, <span class=
-"keyword">typename</span> output_iterator&gt;
-output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, uint32_t replacement);
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator, <span class=
-"keyword">typename</span> output_iterator&gt;
-output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out);
-   
-</pre>
-    <p>
-      <code>octet_iterator</code>: an input iterator.<br>
-      <code>output_iterator</code>: an output iterator.<br>
-      <code>start</code>: an iterator pointing to the beginning of the UTF-8 string to
-      look for invalid UTF-8 sequences.<br>
-       <code>end</code>: an iterator pointing to pass-the-end of the UTF-8 string to look
-      for invalid UTF-8 sequences.<br>
-       <code>out</code>: An output iterator to the range where the result of replacement
-      is stored.<br>
-       <code>replacement</code>: A Unicode code point for the replacement marker. The
-      version without this parameter assumes the value <code>0xfffd</code><br>
-       <span class="return_value">Return value</span>: An iterator pointing to the place
-      after the UTF-8 string with replaced invalid sequences.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span> invalid_sequence[] = <span class=
-"literal">"a\x80\xe0\xa0\xc0\xaf\xed\xa0\x80z"</span>;
-vector&lt;<span class="keyword">char</span>&gt; replace_invalid_result;
-replace_invalid (invalid_sequence, invalid_sequence + sizeof(invalid_sequence), back_inserter(replace_invalid_result), <span
- class="literal">'?'</span>);
-bvalid = is_valid(replace_invalid_result.begin(), replace_invalid_result.end());
-assert (bvalid);
-<span class="keyword">char</span>* fixed_invalid_sequence = <span class=
-"literal">"a????z"</span>;
-assert (std::equal(replace_invalid_result.begin(), replace_invalid_result.end(), fixed_invalid_sequence));
-</pre>
-    <p>
-      <code>replace_invalid</code> does not perform in-place replacement of invalid
-      sequences. Rather, it produces a copy of the original string with the invalid
-      sequences replaced with a replacement marker. Therefore, <code>out</code> must not
-      be in the <code>[start, end]</code> range.
-    </p>
-    <p>
-      If <code>end</code> does not point to the past-of-end of a UTF-8 sequence, a
-      <code>utf8::not_enough_room</code> exception is thrown.
-    </p>
-    <h4>
-      utf8::starts_with_bom
-    </h4>
-    <p class="version">
-    Available in version 2.3 and later. Relaces deprecated <code>is_bom()</code> function.
-    </p>
-    <p>
-      Checks whether an octet sequence starts with a UTF-8 byte order mark (BOM)
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
-<span class="keyword">bool</span> starts_with_bom (octet_iterator it, octet_iterator end);
-</pre>
-    <p>
-      <code>octet_iterator</code>: an input iterator.<br>
-      <code>it</code>: beginning of the octet sequence to check<br>
-      <code>end</code>: pass-end of the sequence to check<br>
-       <span class="return_value">Return value</span>: <code>true</code> if the sequence
-      starts with a UTF-8 byte order mark; <code>false</code> if not.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">unsigned char</span> byte_order_mark[] = {<span class=
-"literal">0xef</span>, <span class="literal">0xbb</span>, <span class=
-"literal">0xbf</span>};
-<span class="keyword">bool</span> bbom = starts_with_bom(byte_order_mark, byte_order_mark + <span class="keyword">sizeof</span>(byte_order_mark));
-assert (bbom == <span class="literal">true</span>);
-</pre>
-    <p>
-      The typical use of this function is to check the first three bytes of a file. If
-      they form the UTF-8 BOM, we want to skip them before processing the actual UTF-8
-      encoded text.
-    </p>
-    <h4>
-      utf8::is_bom
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later. Deprecated in version 2.3. <code>starts_with_bom()</code> should be used
-    instead.
-    </p>
-    <p>
-      Checks whether a sequence of three octets is a UTF-8 byte order mark (BOM)
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
-<span class="keyword">bool</span> is_bom (octet_iterator it); <span class="comment"> // Deprecated</span>
-</pre>
-    <p>
-      <code>octet_iterator</code>: an input iterator.<br>
-      <code>it</code>: beginning of the 3-octet sequence to check<br>
-       <span class="return_value">Return value</span>: <code>true</code> if the sequence
-      is UTF-8 byte order mark; <code>false</code> if not.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">unsigned char</span> byte_order_mark[] = {<span class=
-"literal">0xef</span>, <span class="literal">0xbb</span>, <span class=
-"literal">0xbf</span>};
-<span class="keyword">bool</span> bbom = is_bom(byte_order_mark);
-assert (bbom == <span class="literal">true</span>);
-</pre>
-    <p>
-      The typical use of this function is to check the first three bytes of a file. If
-      they form the UTF-8 BOM, we want to skip them before processing the actual UTF-8
-      encoded text.
-    </p>
-    <p>
-      If a sequence is 
-      shorter than three bytes, an invalid iterator will be dereferenced. Therefore, this function is deprecated
-      in favor of <code>starts_with_bom()</code>that takes the end of sequence as an argument.
-    </p>
-    <h3 id="typesutf8">
-      Types From utf8 Namespace
-    </h3>
-    <h4>utf8::exception
-    </h4>
-    <p class="version">
-    Available in version 2.3 and later.
-    </p>
-    <p>
-    Base class for the exceptions thrown by UTF CPP library functions.
-    </p>
-<pre>
-<span class="keyword">class</span> exception : <span class="keyword">public</span> std::exception {};
-</pre>
-    <p>
-    Example of use:
-    </p>
-<pre>
-<span class="keyword">try</span> {
-  code_that_uses_utf_cpp_library();
-}
-<span class="keyword">catch</span>(<span class="keyword">const</span> utf8::exception&amp; utfcpp_ex) {
-  cerr &lt;&lt; utfcpp_ex.what();
-}
-</pre>
-    
-    <h4>utf8::invalid_code_point
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-    Thrown by UTF8 CPP functions such as <code>advance</code> and <code>next</code> if an UTF-8 sequence represents and invalid code point.
-    </p>
-
-<pre>
-<span class="keyword">class</span> invalid_code_point : <span class="keyword">public</span> exception {
-<span class="keyword">public</span>: 
-    uint32_t code_point() <span class="keyword">const</span>;
-};
-
-</pre>
-    <p>
-    Member function <code>code_point()</code> can be used to determine the invalid code point that
-    caused the exception to be thrown.
-    </p>
-    <h4>utf8::invalid_utf8
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-    Thrown by UTF8 CPP functions such as <code>next</code> and <code>prior</code> if an invalid UTF-8 sequence
-    is detected during decoding.
-    </p>
-
-<pre>
-<span class="keyword">class</span> invalid_utf8 : <span class="keyword">public</span> exception {
-<span class="keyword">public</span>: 
-    uint8_t utf8_octet() <span class="keyword">const</span>;
-};
-</pre>
-
-    <p>
-    Member function <code>utf8_octet()</code> can be used to determine the beginning of the byte 
-    sequence that caused the exception to be thrown.
-    </p>
-</pre>
-    <h4>utf8::invalid_utf16
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-    Thrown by UTF8 CPP function <code>utf16to8</code> if an invalid UTF-16 sequence
-    is detected during decoding.
-    </p>
-
-<pre>
-<span class="keyword">class</span> invalid_utf16 : <span class="keyword">public</span> exception {
-<span class="keyword">public</span>: 
-    uint16_t utf16_word() <span class="keyword">const</span>;
-};
-</pre>
-
-    <p>
-    Member function <code>utf16_word()</code> can be used to determine the UTF-16 code unit 
-    that caused the exception to be thrown.
-    </p>
-    <h4>utf8::not_enough_room
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-    Thrown by UTF8 CPP functions such as <code>next</code> if the end of the decoded UTF-8 sequence
-    was reached before the code point was decoded.
-    </p>
-
-<pre>
-<span class="keyword">class</span> not_enough_room : <span class="keyword">public</span> exception {};
-</pre>
-    <h4>
-      utf8::iterator
-    </h4>
-    <p class="version">
-    Available in version 2.0 and later.
-    </p>
-    <p>
-      Adapts the underlying octet iterator to iterate over the sequence of code points,
-      rather than raw octets.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class="keyword">typename</span> octet_iterator&gt;
-<span class="keyword">class</span> iterator;
-</pre>
-    
-    <h5>Member functions</h5>
-      <dl>
-      <dt><code>iterator();</code> <dd> the deafult constructor; the underlying <code>octet_iterator</code> is
-      constructed with its default constructor.
-      <dt><code><span class="keyword">explicit</span> iterator (const octet_iterator&amp; octet_it, 
-                         const octet_iterator&amp; range_start,
-                         const octet_iterator&amp; range_end);</code> <dd> a constructor 
-      that initializes the underlying <code>octet_iterator</code> with <code>octet_it</code>
-      and sets the range in which the iterator is considered valid.
-      <dt><code>octet_iterator base () <span class="keyword">const</span>;</code> <dd> returns the 
-      underlying <code>octet_iterator</code>.
-      <dt><code>uint32_t operator * () <span class="keyword">const</span>;</code> <dd> decodes the utf-8 sequence
-      the underlying <code>octet_iterator</code> is pointing to and returns the code point.
-      <dt><code><span class="keyword">bool operator</span> == (const iterator&amp; rhs)
-      <span class="keyword">const</span>;</code> <dd> returns <span class="keyword">true</span>
-      if the two underlaying iterators are equal.
-      <dt><code><span class="keyword">bool operator</span> != (const iterator&amp; rhs)
-      <span class="keyword">const</span>;</code> <dd> returns <span class="keyword">true</span>
-      if the two underlaying iterators are not equal.
-      <dt><code>iterator&amp; <span class="keyword">operator</span> ++ (); </code> <dd> the prefix increment - moves
-      the iterator to the next UTF-8 encoded code point.
-      <dt><code>iterator <span class="keyword">operator</span> ++ (<span class="keyword">int</span>); </code> <dd>
-      the postfix increment - moves the iterator to the next UTF-8 encoded code point and returns the current one.
-      <dt><code>iterator&amp; <span class="keyword">operator</span> -- (); </code> <dd> the prefix decrement - moves
-      the iterator to the previous UTF-8 encoded code point.
-      <dt><code>iterator <span class="keyword">operator</span> -- (<span class="keyword">int</span>); </code> <dd>
-      the postfix decrement - moves the iterator to the previous UTF-8 encoded code point and returns the current one.
-      </dl>
-      <p>
-      Example of use:
-      </p>
-<pre>
-<span class="keyword">char</span>* threechars = <span class="literal">"\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88"</span>;
-utf8::iterator&lt;<span class="keyword">char</span>*&gt; it(threechars, threechars, threechars + <span class="literal">9</span>);
-utf8::iterator&lt;<span class="keyword">char</span>*&gt; it2 = it;
-assert (it2 == it);
-assert (*it == <span class="literal">0x10346</span>);
-assert (*(++it) == <span class="literal">0x65e5</span>);
-assert ((*it++) == <span class="literal">0x65e5</span>);
-assert (*it == <span class="literal">0x0448</span>);
-assert (it != it2);
-utf8::iterator&lt;<span class="keyword">char</span>*&gt; endit (threechars + <span class="literal">9</span>, threechars, threechars + <span class="literal">9</span>);  
-assert (++it == endit);
-assert (*(--it) == <span class="literal">0x0448</span>);
-assert ((*it--) == <span class="literal">0x0448</span>);
-assert (*it == <span class="literal">0x65e5</span>);
-assert (--it == utf8::iterator&lt;<span class="keyword">char</span>*&gt;(threechars, threechars, threechars + <span class="literal">9</span>));
-assert (*it == <span class="literal">0x10346</span>);
-</pre>
-      <p>
-      The purpose of <code>utf8::iterator</code> adapter is to enable easy iteration as well as the use of STL
-      algorithms with UTF-8 encoded strings. Increment and decrement operators are implemented in terms of 
-      <code>utf8::next()</code> and <code>utf8::prior()</code> functions. 
-      </p>
-      <p>
-      Note that <code>utf8::iterator</code> adapter is a checked iterator. It operates on the range specified in
-      the constructor; any attempt to go out of that range will result in an exception. Even the comparison operators
-      require both iterator object to be constructed against the same range - otherwise an exception is thrown. Typically,
-      the range will be determined by sequence container functions <code>begin</code> and <code>end</code>, i.e.:
-      </p>
-<pre>
-std::string s = <span class="literal">"example"</span>;
-utf8::iterator i (s.begin(), s.begin(), s.end());
-</pre>
-    <h3 id="fununchecked">
-      Functions From utf8::unchecked Namespace
-    </h3>
-    <h4>
-      utf8::unchecked::append
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Encodes a 32 bit code point as a UTF-8 sequence of octets and appends the sequence
-      to a UTF-8 string.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt;
-octet_iterator append(uint32_t cp, octet_iterator result);
-   
-</pre>
-    <p>
-      <code>cp</code>: A 32 bit integer representing a code point to append to the
-      sequence.<br>
-       <code>result</code>: An output iterator to the place in the sequence where to
-      append the code point.<br>
-       <span class="return_value">Return value</span>: An iterator pointing to the place
-      after the newly appended sequence.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">unsigned char</span> u[<span class="literal">5</span>] = {<span
-class="literal">0</span>,<span class="literal">0</span>,<span class=
-"literal">0</span>,<span class="literal">0</span>,<span class="literal">0</span>};
-<span class="keyword">unsigned char</span>* end = unchecked::append(<span class=
-"literal">0x0448</span>, u);
-assert (u[<span class="literal">0</span>] == <span class=
-"literal">0xd1</span> &amp;&amp; u[<span class="literal">1</span>] == <span class=
-"literal">0x88</span> &amp;&amp; u[<span class="literal">2</span>] == <span class=
-"literal">0</span> &amp;&amp; u[<span class="literal">3</span>] == <span class=
-"literal">0</span> &amp;&amp; u[<span class="literal">4</span>] == <span class=
-"literal">0</span>);
-</pre>
-    <p>
-      This is a faster but less safe version of <code>utf8::append</code>. It does not
-      check for validity of the supplied code point, and may produce an invalid UTF-8
-      sequence.
-    </p>
-    <h4>
-      utf8::unchecked::next
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Given the iterator to the beginning of a UTF-8 sequence, it returns the code point
-      and moves the iterator to the next position.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt;
-uint32_t next(octet_iterator&amp; it);
-   
-</pre>
-    <p>
-      <code>it</code>: a reference to an iterator pointing to the beginning of an UTF-8
-      encoded code point. After the function returns, it is incremented to point to the
-      beginning of the next code point.<br>
-       <span class="return_value">Return value</span>: the 32 bit representation of the
-      processed UTF-8 code point.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span>* twochars = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88"</span>;
-<span class="keyword">char</span>* w = twochars;
-<span class="keyword">int</span> cp = unchecked::next(w);
-assert (cp == <span class="literal">0x65e5</span>);
-assert (w == twochars + <span class="literal">3</span>);
-</pre>
-    <p>
-      This is a faster but less safe version of <code>utf8::next</code>. It does not
-      check for validity of the supplied UTF-8 sequence.
-    </p>
-    <h4>
-      utf8::unchecked::peek_next
-    </h4>
-    <p class="version">
-    Available in version 2.1 and later.
-    </p>
-    <p>
-      Given the iterator to the beginning of a UTF-8 sequence, it returns the code point.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt;
-uint32_t peek_next(octet_iterator it);
-   
-</pre>
-    <p>
-      <code>it</code>: an iterator pointing to the beginning of an UTF-8
-      encoded code point.<br>
-       <span class="return_value">Return value</span>: the 32 bit representation of the
-      processed UTF-8 code point.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span>* twochars = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88"</span>;
-<span class="keyword">char</span>* w = twochars;
-<span class="keyword">int</span> cp = unchecked::peek_next(w);
-assert (cp == <span class="literal">0x65e5</span>);
-assert (w == twochars);
-</pre>
-    <p>
-      This is a faster but less safe version of <code>utf8::peek_next</code>. It does not
-      check for validity of the supplied UTF-8 sequence.
-    </p>
-    <h4>
-      utf8::unchecked::prior
-    </h4>
-    <p class="version">
-    Available in version 1.02 and later.
-    </p>
-    <p>
-      Given a reference to an iterator pointing to an octet in a UTF-8 seqence, it
-      decreases the iterator until it hits the beginning of the previous UTF-8 encoded
-      code point and returns the 32 bits representation of the code point.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt;
-uint32_t prior(octet_iterator&amp; it);
-   
-</pre>
-    <p>
-      <code>it</code>: a reference pointing to an octet within a UTF-8 encoded string.
-      After the function returns, it is decremented to point to the beginning of the
-      previous code point.<br>
-       <span class="return_value">Return value</span>: the 32 bit representation of the
-      previous code point.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span>* twochars = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88"</span>;
-<span class="keyword">char</span>* w = twochars + <span class="literal">3</span>;
-<span class="keyword">int</span> cp = unchecked::prior (w);
-assert (cp == <span class="literal">0x65e5</span>);
-assert (w == twochars);
-</pre>
-    <p>
-      This is a faster but less safe version of <code>utf8::prior</code>. It does not
-      check for validity of the supplied UTF-8 sequence and offers no boundary checking.
-    </p>
-    <h4>
-      utf8::unchecked::previous (deprecated, see utf8::unchecked::prior)
-    </h4>
-    <p class="version">
-    Deprecated in version 1.02 and later.
-    </p>
-    <p>
-      Given a reference to an iterator pointing to an octet in a UTF-8 seqence, it
-      decreases the iterator until it hits the beginning of the previous UTF-8 encoded
-      code point and returns the 32 bits representation of the code point.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt;
-uint32_t previous(octet_iterator&amp; it);
-   
-</pre>
-    <p>
-      <code>it</code>: a reference pointing to an octet within a UTF-8 encoded string.
-      After the function returns, it is decremented to point to the beginning of the
-      previous code point.<br>
-       <span class="return_value">Return value</span>: the 32 bit representation of the
-      previous code point.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span>* twochars = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88"</span>;
-<span class="keyword">char</span>* w = twochars + <span class="literal">3</span>;
-<span class="keyword">int</span> cp = unchecked::previous (w);
-assert (cp == <span class="literal">0x65e5</span>);
-assert (w == twochars);
-</pre>
-    <p>
-     The reason this function is deprecated is just the consistency with the "checked"
-     versions, where <code>prior</code> should be used instead of <code>previous</code>.
-     In fact, <code>unchecked::previous</code> behaves exactly the same as <code>
-     unchecked::prior</code>
-    </p>
-    <p>
-      This is a faster but less safe version of <code>utf8::previous</code>. It does not
-      check for validity of the supplied UTF-8 sequence and offers no boundary checking.
-    </p>
-    <h4>
-      utf8::unchecked::advance
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Advances an iterator by the specified number of code points within an UTF-8
-      sequence.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator, typename distance_type&gt;
-<span class="keyword">void</span> advance (octet_iterator&amp; it, distance_type n);
-   
-</pre>
-    <p>
-      <code>it</code>: a reference to an iterator pointing to the beginning of an UTF-8
-      encoded code point. After the function returns, it is incremented to point to the
-      nth following code point.<br>
-       <code>n</code>: a positive integer that shows how many code points we want to
-      advance.<br>
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span>* twochars = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88"</span>;
-<span class="keyword">char</span>* w = twochars;
-unchecked::advance (w, <span class="literal">2</span>);
-assert (w == twochars + <span class="literal">5</span>);
-</pre>
-    <p>
-      This function works only "forward". In case of a negative <code>n</code>, there is
-      no effect.
-    </p>
-    <p>
-      This is a faster but less safe version of <code>utf8::advance</code>. It does not
-      check for validity of the supplied UTF-8 sequence and offers no boundary checking.
-    </p>
-    <h4>
-      utf8::unchecked::distance
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Given the iterators to two UTF-8 encoded code points in a seqence, returns the
-      number of code points between them.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt;
-<span class=
-"keyword">typename</span> std::iterator_traits&lt;octet_iterator&gt;::difference_type distance (octet_iterator first, octet_iterator last);
-</pre>
-    <p>
-      <code>first</code>: an iterator to a beginning of a UTF-8 encoded code point.<br>
-       <code>last</code>: an iterator to a "post-end" of the last UTF-8 encoded code
-      point in the sequence we are trying to determine the length. It can be the
-      beginning of a new code point, or not.<br>
-       <span class="return_value">Return value</span> the distance between the iterators,
-      in code points.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span>* twochars = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88"</span>;
-size_t dist = utf8::unchecked::distance(twochars, twochars + <span class=
-"literal">5</span>);
-assert (dist == <span class="literal">2</span>);
-</pre>
-    <p>
-      This is a faster but less safe version of <code>utf8::distance</code>. It does not
-      check for validity of the supplied UTF-8 sequence.
-    </p>
-    <h4>
-      utf8::unchecked::utf16to8
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Converts a UTF-16 encoded string to UTF-8.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> u16bit_iterator, <span class=
-"keyword">typename</span> octet_iterator&gt;
-octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result);
-   
-</pre>
-    <p>
-      <code>start</code>: an iterator pointing to the beginning of the UTF-16 encoded
-      string to convert.<br>
-       <code>end</code>: an iterator pointing to pass-the-end of the UTF-16 encoded
-      string to convert.<br>
-       <code>result</code>: an output iterator to the place in the UTF-8 string where to
-      append the result of conversion.<br>
-       <span class="return_value">Return value</span>: An iterator pointing to the place
-      after the appended UTF-8 string.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">unsigned short</span> utf16string[] = {<span class=
-"literal">0x41</span>, <span class="literal">0x0448</span>, <span class=
-"literal">0x65e5</span>, <span class="literal">0xd834</span>, <span class=
-"literal">0xdd1e</span>};
-vector&lt;<span class="keyword">unsigned char</span>&gt; utf8result;
-unchecked::utf16to8(utf16string, utf16string + <span class=
-"literal">5</span>, back_inserter(utf8result));
-assert (utf8result.size() == <span class="literal">10</span>);    
-</pre>
-    <p>
-      This is a faster but less safe version of <code>utf8::utf16to8</code>. It does not
-      check for validity of the supplied UTF-16 sequence.
-    </p>
-    <h4>
-      utf8::unchecked::utf8to16
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Converts an UTF-8 encoded string to UTF-16
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> u16bit_iterator, typename octet_iterator&gt;
-u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result);
-   
-</pre>
-    <p>
-      <code>start</code>: an iterator pointing to the beginning of the UTF-8 encoded
-      string to convert. &lt; br /&gt; <code>end</code>: an iterator pointing to
-      pass-the-end of the UTF-8 encoded string to convert.<br>
-       <code>result</code>: an output iterator to the place in the UTF-16 string where to
-      append the result of conversion.<br>
-       <span class="return_value">Return value</span>: An iterator pointing to the place
-      after the appended UTF-16 string.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span> utf8_with_surrogates[] = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88\xf0\x9d\x84\x9e"</span>;
-vector &lt;<span class="keyword">unsigned short</span>&gt; utf16result;
-unchecked::utf8to16(utf8_with_surrogates, utf8_with_surrogates + <span class=
-"literal">9</span>, back_inserter(utf16result));
-assert (utf16result.size() == <span class="literal">4</span>);
-assert (utf16result[<span class="literal">2</span>] == <span class=
-"literal">0xd834</span>);
-assert (utf16result[<span class="literal">3</span>] == <span class=
-"literal">0xdd1e</span>);
-</pre>
-    <p>
-      This is a faster but less safe version of <code>utf8::utf8to16</code>. It does not
-      check for validity of the supplied UTF-8 sequence.
-    </p>
-    <h4>
-      utf8::unchecked::utf32to8
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Converts a UTF-32 encoded string to UTF-8.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator, <span class=
-"keyword">typename</span> u32bit_iterator&gt;
-octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result);
-   
-</pre>
-    <p>
-      <code>start</code>: an iterator pointing to the beginning of the UTF-32 encoded
-      string to convert.<br>
-       <code>end</code>: an iterator pointing to pass-the-end of the UTF-32 encoded
-      string to convert.<br>
-       <code>result</code>: an output iterator to the place in the UTF-8 string where to
-      append the result of conversion.<br>
-       <span class="return_value">Return value</span>: An iterator pointing to the place
-      after the appended UTF-8 string.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">int</span> utf32string[] = {<span class=
-"literal">0x448</span>, <span class="literal">0x65e5</span>, <span class=
-"literal">0x10346</span>, <span class="literal">0</span>};
-vector&lt;<span class="keyword">unsigned char</span>&gt; utf8result;
-utf32to8(utf32string, utf32string + <span class=
-"literal">3</span>, back_inserter(utf8result));
-assert (utf8result.size() == <span class="literal">9</span>);
-</pre>
-    <p>
-      This is a faster but less safe version of <code>utf8::utf32to8</code>. It does not
-      check for validity of the supplied UTF-32 sequence.
-    </p>
-    <h4>
-      utf8::unchecked::utf8to32
-    </h4>
-    <p class="version">
-    Available in version 1.0 and later.
-    </p>
-    <p>
-      Converts a UTF-8 encoded string to UTF-32.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator, typename u32bit_iterator&gt;
-u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result);
-   
-</pre>
-    <p>
-      <code>start</code>: an iterator pointing to the beginning of the UTF-8 encoded
-      string to convert.<br>
-       <code>end</code>: an iterator pointing to pass-the-end of the UTF-8 encoded string
-      to convert.<br>
-       <code>result</code>: an output iterator to the place in the UTF-32 string where to
-      append the result of conversion.<br>
-       <span class="return_value">Return value</span>: An iterator pointing to the place
-      after the appended UTF-32 string.
-    </p>
-    <p>
-      Example of use:
-    </p>
-<pre>
-<span class="keyword">char</span>* twochars = <span class=
-"literal">"\xe6\x97\xa5\xd1\x88"</span>;
-vector&lt;<span class="keyword">int</span>&gt; utf32result;
-unchecked::utf8to32(twochars, twochars + <span class=
-"literal">5</span>, back_inserter(utf32result));
-assert (utf32result.size() == <span class="literal">2</span>);
-</pre>
-    <p>
-      This is a faster but less safe version of <code>utf8::utf8to32</code>. It does not
-      check for validity of the supplied UTF-8 sequence.
-    </p>
-    <h3 id="typesunchecked">
-      Types From utf8::unchecked Namespace
-    </h3>
-    <h4>
-      utf8::iterator
-    </h4>
-    <p class="version">
-    Available in version 2.0 and later.
-    </p>
-    <p>
-      Adapts the underlying octet iterator to iterate over the sequence of code points,
-      rather than raw octets.
-    </p>
-<pre>
-<span class="keyword">template</span> &lt;<span class="keyword">typename</span> octet_iterator&gt;
-<span class="keyword">class</span> iterator;
-</pre>
-    
-    <h5>Member functions</h5>
-      <dl>
-      <dt><code>iterator();</code> <dd> the deafult constructor; the underlying <code>octet_iterator</code> is
-      constructed with its default constructor.
-      <dt><code><span class="keyword">explicit</span> iterator (const octet_iterator&amp; octet_it); 
-                         </code> <dd> a constructor 
-      that initializes the underlying <code>octet_iterator</code> with <code>octet_it</code>
-      <dt><code>octet_iterator base () <span class="keyword">const</span>;</code> <dd> returns the 
-      underlying <code>octet_iterator</code>.
-      <dt><code>uint32_t operator * () <span class="keyword">const</span>;</code> <dd> decodes the utf-8 sequence
-      the underlying <code>octet_iterator</code> is pointing to and returns the code point.
-      <dt><code><span class="keyword">bool operator</span> == (const iterator&amp; rhs)
-      <span class="keyword">const</span>;</code> <dd> returns <span class="keyword">true</span>
-      if the two underlaying iterators are equal.
-      <dt><code><span class="keyword">bool operator</span> != (const iterator&amp; rhs)
-      <span class="keyword">const</span>;</code> <dd> returns <span class="keyword">true</span>
-      if the two underlaying iterators are not equal.
-      <dt><code>iterator&amp; <span class="keyword">operator</span> ++ (); </code> <dd> the prefix increment - moves
-      the iterator to the next UTF-8 encoded code point.
-      <dt><code>iterator <span class="keyword">operator</span> ++ (<span class="keyword">int</span>); </code> <dd>
-      the postfix increment - moves the iterator to the next UTF-8 encoded code point and returns the current one.
-      <dt><code>iterator&amp; <span class="keyword">operator</span> -- (); </code> <dd> the prefix decrement - moves
-      the iterator to the previous UTF-8 encoded code point.
-      <dt><code>iterator <span class="keyword">operator</span> -- (<span class="keyword">int</span>); </code> <dd>
-      the postfix decrement - moves the iterator to the previous UTF-8 encoded code point and returns the current one.
-      </dl>
-      <p>
-      Example of use:
-      </p>
-<pre>
-<span class="keyword">char</span>* threechars = <span class="literal">"\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88"</span>;
-utf8::unchecked::iterator&lt;<span class="keyword">char</span>*&gt; un_it(threechars);
-utf8::unchecked::iterator&lt;<span class="keyword">char</span>*&gt; un_it2 = un_it;
-assert (un_it2 == un_it);
-assert (*un_it == <span class="literal">0x10346</span>);
-assert (*(++un_it) == <span class="literal">0x65e5</span>);
-assert ((*un_it++) == <span class="literal">0x65e5</span>);
-assert (*un_it == <span class="literal">0x0448</span>);
-assert (un_it != un_it2);
-utf8::::unchecked::iterator&lt;<span class="keyword">char</span>*&gt; un_endit (threechars + <span class="literal">9</span>);  
-assert (++un_it == un_endit);
-assert (*(--un_it) == <span class="literal">0x0448</span>);
-assert ((*un_it--) == <span class="literal">0x0448</span>);
-assert (*un_it == <span class="literal">0x65e5</span>);
-assert (--un_it == utf8::unchecked::iterator&lt;<span class="keyword">char</span>*&gt;(threechars));
-assert (*un_it == <span class="literal">0x10346</span>);
-</pre>
-      <p>
-      This is an unchecked version of <code>utf8::iterator</code>. It is faster in many cases, but offers
-      no validity or range checks.
-      </p>
-    <h2 id="points">
-      Points of interest
-    </h2>
-    <h4>
-      Design goals and decisions
-    </h4>
-    <p>
-      The library was designed to be:
-    </p>
-    <ol>
-      <li>
-        Generic: for better or worse, there are many C++ string classes out there, and
-        the library should work with as many of them as possible.
-      </li>
-      <li>
-        Portable: the library should be portable both accross different platforms and
-        compilers. The only non-portable code is a small section that declares unsigned
-        integers of different sizes: three typedefs. They can be changed by the users of
-        the library if they don't match their platform. The default setting should work
-        for Windows (both 32 and 64 bit), and most 32 bit and 64 bit Unix derivatives.
-      </li>
-      <li>
-        Lightweight: follow the "pay only for what you use" guideline.
-      </li>
-      <li>
-        Unintrusive: avoid forcing any particular design or even programming style on the
-        user. This is a library, not a framework.
-      </li>
-    </ol>
-    <h4>
-      Alternatives
-    </h4>
-    <p>
-      In case you want to look into other means of working with UTF-8 strings from C++,
-      here is the list of solutions I am aware of:
-    </p>
-    <ol>
-      <li>
-        <a href="http://icu.sourceforge.net/">ICU Library</a>. It is very powerful,
-        complete, feature-rich, mature, and widely used. Also big, intrusive,
-        non-generic, and doesn't play well with the Standard Library. I definitelly
-        recommend looking at ICU even if you don't plan to use it.
-      </li>
-      <li>
-        <a href=
-        "http://www.gtkmm.org/gtkmm2/docs/tutorial/html/ch03s04.html">Glib::ustring</a>.
-        A class specifically made to work with UTF-8 strings, and also feel like
-        <code>std::string</code>. If you prefer to have yet another string class in your
-        code, it may be worth a look. Be aware of the licensing issues, though.
-      </li>
-      <li>
-        Platform dependent solutions: Windows and POSIX have functions to convert strings
-        from one encoding to another. That is only a subset of what my library offers,
-        but if that is all you need it may be good enough, especially given the fact that
-        these functions are mature and tested in production.
-      </li>
-    </ol>
-    <h2 id="conclusion">
-      Conclusion
-    </h2>
-    <p>
-      Until Unicode becomes officially recognized by the C++ Standard Library, we need to
-      use other means to work with UTF-8 strings. Template functions I describe in this
-      article may be a good step in this direction.
-    </p>
-    <h2 id="links">
-      Links
-    </h2>
-    <ol>
-      <li>
-        <a href="http://www.unicode.org/">The Unicode Consortium</a>.
-      </li>
-      <li>
-        <a href="http://icu.sourceforge.net/">ICU Library</a>.
-      </li>
-      <li>
-        <a href="http://en.wikipedia.org/wiki/UTF-8">UTF-8 at Wikipedia</a>
-      </li>
-      <li>
-        <a href="http://www.cl.cam.ac.uk/~mgk25/unicode.html">UTF-8 and Unicode FAQ for
-        Unix/Linux</a>
-      </li>
-    </ol>
-  </body>
-</html>
diff --git a/src/3rdparty/utf8cpp/2.3.2/qt_attribution.json b/src/3rdparty/utf8cpp/2.3.2/qt_attribution.json
deleted file mode 100644
index 42b1b666..00000000
--- a/src/3rdparty/utf8cpp/2.3.2/qt_attribution.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "Id": "utf8cpp",
-    "Name": "Utf8Cpp",
-    "QDocModule": "qt3dstudio",
-    "QtUsage": "Used by Qt3DStudio Studio and Runtime components.",
-
-    "Description": "A simple, portable and lightweight generic library for handling UTF-8 encoded strings.",
-    "Version": "2.3.2",
-    "Homepage": "http://utfcpp.sourceforge.net/",
-    "License": "Boost Software License",
-    "LicenseId": "BSL-1.0",
-    "Copyright": "Copyright 2006 Nemanja Trifunovic"
-}
diff --git a/src/3rdparty/utf8cpp/2.3.2/source/utf8.h b/src/3rdparty/utf8cpp/2.3.2/source/utf8.h
deleted file mode 100644
index 82b13f59..00000000
--- a/src/3rdparty/utf8cpp/2.3.2/source/utf8.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2006 Nemanja Trifunovic
-
-/*
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-*/
-
-
-#ifndef UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
-
-#include "utf8/checked.h"
-#include "utf8/unchecked.h"
-
-#endif // header guard
diff --git a/src/3rdparty/utf8cpp/2.3.2/source/utf8/checked.h b/src/3rdparty/utf8cpp/2.3.2/source/utf8/checked.h
deleted file mode 100644
index 3b006444..00000000
--- a/src/3rdparty/utf8cpp/2.3.2/source/utf8/checked.h
+++ /dev/null
@@ -1,327 +0,0 @@
-// Copyright 2006 Nemanja Trifunovic
-
-/*
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-*/
-
-
-#ifndef UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-
-#include "core.h"
-#include <stdexcept>
-
-namespace utf8
-{
-    // Base for the exceptions that may be thrown from the library
-    class exception : public ::std::exception {
-    };
-
-    // Exceptions that may be thrown from the library functions.
-    class invalid_code_point : public exception {
-        uint32_t cp;
-    public:
-        invalid_code_point(uint32_t cp) : cp(cp) {}
-        virtual const char* what() const throw() { return "Invalid code point"; }
-        uint32_t code_point() const {return cp;}
-    };
-
-    class invalid_utf8 : public exception {
-        uint8_t u8;
-    public:
-        invalid_utf8 (uint8_t u) : u8(u) {}
-        virtual const char* what() const throw() { return "Invalid UTF-8"; }
-        uint8_t utf8_octet() const {return u8;}
-    };
-
-    class invalid_utf16 : public exception {
-        uint16_t u16;
-    public:
-        invalid_utf16 (uint16_t u) : u16(u) {}
-        virtual const char* what() const throw() { return "Invalid UTF-16"; }
-        uint16_t utf16_word() const {return u16;}
-    };
-
-    class not_enough_room : public exception {
-    public:
-        virtual const char* what() const throw() { return "Not enough space"; }
-    };
-
-    /// The library API - functions intended to be called by the users
-
-    template <typename octet_iterator>
-    octet_iterator append(uint32_t cp, octet_iterator result)
-    {
-        if (!utf8::internal::is_code_point_valid(cp))
-            throw invalid_code_point(cp);
-
-        if (cp < 0x80)                        // one octet
-            *(result++) = static_cast<uint8_t>(cp);
-        else if (cp < 0x800) {                // two octets
-            *(result++) = static_cast<uint8_t>((cp >> 6)            | 0xc0);
-            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
-        }
-        else if (cp < 0x10000) {              // three octets
-            *(result++) = static_cast<uint8_t>((cp >> 12)           | 0xe0);
-            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)   | 0x80);
-            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
-        }
-        else {                                // four octets
-            *(result++) = static_cast<uint8_t>((cp >> 18)           | 0xf0);
-            *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f)  | 0x80);
-            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)   | 0x80);
-            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
-        }
-        return result;
-    }
-
-    template <typename octet_iterator, typename output_iterator>
-    output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, uint32_t replacement)
-    {
-        while (start != end) {
-            octet_iterator sequence_start = start;
-            internal::utf_error err_code = utf8::internal::validate_next(start, end);
-            switch (err_code) {
-                case internal::UTF8_OK :
-                    for (octet_iterator it = sequence_start; it != start; ++it)
-                        *out++ = *it;
-                    break;
-                case internal::NOT_ENOUGH_ROOM:
-                    throw not_enough_room();
-                case internal::INVALID_LEAD:
-                    utf8::append (replacement, out);
-                    ++start;
-                    break;
-                case internal::INCOMPLETE_SEQUENCE:
-                case internal::OVERLONG_SEQUENCE:
-                case internal::INVALID_CODE_POINT:
-                    utf8::append (replacement, out);
-                    ++start;
-                    // just one replacement mark for the sequence
-                    while (start != end && utf8::internal::is_trail(*start))
-                        ++start;
-                    break;
-            }
-        }
-        return out;
-    }
-
-    template <typename octet_iterator, typename output_iterator>
-    inline output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out)
-    {
-        static const uint32_t replacement_marker = utf8::internal::mask16(0xfffd);
-        return utf8::replace_invalid(start, end, out, replacement_marker);
-    }
-
-    template <typename octet_iterator>
-    uint32_t next(octet_iterator& it, octet_iterator end)
-    {
-        uint32_t cp = 0;
-        internal::utf_error err_code = utf8::internal::validate_next(it, end, cp);
-        switch (err_code) {
-            case internal::UTF8_OK :
-                break;
-            case internal::NOT_ENOUGH_ROOM :
-                throw not_enough_room();
-            case internal::INVALID_LEAD :
-            case internal::INCOMPLETE_SEQUENCE :
-            case internal::OVERLONG_SEQUENCE :
-                throw invalid_utf8(*it);
-            case internal::INVALID_CODE_POINT :
-                throw invalid_code_point(cp);
-        }
-        return cp;
-    }
-
-    template <typename octet_iterator>
-    uint32_t peek_next(octet_iterator it, octet_iterator end)
-    {
-        return utf8::next(it, end);
-    }
-
-    template <typename octet_iterator>
-    uint32_t prior(octet_iterator& it, octet_iterator start)
-    {
-        // can't do much if it == start
-        if (it == start)
-            throw not_enough_room();
-
-        octet_iterator end = it;
-        // Go back until we hit either a lead octet or start
-        while (utf8::internal::is_trail(*(--it)))
-            if (it == start)
-                throw invalid_utf8(*it); // error - no lead byte in the sequence
-        return utf8::peek_next(it, end);
-    }
-
-    /// Deprecated in versions that include "prior"
-    template <typename octet_iterator>
-    uint32_t previous(octet_iterator& it, octet_iterator pass_start)
-    {
-        octet_iterator end = it;
-        while (utf8::internal::is_trail(*(--it)))
-            if (it == pass_start)
-                throw invalid_utf8(*it); // error - no lead byte in the sequence
-        octet_iterator temp = it;
-        return utf8::next(temp, end);
-    }
-
-    template <typename octet_iterator, typename distance_type>
-    void advance (octet_iterator& it, distance_type n, octet_iterator end)
-    {
-        for (distance_type i = 0; i < n; ++i)
-            utf8::next(it, end);
-    }
-
-    template <typename octet_iterator>
-    typename std::iterator_traits<octet_iterator>::difference_type
-    distance (octet_iterator first, octet_iterator last)
-    {
-        typename std::iterator_traits<octet_iterator>::difference_type dist;
-        for (dist = 0; first < last; ++dist)
-            utf8::next(first, last);
-        return dist;
-    }
-
-    template <typename u16bit_iterator, typename octet_iterator>
-    octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
-    {
-        while (start != end) {
-            uint32_t cp = utf8::internal::mask16(*start++);
-            // Take care of surrogate pairs first
-            if (utf8::internal::is_lead_surrogate(cp)) {
-                if (start != end) {
-                    uint32_t trail_surrogate = utf8::internal::mask16(*start++);
-                    if (utf8::internal::is_trail_surrogate(trail_surrogate))
-                        cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
-                    else
-                        throw invalid_utf16(static_cast<uint16_t>(trail_surrogate));
-                }
-                else
-                    throw invalid_utf16(static_cast<uint16_t>(cp));
-
-            }
-            // Lone trail surrogate
-            else if (utf8::internal::is_trail_surrogate(cp))
-                throw invalid_utf16(static_cast<uint16_t>(cp));
-
-            result = utf8::append(cp, result);
-        }
-        return result;
-    }
-
-    template <typename u16bit_iterator, typename octet_iterator>
-    u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
-    {
-        while (start != end) {
-            uint32_t cp = utf8::next(start, end);
-            if (cp > 0xffff) { //make a surrogate pair
-                *result++ = static_cast<uint16_t>((cp >> 10)   + internal::LEAD_OFFSET);
-                *result++ = static_cast<uint16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
-            }
-            else
-                *result++ = static_cast<uint16_t>(cp);
-        }
-        return result;
-    }
-
-    template <typename octet_iterator, typename u32bit_iterator>
-    octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
-    {
-        while (start != end)
-            result = utf8::append(*(start++), result);
-
-        return result;
-    }
-
-    template <typename octet_iterator, typename u32bit_iterator>
-    u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
-    {
-        while (start != end)
-            (*result++) = utf8::next(start, end);
-
-        return result;
-    }
-
-    // The iterator class
-    template <typename octet_iterator>
-    class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
-      octet_iterator it;
-      octet_iterator range_start;
-      octet_iterator range_end;
-      public:
-      iterator () {};
-      explicit iterator (const octet_iterator& octet_it,
-                         const octet_iterator& range_start,
-                         const octet_iterator& range_end) :
-               it(octet_it), range_start(range_start), range_end(range_end)
-      {
-          if (it < range_start || it > range_end)
-              throw std::out_of_range("Invalid utf-8 iterator position");
-      }
-      // the default "big three" are OK
-      octet_iterator base () const { return it; }
-      uint32_t operator * () const
-      {
-          octet_iterator temp = it;
-          return utf8::next(temp, range_end);
-      }
-      bool operator == (const iterator& rhs) const
-      {
-          if (range_start != rhs.range_start || range_end != rhs.range_end)
-              throw std::logic_error("Comparing utf-8 iterators defined with different ranges");
-          return (it == rhs.it);
-      }
-      bool operator != (const iterator& rhs) const
-      {
-          return !(operator == (rhs));
-      }
-      iterator& operator ++ ()
-      {
-          utf8::next(it, range_end);
-          return *this;
-      }
-      iterator operator ++ (int)
-      {
-          iterator temp = *this;
-          utf8::next(it, range_end);
-          return temp;
-      }
-      iterator& operator -- ()
-      {
-          utf8::prior(it, range_start);
-          return *this;
-      }
-      iterator operator -- (int)
-      {
-          iterator temp = *this;
-          utf8::prior(it, range_start);
-          return temp;
-      }
-    }; // class iterator
-
-} // namespace utf8
-
-#endif //header guard
-
-
diff --git a/src/3rdparty/utf8cpp/2.3.2/source/utf8/core.h b/src/3rdparty/utf8cpp/2.3.2/source/utf8/core.h
deleted file mode 100644
index 693d388c..00000000
--- a/src/3rdparty/utf8cpp/2.3.2/source/utf8/core.h
+++ /dev/null
@@ -1,329 +0,0 @@
-// Copyright 2006 Nemanja Trifunovic
-
-/*
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-*/
-
-
-#ifndef UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-
-#include <iterator>
-
-namespace utf8
-{
-    // The typedefs for 8-bit, 16-bit and 32-bit unsigned integers
-    // You may need to change them to match your system.
-    // These typedefs have the same names as ones from cstdint, or boost/cstdint
-    typedef unsigned char   uint8_t;
-    typedef unsigned short  uint16_t;
-    typedef unsigned int    uint32_t;
-
-// Helper code - not intended to be directly called by the library users. May be changed at any time
-namespace internal
-{
-    // Unicode constants
-    // Leading (high) surrogates: 0xd800 - 0xdbff
-    // Trailing (low) surrogates: 0xdc00 - 0xdfff
-    const uint16_t LEAD_SURROGATE_MIN  = 0xd800u;
-    const uint16_t LEAD_SURROGATE_MAX  = 0xdbffu;
-    const uint16_t TRAIL_SURROGATE_MIN = 0xdc00u;
-    const uint16_t TRAIL_SURROGATE_MAX = 0xdfffu;
-    const uint16_t LEAD_OFFSET         = LEAD_SURROGATE_MIN - (0x10000 >> 10);
-    const uint32_t SURROGATE_OFFSET    = 0x10000u - (LEAD_SURROGATE_MIN << 10) - TRAIL_SURROGATE_MIN;
-
-    // Maximum valid value for a Unicode code point
-    const uint32_t CODE_POINT_MAX      = 0x0010ffffu;
-
-    template<typename octet_type>
-    inline uint8_t mask8(octet_type oc)
-    {
-        return static_cast<uint8_t>(0xff & oc);
-    }
-    template<typename u16_type>
-    inline uint16_t mask16(u16_type oc)
-    {
-        return static_cast<uint16_t>(0xffff & oc);
-    }
-    template<typename octet_type>
-    inline bool is_trail(octet_type oc)
-    {
-        return ((utf8::internal::mask8(oc) >> 6) == 0x2);
-    }
-
-    template <typename u16>
-    inline bool is_lead_surrogate(u16 cp)
-    {
-        return (cp >= LEAD_SURROGATE_MIN && cp <= LEAD_SURROGATE_MAX);
-    }
-
-    template <typename u16>
-    inline bool is_trail_surrogate(u16 cp)
-    {
-        return (cp >= TRAIL_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
-    }
-
-    template <typename u16>
-    inline bool is_surrogate(u16 cp)
-    {
-        return (cp >= LEAD_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
-    }
-
-    template <typename u32>
-    inline bool is_code_point_valid(u32 cp)
-    {
-        return (cp <= CODE_POINT_MAX && !utf8::internal::is_surrogate(cp));
-    }
-
-    template <typename octet_iterator>
-    inline typename std::iterator_traits<octet_iterator>::difference_type
-    sequence_length(octet_iterator lead_it)
-    {
-        uint8_t lead = utf8::internal::mask8(*lead_it);
-        if (lead < 0x80)
-            return 1;
-        else if ((lead >> 5) == 0x6)
-            return 2;
-        else if ((lead >> 4) == 0xe)
-            return 3;
-        else if ((lead >> 3) == 0x1e)
-            return 4;
-        else
-            return 0;
-    }
-
-    template <typename octet_difference_type>
-    inline bool is_overlong_sequence(uint32_t cp, octet_difference_type length)
-    {
-        if (cp < 0x80) {
-            if (length != 1) 
-                return true;
-        }
-        else if (cp < 0x800) {
-            if (length != 2) 
-                return true;
-        }
-        else if (cp < 0x10000) {
-            if (length != 3) 
-                return true;
-        }
-
-        return false;
-    }
-
-    enum utf_error {UTF8_OK, NOT_ENOUGH_ROOM, INVALID_LEAD, INCOMPLETE_SEQUENCE, OVERLONG_SEQUENCE, INVALID_CODE_POINT};
-
-    /// Helper for get_sequence_x
-    template <typename octet_iterator>
-    utf_error increase_safely(octet_iterator& it, octet_iterator end)
-    {
-        if (++it == end)
-            return NOT_ENOUGH_ROOM;
-
-        if (!utf8::internal::is_trail(*it))
-            return INCOMPLETE_SEQUENCE;
-        
-        return UTF8_OK;
-    }
-
-    #define UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(IT, END) {utf_error ret = increase_safely(IT, END); if (ret != UTF8_OK) return ret;}    
-
-    /// get_sequence_x functions decode utf-8 sequences of the length x
-    template <typename octet_iterator>
-    utf_error get_sequence_1(octet_iterator& it, octet_iterator end, uint32_t& code_point)
-    {
-        if (it == end)
-            return NOT_ENOUGH_ROOM;
-
-        code_point = utf8::internal::mask8(*it);
-
-        return UTF8_OK;
-    }
-
-    template <typename octet_iterator>
-    utf_error get_sequence_2(octet_iterator& it, octet_iterator end, uint32_t& code_point)
-    {
-        if (it == end) 
-            return NOT_ENOUGH_ROOM;
-        
-        code_point = utf8::internal::mask8(*it);
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point = ((code_point << 6) & 0x7ff) + ((*it) & 0x3f);
-
-        return UTF8_OK;
-    }
-
-    template <typename octet_iterator>
-    utf_error get_sequence_3(octet_iterator& it, octet_iterator end, uint32_t& code_point)
-    {
-        if (it == end)
-            return NOT_ENOUGH_ROOM;
-            
-        code_point = utf8::internal::mask8(*it);
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point = ((code_point << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point += (*it) & 0x3f;
-
-        return UTF8_OK;
-    }
-
-    template <typename octet_iterator>
-    utf_error get_sequence_4(octet_iterator& it, octet_iterator end, uint32_t& code_point)
-    {
-        if (it == end)
-           return NOT_ENOUGH_ROOM;
-
-        code_point = utf8::internal::mask8(*it);
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point = ((code_point << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point += (utf8::internal::mask8(*it) << 6) & 0xfff;
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point += (*it) & 0x3f;
-
-        return UTF8_OK;
-    }
-
-    #undef UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR
-
-    template <typename octet_iterator>
-    utf_error validate_next(octet_iterator& it, octet_iterator end, uint32_t& code_point)
-    {
-        // Save the original value of it so we can go back in case of failure
-        // Of course, it does not make much sense with i.e. stream iterators
-        octet_iterator original_it = it;
-
-        uint32_t cp = 0;
-        // Determine the sequence length based on the lead octet
-        typedef typename std::iterator_traits<octet_iterator>::difference_type octet_difference_type;
-        const octet_difference_type length = utf8::internal::sequence_length(it);
-
-        // Get trail octets and calculate the code point
-        utf_error err = UTF8_OK;
-        switch (length) {
-            case 0: 
-                return INVALID_LEAD;
-            case 1:
-                err = utf8::internal::get_sequence_1(it, end, cp);
-                break;
-            case 2:
-                err = utf8::internal::get_sequence_2(it, end, cp);
-            break;
-            case 3:
-                err = utf8::internal::get_sequence_3(it, end, cp);
-            break;
-            case 4:
-                err = utf8::internal::get_sequence_4(it, end, cp);
-            break;
-        }
-
-        if (err == UTF8_OK) {
-            // Decoding succeeded. Now, security checks...
-            if (utf8::internal::is_code_point_valid(cp)) {
-                if (!utf8::internal::is_overlong_sequence(cp, length)){
-                    // Passed! Return here.
-                    code_point = cp;
-                    ++it;
-                    return UTF8_OK;
-                }
-                else
-                    err = OVERLONG_SEQUENCE;
-            }
-            else 
-                err = INVALID_CODE_POINT;
-        }
-
-        // Failure branch - restore the original value of the iterator
-        it = original_it;
-        return err;
-    }
-
-    template <typename octet_iterator>
-    inline utf_error validate_next(octet_iterator& it, octet_iterator end) {
-        uint32_t ignored;
-        return utf8::internal::validate_next(it, end, ignored);
-    }
-
-} // namespace internal
-
-    /// The library API - functions intended to be called by the users
-
-    // Byte order mark
-    const uint8_t bom[] = {0xef, 0xbb, 0xbf};
-
-    template <typename octet_iterator>
-    octet_iterator find_invalid(octet_iterator start, octet_iterator end)
-    {
-        octet_iterator result = start;
-        while (result != end) {
-            utf8::internal::utf_error err_code = utf8::internal::validate_next(result, end);
-            if (err_code != internal::UTF8_OK)
-                return result;
-        }
-        return result;
-    }
-
-    template <typename octet_iterator>
-    inline bool is_valid(octet_iterator start, octet_iterator end)
-    {
-        return (utf8::find_invalid(start, end) == end);
-    }
-
-    template <typename octet_iterator>
-    inline bool starts_with_bom (octet_iterator it, octet_iterator end)
-    {
-        return (
-            ((it != end) && (utf8::internal::mask8(*it++)) == bom[0]) &&
-            ((it != end) && (utf8::internal::mask8(*it++)) == bom[1]) &&
-            ((it != end) && (utf8::internal::mask8(*it))   == bom[2])
-           );
-    }
-	
-    //Deprecated in release 2.3 
-    template <typename octet_iterator>
-    inline bool is_bom (octet_iterator it)
-    {
-        return (
-            (utf8::internal::mask8(*it++)) == bom[0] &&
-            (utf8::internal::mask8(*it++)) == bom[1] &&
-            (utf8::internal::mask8(*it))   == bom[2]
-           );
-    }
-} // namespace utf8
-
-#endif // header guard
-
-
diff --git a/src/3rdparty/utf8cpp/2.3.2/source/utf8/unchecked.h b/src/3rdparty/utf8cpp/2.3.2/source/utf8/unchecked.h
deleted file mode 100644
index b4547fad..00000000
--- a/src/3rdparty/utf8cpp/2.3.2/source/utf8/unchecked.h
+++ /dev/null
@@ -1,228 +0,0 @@
-// Copyright 2006 Nemanja Trifunovic
-
-/*
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-*/
-
-
-#ifndef UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-
-#include "core.h"
-
-namespace utf8
-{
-    namespace unchecked 
-    {
-        template <typename octet_iterator>
-        octet_iterator append(uint32_t cp, octet_iterator result)
-        {
-            if (cp < 0x80)                        // one octet
-                *(result++) = static_cast<uint8_t>(cp);  
-            else if (cp < 0x800) {                // two octets
-                *(result++) = static_cast<uint8_t>((cp >> 6)          | 0xc0);
-                *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
-            }
-            else if (cp < 0x10000) {              // three octets
-                *(result++) = static_cast<uint8_t>((cp >> 12)         | 0xe0);
-                *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
-                *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
-            }
-            else {                                // four octets
-                *(result++) = static_cast<uint8_t>((cp >> 18)         | 0xf0);
-                *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f)| 0x80);
-                *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
-                *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
-            }
-            return result;
-        }
-
-        template <typename octet_iterator>
-        uint32_t next(octet_iterator& it)
-        {
-            uint32_t cp = utf8::internal::mask8(*it);
-            typename std::iterator_traits<octet_iterator>::difference_type length = utf8::internal::sequence_length(it);
-            switch (length) {
-                case 1:
-                    break;
-                case 2:
-                    it++;
-                    cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f);
-                    break;
-                case 3:
-                    ++it; 
-                    cp = ((cp << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
-                    ++it;
-                    cp += (*it) & 0x3f;
-                    break;
-                case 4:
-                    ++it;
-                    cp = ((cp << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);                
-                    ++it;
-                    cp += (utf8::internal::mask8(*it) << 6) & 0xfff;
-                    ++it;
-                    cp += (*it) & 0x3f; 
-                    break;
-            }
-            ++it;
-            return cp;        
-        }
-
-        template <typename octet_iterator>
-        uint32_t peek_next(octet_iterator it)
-        {
-            return utf8::unchecked::next(it);    
-        }
-
-        template <typename octet_iterator>
-        uint32_t prior(octet_iterator& it)
-        {
-            while (utf8::internal::is_trail(*(--it))) ;
-            octet_iterator temp = it;
-            return utf8::unchecked::next(temp);
-        }
-
-        // Deprecated in versions that include prior, but only for the sake of consistency (see utf8::previous)
-        template <typename octet_iterator>
-        inline uint32_t previous(octet_iterator& it)
-        {
-            return utf8::unchecked::prior(it);
-        }
-
-        template <typename octet_iterator, typename distance_type>
-        void advance (octet_iterator& it, distance_type n)
-        {
-            for (distance_type i = 0; i < n; ++i)
-                utf8::unchecked::next(it);
-        }
-
-        template <typename octet_iterator>
-        typename std::iterator_traits<octet_iterator>::difference_type
-        distance (octet_iterator first, octet_iterator last)
-        {
-            typename std::iterator_traits<octet_iterator>::difference_type dist;
-            for (dist = 0; first < last; ++dist) 
-                utf8::unchecked::next(first);
-            return dist;
-        }
-
-        template <typename u16bit_iterator, typename octet_iterator>
-        octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
-        {       
-            while (start != end) {
-                uint32_t cp = utf8::internal::mask16(*start++);
-            // Take care of surrogate pairs first
-                if (utf8::internal::is_lead_surrogate(cp)) {
-                    uint32_t trail_surrogate = utf8::internal::mask16(*start++);
-                    cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
-                }
-                result = utf8::unchecked::append(cp, result);
-            }
-            return result;         
-        }
-
-        template <typename u16bit_iterator, typename octet_iterator>
-        u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
-        {
-            while (start < end) {
-                uint32_t cp = utf8::unchecked::next(start);
-                if (cp > 0xffff) { //make a surrogate pair
-                    *result++ = static_cast<uint16_t>((cp >> 10)   + internal::LEAD_OFFSET);
-                    *result++ = static_cast<uint16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
-                }
-                else
-                    *result++ = static_cast<uint16_t>(cp);
-            }
-            return result;
-        }
-
-        template <typename octet_iterator, typename u32bit_iterator>
-        octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
-        {
-            while (start != end)
-                result = utf8::unchecked::append(*(start++), result);
-
-            return result;
-        }
-
-        template <typename octet_iterator, typename u32bit_iterator>
-        u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
-        {
-            while (start < end)
-                (*result++) = utf8::unchecked::next(start);
-
-            return result;
-        }
-
-        // The iterator class
-        template <typename octet_iterator>
-          class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> { 
-            octet_iterator it;
-            public:
-            iterator () {};
-            explicit iterator (const octet_iterator& octet_it): it(octet_it) {}
-            // the default "big three" are OK
-            octet_iterator base () const { return it; }
-            uint32_t operator * () const
-            {
-                octet_iterator temp = it;
-                return utf8::unchecked::next(temp);
-            }
-            bool operator == (const iterator& rhs) const 
-            { 
-                return (it == rhs.it);
-            }
-            bool operator != (const iterator& rhs) const
-            {
-                return !(operator == (rhs));
-            }
-            iterator& operator ++ () 
-            {
-                ::std::advance(it, utf8::internal::sequence_length(it));
-                return *this;
-            }
-            iterator operator ++ (int)
-            {
-                iterator temp = *this;
-                ::std::advance(it, utf8::internal::sequence_length(it));
-                return temp;
-            }  
-            iterator& operator -- ()
-            {
-                utf8::unchecked::prior(it);
-                return *this;
-            }
-            iterator operator -- (int)
-            {
-                iterator temp = *this;
-                utf8::unchecked::prior(it);
-                return temp;
-            }
-          }; // class iterator
-
-    } // namespace utf8::unchecked
-} // namespace utf8 
-
-
-#endif // header guard
-
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 d0367220..00000000
--- a/src/Authoring/QT3DSDM/QT3DSDM.pro
+++ /dev/null
@@ -1,60 +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/utf8cpp/2.3.2/source \
-    ../../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/Palettes/Action/HandlerPropertyBaseSlider.qml b/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseSlider.qml
index 13e36516..7019dff2 100644
--- a/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseSlider.qml
+++ b/src/Authoring/Studio/Palettes/Action/HandlerPropertyBaseSlider.qml
@@ -43,8 +43,10 @@ Row {
     property alias desiredValue: slider.value // This is value adjusted by user
     property alias sliderMin: slider.from
     property alias sliderMax: slider.to
+    property real sliderDecimals: -1
     property bool intSlider: false
-    property int decimalSlider: Math.min(precision(slider.stepSize), 3)
+    property int decimalSlider: sliderDecimals >= 0 ? sliderDecimals
+                                                    : Math.min(precision(slider.stepSize), 3)
     property Item tabItem1: textField
 
     signal previewValue // Indicates desiredValue contains a preview value
@@ -226,7 +228,6 @@ Row {
                 text = sliderMin
             slider.value = text
             root.doCommitValue();
-
         }
 
         function setTextFieldValue() {
diff --git a/src/Authoring/Studio/Palettes/Action/PropertyModel.cpp b/src/Authoring/Studio/Palettes/Action/PropertyModel.cpp
index b19e2117..8024204d 100644
--- a/src/Authoring/Studio/Palettes/Action/PropertyModel.cpp
+++ b/src/Authoring/Studio/Palettes/Action/PropertyModel.cpp
@@ -89,8 +89,8 @@ void PropertyModel::setAction(const qt3dsdm::Qt3DSDMActionHandle &action)
                                                                           property.m_handle);
                         qt3dsdm::SMetaDataRange minMax =
                                 qt3dsdm::get<qt3dsdm::SMetaDataRange>(metaDataData);
-                        property.m_min = minMax.m_Min;
-                        property.m_max = minMax.m_Max;
+                        property.m_min = minMax.m_min;
+                        property.m_max = minMax.m_max;
                         break;
                     }
                     case qt3dsdm::AdditionalMetaDataType::StringList: {
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
index 7fb01bc2..53519573 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
@@ -52,6 +52,7 @@
 #include "Dispatch.h"
 #include "VariantsGroupModel.h"
 #include "StudioProjectSettings.h"
+#include "Literals.h"
 
 #include <QtCore/qfileinfo.h>
 
@@ -92,8 +93,8 @@ static std::pair<bool, bool> getSlideCharacteristics(qt3dsdm::Qt3DSDMInstanceHan
     // Get the slide from the instance.
     qt3dsdm::Qt3DSDMSlideHandle slide = slideCore.GetSlideByInstance(instance);
     qt3dsdm::Qt3DSDMSlideHandle master = slideSystem.GetMasterSlide(slide);
-    int index = (int)slideSystem.GetSlideIndex(slide);
-    int count = (int)slideSystem.GetSlideCount(master);
+    int index = int(slideSystem.GetSlideIndex(slide));
+    int count = int(slideSystem.GetSlideCount(master));
     bool hasNextSlide = index > 0 && index < count - 1;
     bool hasPreviousSlide = index > 1;
     return std::make_pair(hasNextSlide, hasPreviousSlide);
@@ -127,27 +128,15 @@ CInspectableBase *InspectorControlModel::inspectable() const
     return m_inspectableBase;
 }
 
-qt3dsdm::Qt3DSDMInstanceHandle getReferenceMaterial(CInspectableBase *inspectable)
+qt3dsdm::Qt3DSDMInstanceHandle InspectorControlModel::getReferenceMaterial(
+                                                                CInspectableBase *inspectable) const
 {
-    const auto bridge = g_StudioApp.GetCore()->GetDoc()->GetStudioSystem()
-                        ->GetClientDataModelBridge();
-
     if (inspectable)
-        return bridge->getMaterialReference(inspectable->getInstance());
+        return getBridge()->getMaterialReference(inspectable->getInstance());
 
     return 0;
 }
 
-CInspectableBase *getReferenceMaterialInspectable(CInspectableBase *inspectable)
-{
-    auto refMaterial = getReferenceMaterial(inspectable);
-
-    if (refMaterial.Valid())
-        return g_StudioApp.getInspectableFromInstance(refMaterial);
-
-    return nullptr;
-}
-
 void InspectorControlModel::notifyPropertyChanged(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                                   qt3dsdm::Qt3DSDMPropertyHandle inProperty)
 {
@@ -1136,7 +1125,9 @@ void InspectorControlModel::updatePropertyValue(InspectorControlBase *element) c
         }
 
         element->m_value = stringValue;
-    } // intentional fall-through for other String-derived datatypes
+    }
+    Q_FALLTHROUGH(); // fall-through for other String-derived datatypes
+
     case qt3dsdm::DataModelDataType::StringOrInt:
         if (element->m_propertyType == qt3dsdm::AdditionalMetaDataType::StringList) {
             QStringList stringlist;
@@ -1186,7 +1177,7 @@ void InspectorControlModel::updatePropertyValue(InspectorControlBase *element) c
                 // Add the slide names (exclude the master slide)
                 auto slideHandle = slideSystem->GetSlideByInstance(instance);
                 auto masterSlide = slideSystem->GetMasterSlide(slideHandle);
-                long slideCount = (long)slideSystem->GetSlideCount(masterSlide);
+                long slideCount = long(slideSystem->GetSlideCount(masterSlide));
                 for (long slideIndex = 1; slideIndex < slideCount; ++slideIndex) {
                     auto currentSlide = slideSystem->GetSlideByIndex(masterSlide, slideIndex);
                     auto currentInstance = slideSystem->GetSlideInstance(currentSlide);
@@ -1219,14 +1210,8 @@ void InspectorControlModel::updatePropertyValue(InspectorControlBase *element) c
             updateFontValues(element);
             skipEmits = true; // updateFontValues handles emits in correct order
         } else if (element->m_propertyType == qt3dsdm::AdditionalMetaDataType::Mesh) {
-            QString meshValue = qt3dsdm::get<QString>(value);
-            Q3DStudio::CFilePath theSelectionItem(Q3DStudio::CString::fromQString(meshValue));
-            Q3DStudio::CFilePath theSelectionWithoutId(theSelectionItem.filePath());
-            QString theSelectionWithoutIdName = theSelectionWithoutId.GetFileName().toQString();
-            if (theSelectionWithoutIdName.size())
-                element->m_value = theSelectionWithoutIdName;
-            else
-                element->m_value = theSelectionItem.GetIdentifier().toQString();
+            QString meshValue = QFileInfo(qt3dsdm::get<QString>(value)).fileName();
+            element->m_value = meshValue.startsWith('#'_L1) ? meshValue.mid(1) : meshValue;
         } else if (element->m_propertyType == qt3dsdm::AdditionalMetaDataType::Texture) {
             QFileInfo fileInfo(qt3dsdm::get<QString>(value));
             element->m_value = fileInfo.fileName();
@@ -1241,14 +1226,17 @@ void InspectorControlModel::updatePropertyValue(InspectorControlBase *element) c
                        << element->m_propertyType;
         }
         break;
+
     case qt3dsdm::DataModelDataType::StringRef:
         if (element->m_propertyType == qt3dsdm::AdditionalMetaDataType::None) {
             element->m_value = qt3dsdm::get<QString>(value);
         }
         break;
+
     case qt3dsdm::DataModelDataType::Bool:
         element->m_value = qt3dsdm::get<bool>(value);
         break;
+
     case qt3dsdm::DataModelDataType::Long4:
         if (element->m_propertyType == qt3dsdm::AdditionalMetaDataType::Image) {
             qt3dsdm::Option<qt3dsdm::SLong4> guid = qt3dsdm::get<qt3dsdm::SLong4>(value);
@@ -1266,6 +1254,7 @@ void InspectorControlModel::updatePropertyValue(InspectorControlBase *element) c
                        << element->m_dataType << " " << element->m_title;
         }
         break;
+
     case qt3dsdm::DataModelDataType::Long:
         if (element->m_propertyType == qt3dsdm::AdditionalMetaDataType::Range) {
             element->m_value = qt3dsdm::get<int>(value);
@@ -1273,12 +1262,12 @@ void InspectorControlModel::updatePropertyValue(InspectorControlBase *element) c
             if (m_guideInspectable) {
                 const auto prop = m_guideInspectable->properties()
                         [handleToGuidePropIndex(element->m_property)];
-                ranges.m_Min = prop->GetInspectableMin();
-                ranges.m_Max = prop->GetInspectableMax();
+                ranges.m_min = prop->GetInspectableMin();
+                ranges.m_max = prop->GetInspectableMax();
             } else {
                 ranges = qt3dsdm::get<qt3dsdm::SMetaDataRange>(info->m_MetaDataData);
             }
-            const QList<double> rangesValues{ranges.m_Min, ranges.m_Max};
+            const QList<double> rangesValues{ranges.m_min, ranges.m_max, double(ranges.m_decimals)};
             element->m_values = QVariant::fromValue<QList<double> >(rangesValues);
         }
         else if (element->m_propertyType == qt3dsdm::AdditionalMetaDataType::ShadowMapResolution) {
@@ -1288,6 +1277,7 @@ void InspectorControlModel::updatePropertyValue(InspectorControlBase *element) c
                        << element->m_dataType;
         }
         break;
+
     case qt3dsdm::DataModelDataType::Float3:
         if (element->m_propertyType == qt3dsdm::AdditionalMetaDataType::Color) {
             element->m_value = qt3dsdm::get<QColor>(value);
@@ -1301,11 +1291,13 @@ void InspectorControlModel::updatePropertyValue(InspectorControlBase *element) c
             element->m_values = QVariant::fromValue<QList<double> >(float3Values);
         }
         break;
+
     case qt3dsdm::DataModelDataType::Float4:
         if (element->m_propertyType == qt3dsdm::AdditionalMetaDataType::Color) {
             element->m_value = qt3dsdm::get<QColor>(value);
         }
         break;
+
     case qt3dsdm::DataModelDataType::Float2:
         if (element->m_propertyType == qt3dsdm::AdditionalMetaDataType::None) {
             const QVector2D theFloat2 = qt3dsdm::get<QVector2D>(value);
@@ -1316,18 +1308,20 @@ void InspectorControlModel::updatePropertyValue(InspectorControlBase *element) c
                        << element->m_dataType << element->m_propertyType;
         }
         break;
+
     case qt3dsdm::DataModelDataType::Float:
         if (element->m_propertyType == qt3dsdm::AdditionalMetaDataType::None) {
             element->m_value = qt3dsdm::get<float>(value);
         } else if (element->m_propertyType == qt3dsdm::AdditionalMetaDataType::Range) {
             element->m_value = qt3dsdm::get<float>(value);
             const qt3dsdm::SMetaDataRange ranges = qt3dsdm::get<qt3dsdm::SMetaDataRange>(info->m_MetaDataData);
-            const QList<double> rangesValues{ranges.m_Min, ranges.m_Max};
+            const QList<double> rangesValues{ranges.m_min, ranges.m_max, double(ranges.m_decimals)};
             element->m_values = QVariant::fromValue<QList<double> >(rangesValues);
         } else if (element->m_propertyType == qt3dsdm::AdditionalMetaDataType::FontSize) {
             element->m_value = qt3dsdm::get<float>(value);
         }
         break;
+
     case qt3dsdm::DataModelDataType::ObjectRef:
         if (element->m_propertyType == qt3dsdm::AdditionalMetaDataType::ObjectRef) {
             IObjectReferenceHelper *objRefHelper = doc->GetDataModelObjectReferenceHelper();
@@ -1347,6 +1341,7 @@ void InspectorControlModel::updatePropertyValue(InspectorControlBase *element) c
             }
         }
         break;
+
     default:
         qWarning() << "TODO: InspectorControlModel::updatePropertyValue: I've no idea how to handle this datatype"
                    << element->m_dataType;
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h
index e2f12831..3063f047 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h
@@ -219,6 +219,7 @@ private:
     bool isBasicMaterial(CInspectableBase *inspectable) const;
     void updateMaterialValues(const QStringList &values, int elementIndex,
                               bool updatingShaders = false);
+    qt3dsdm::Qt3DSDMInstanceHandle getReferenceMaterial(CInspectableBase *inspectable) const;
     void updateShaderValues();
     void updateMatDataValues();
     void updatePropertyValue(InspectorControlBase *element) const;
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.qml b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.qml
index ebb56023..c291de7b 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.qml
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.qml
@@ -777,6 +777,7 @@ Rectangle {
             value: parent.modelData.value
             sliderMin: values[0]
             sliderMax: values[1]
+            sliderDecimals: values[2]
 
             onCommitValue: _inspectorModel.setPropertyValue(instance, handle, desiredValue, true)
             onPreviewValue: _inspectorModel.setPropertyValue(instance, handle, desiredValue, false)
diff --git a/src/Authoring/Studio/Qt3DStudio.pro b/src/Authoring/Studio/Qt3DStudio.pro
index 160647c9..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
@@ -176,7 +177,6 @@ HEADERS += \
     Palettes/TimelineGraphicsView/KeyframeManager.h \
     Palettes/TimelineGraphicsView/RowManager.h \
     Palettes/TimelineGraphicsView/RowMover.h \
-    Palettes/TimelineGraphicsView/rowtypes.h \
     Palettes/TimelineGraphicsView/SelectionRect.h \
     Palettes/TimelineGraphicsView/TimelineConstants.h \
     Palettes/TimelineGraphicsView/TimelineControl.h \
@@ -470,6 +470,13 @@ CONFIG += exceptions
 target.path = $$[QT_INSTALL_BINS]
 INSTALLS += target
 
+# Install FBX SDK library for Linux
+linux:!isEmpty(QMAKE_LIBS_FBX) {
+    fbxsdk.files = $$str_member($$last(QMAKE_LIBS_FBX), 2, -1)/libfbxsdk.so
+    fbxsdk.path = $$[QT_INSTALL_LIBS]
+    INSTALLS += fbxsdk
+}
+
 RC_ICONS = images/3D-studio.ico
 ICON = images/studio.icns
 
diff --git a/src/Authoring/Studio/Render/StudioSubPresentationRenderer.cpp b/src/Authoring/Studio/Render/StudioSubPresentationRenderer.cpp
index 4e09dbf9..76e5f3c3 100644
--- a/src/Authoring/Studio/Render/StudioSubPresentationRenderer.cpp
+++ b/src/Authoring/Studio/Render/StudioSubPresentationRenderer.cpp
@@ -115,11 +115,7 @@ public:
         m_surfaceViewer->setUpdateInterval(-1);
         m_surfaceViewer->presentation()->setSource(QUrl::fromLocalFile(info.absoluteFilePath()));
         m_surfaceViewer->settings()->setMatteColor(Qt::transparent);
-#ifdef Q3DS_PREVIEW_SUBPRESENTATION_RT2
         m_surfaceViewer->create(m_surface.data(), m_context.data(), m_fbo->handle());
-#else
-        m_surfaceViewer->initialize(m_surface.data(), m_context.data(), m_fbo->handle());
-#endif
         m_running = true;
         m_semaphore.release();
 
@@ -157,11 +153,7 @@ public:
         m_context->doneCurrent();
         m_context.reset();
 #endif
-#ifdef Q3DS_PREVIEW_SUBPRESENTATION_RT2
         m_surfaceViewer->destroy();
-#else
-        m_surfaceViewer->shutdown();
-#endif
         m_surfaceViewer.reset();
         m_surface->moveToThread(m_mainThread);
         m_semaphore.release();
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/api/studio3d/q3dsdatainput.cpp b/src/Runtime/api/studio3d/q3dsdatainput.cpp
deleted file mode 100644
index b084ee4d..00000000
--- a/src/Runtime/api/studio3d/q3dsdatainput.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt 3D Studio.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "q3dsdatainput_p.h"
-#include "q3dspresentation_p.h"
-#include "q3dscommandqueue_p.h"
-
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-Q3DSDataInput::Q3DSDataInput(QObject *parent)
-    : QObject(parent)
-    , d_ptr(new Q3DSDataInputPrivate(this))
-{
-}
-
-Q3DSDataInput::Q3DSDataInput(const QString &name, QObject *parent)
-    : QObject(parent)
-    , d_ptr(new Q3DSDataInputPrivate(this))
-{
-    d_ptr->m_name = name;
-}
-
-Q3DSDataInput::Q3DSDataInput(Q3DSPresentation *presentation, const QString &name, QObject *parent)
-    : QObject(parent)
-    , d_ptr(new Q3DSDataInputPrivate(this))
-{
-    d_ptr->m_name = name;
-    d_ptr->m_presentation = presentation;
-    if (presentation)
-        presentation->registerDataInput(this);
-}
-
-Q3DSDataInput::Q3DSDataInput(Q3DSDataInputPrivate *d, Q3DSPresentation *presentation,
-                             const QString &name, QObject *parent)
-    : QObject(parent)
-    , d_ptr(d)
-{
-    d_ptr->m_name = name;
-    d_ptr->m_presentation = presentation;
-    if (presentation)
-        presentation->registerDataInput(this);
-}
-
-Q3DSDataInput::~Q3DSDataInput()
-{
-    delete d_ptr;
-}
-
-QString Q3DSDataInput::name() const
-{
-    return d_ptr->m_name;
-}
-
-void Q3DSDataInput::setName(const QString &name)
-{
-    if (d_ptr->m_name != name) {
-        d_ptr->m_name = name;
-        if (d_ptr->m_presentation)
-            d_ptr->m_presentation->registerDataInput(this);
-        Q_EMIT nameChanged();
-    }
-}
-
-QVariant Q3DSDataInput::value() const
-{
-    return d_ptr->m_value;
-}
-
-float Q3DSDataInput::min() const
-{
-    if (!d_ptr->m_presentation)
-        return 0.0f;
-
-    return d_ptr->m_presentation->d_ptr->dataInputMin(d_ptr->m_name);
-}
-
-float Q3DSDataInput::max() const
-{
-    if (!d_ptr->m_presentation)
-        return 0.0f;
-
-    return d_ptr->m_presentation->d_ptr->dataInputMax(d_ptr->m_name);
-}
-
-bool Q3DSDataInput::isValid() const
-{
-    if (d_ptr->m_presentation)
-        return d_ptr->m_presentation->d_ptr->isValidDataInput(this);
-    else
-        return false;
-}
-
-void Q3DSDataInput::setMin(float min)
-{
-    if (!d_ptr->m_presentation)
-        return;
-
-    d_ptr->m_presentation->setDataInputValue(d_ptr->m_name, min, ValueRole::Min);
-    d_ptr->m_min = min;
-    emit minChanged();
-}
-
-void Q3DSDataInput::setMax(float max)
-{
-    if (!d_ptr->m_presentation)
-        return;
-
-    d_ptr->m_presentation->setDataInputValue(d_ptr->m_name, max, ValueRole::Max);
-    d_ptr->m_max = max;
-    emit maxChanged();
-}
-
-void Q3DSDataInput::setValue(const QVariant &value)
-{
-    // Since properties controlled by data inputs can change without the current value being
-    // reflected on the value of the DataInput element, we allow setting the value to the
-    // same one it was previously and still consider it a change.
-    // For example, when controlling timeline, the value set to DataInput will only be
-    // the current value for one frame if presentation has a running animation.
-    // In order to track an element property, see DataOutput API.
-    d_ptr->setValue(value, ValueRole::Value);
-    Q_EMIT valueChanged();
-}
-
-void Q3DSDataInputPrivate::setPresentation(Q3DSPresentation *presentation)
-{
-    m_presentation = presentation;
-}
-
-Q3DSDataInputPrivate::Q3DSDataInputPrivate(Q3DSDataInput *parent)
-    : q_ptr(parent)
-{
-}
-
-Q3DSDataInputPrivate::~Q3DSDataInputPrivate()
-{
-    if (m_presentation)
-        m_presentation->unregisterDataInput(q_ptr);
-}
-
-void Q3DSDataInputPrivate::setValue(const QVariant &value, Q3DSDataInput::ValueRole valueRole)
-{
-    m_value = value;
-    if (m_presentation)
-        m_presentation->setDataInputValue(m_name, m_value, valueRole);
-}
-
-void Q3DSDataInputPrivate::setViewerApp(Q3DSViewer::Q3DSViewerApp *app)
-{
-    m_viewerApp = app;
-
-    if (m_viewerApp && m_value.isValid())
-        setValue(m_value);
-}
-
-void Q3DSDataInputPrivate::setCommandQueue(CommandQueue *queue)
-{
-    m_commandQueue = queue;
-
-    if (m_commandQueue && m_value.isValid())
-        setValue(m_value);
-}
-
-QT_END_NAMESPACE
diff --git a/src/Runtime/api/studio3d/q3dsdataoutput.cpp b/src/Runtime/api/studio3d/q3dsdataoutput.cpp
deleted file mode 100644
index e0db2dd5..00000000
--- a/src/Runtime/api/studio3d/q3dsdataoutput.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt 3D Studio.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "q3dsdataoutput_p.h"
-#include "q3dspresentation_p.h"
-#include "q3dscommandqueue_p.h"
-
-Q3DSDataOutput::Q3DSDataOutput(QObject *parent)
-  : QObject(parent)
-  , d_ptr(new Q3DSDataOutputPrivate(this))
-{
-
-}
-
-Q3DSDataOutput::Q3DSDataOutput(const QString &name, QObject *parent)
-    : QObject(parent)
-    , d_ptr(new Q3DSDataOutputPrivate(this))
-{
-    d_ptr->m_name = name;
-}
-
-Q3DSDataOutput::~Q3DSDataOutput()
-{
-    delete d_ptr;
-}
-
-QString Q3DSDataOutput::name() const
-{
-    return d_ptr->m_name;
-}
-
-void Q3DSDataOutput::setName(const QString &name)
-{
-    if (d_ptr->m_name != name) {
-        d_ptr->m_name = name;
-        if (d_ptr->m_presentation)
-            d_ptr->m_presentation->registerDataOutput(this);
-        Q_EMIT nameChanged(name);
-    }
-}
-
-QVariant Q3DSDataOutput::value() const
-{
-    return d_ptr->m_value;
-}
-
-void Q3DSDataOutput::setValue(const QVariant &value)
-{
-    if (d_ptr->m_value == value)
-        return;
-
-    d_ptr->m_value = value;
-    Q_EMIT valueChanged(value);
-}
-
-void Q3DSDataOutputPrivate::setPresentation(Q3DSPresentation *presentation)
-{
-    m_presentation = presentation;
-}
-
-Q3DSDataOutputPrivate::Q3DSDataOutputPrivate(Q3DSDataOutput *parent)
-    : q_ptr(parent)
-{
-}
-
-Q3DSDataOutputPrivate::~Q3DSDataOutputPrivate()
-{
-    if (m_presentation)
-        m_presentation->unregisterDataOutput(q_ptr);
-}
-
-void Q3DSDataOutputPrivate::setValue(const QVariant &value)
-{
-    m_value = value;
-    Q_EMIT q_ptr->valueChanged(value);
-}
-
-void Q3DSDataOutputPrivate::setViewerApp(Q3DSViewer::Q3DSViewerApp *app)
-{
-    m_viewerApp = app;
-
-    if (m_viewerApp && m_value.isValid())
-        setValue(m_value);
-}
-
-void Q3DSDataOutputPrivate::setCommandQueue(CommandQueue *queue)
-{
-    m_commandQueue = queue;
-
-    if (m_commandQueue && m_value.isValid())
-        setValue(m_value);
-}
diff --git a/src/Runtime/api/studio3d/q3dswidget.cpp b/src/Runtime/api/studio3d/q3dswidget.cpp
deleted file mode 100644
index 23334b5b..00000000
--- a/src/Runtime/api/studio3d/q3dswidget.cpp
+++ /dev/null
@@ -1,332 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 - 2016 NVIDIA Corporation.
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt 3D Studio.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "q3dswidget_p.h"
-#include "Qt3DSAudioPlayerImpl.h"
-#include "viewerqmlstreamproxy_p.h"
-#include "q3dsviewersettings_p.h"
-#include "q3dspresentation_p.h"
-#include "studioutils_p.h"
-#include "q3dsvariantconfig_p.h"
-
-#include <QtGui/qevent.h>
-#include <QtGui/qopenglcontext.h>
-#include <QtGui/QWindow>
-#include <QtCore/qfileinfo.h>
-#include <QtCore/qdebug.h>
-
-using namespace Q3DSViewer;
-
-QT_BEGIN_NAMESPACE
-
-typedef void (QWidget::*QWidgetVoidSlot)();
-
-Q3DSWidget::Q3DSWidget(QWidget *parent)
-    : QOpenGLWidget(parent)
-    , d_ptr(new Q3DSWidgetPrivate(this))
-{
-    // Get keyboard handling
-    setFocusPolicy(Qt::StrongFocus);
-    setMouseTracking(true);
-}
-
-Q3DSWidget::~Q3DSWidget()
-{
-    delete d_ptr;
-}
-
-bool Q3DSWidget::initialize()
-{
-    return d_ptr->initialize();
-}
-
-int Q3DSWidget::updateInterval() const
-{
-    return d_ptr->m_updateInterval;
-}
-
-bool Q3DSWidget::isRunning() const
-{
-    return d_ptr->m_viewerApp != nullptr;
-}
-
-Q3DSViewerSettings *Q3DSWidget::settings() const
-{
-    return d_ptr->settings();
-}
-
-Q3DSPresentation *Q3DSWidget::presentation() const
-{
-    return d_ptr->presentation();
-}
-
-void Q3DSWidget::initializeGL()
-{
-    // Find the native window to determine pixel ratio
-    QWidget *widget = this;
-    QWindow *window = windowHandle();
-    while (widget && window == nullptr) {
-        widget = qobject_cast<QWidget *>(widget->parent());
-        window = widget->windowHandle();
-    }
-    if (window)
-        d_ptr->m_pixelRatio = window->devicePixelRatio();
-}
-
-void Q3DSWidget::resizeGL(int w, int h)
-{
-    if (d_ptr->m_viewerApp)
-        d_ptr->m_viewerApp->Resize(int(w * d_ptr->m_pixelRatio), int(h * d_ptr->m_pixelRatio));
-}
-
-void Q3DSWidget::paintGL()
-{
-    if (d_ptr->m_viewerApp && d_ptr->m_viewerApp->IsInitialised())
-        d_ptr->m_viewerApp->Render();
-}
-
-void Q3DSWidget::setUpdateInterval(int interval)
-{
-    d_ptr->setUpdateInterval(interval);
-}
-
-void Q3DSWidget::shutdown()
-{
-    d_ptr->shutdown();
-}
-
-void Q3DSWidget::reset()
-{
-    d_ptr->reset();
-}
-
-void Q3DSWidget::mousePressEvent(QMouseEvent *event)
-{
-    if (d_ptr->m_pixelRatio != 1.0) {
-        QMouseEvent scaledEvent(event->type(), event->pos() * d_ptr->m_pixelRatio,
-                                event->button(), event->buttons(), event->modifiers());
-        d_ptr->m_presentation->mousePressEvent(&scaledEvent);
-    } else {
-        d_ptr->m_presentation->mousePressEvent(event);
-    }
-}
-
-void Q3DSWidget::mouseReleaseEvent(QMouseEvent *event)
-{
-    if (d_ptr->m_pixelRatio != 1.0) {
-        QMouseEvent scaledEvent(event->type(), event->pos() * d_ptr->m_pixelRatio,
-                                event->button(), event->buttons(), event->modifiers());
-        d_ptr->m_presentation->mouseReleaseEvent(&scaledEvent);
-    } else {
-        d_ptr->m_presentation->mouseReleaseEvent(event);
-    }
-}
-
-void Q3DSWidget::mouseMoveEvent(QMouseEvent *event)
-{
-    if (d_ptr->m_pixelRatio != 1.0) {
-        QMouseEvent scaledEvent(event->type(), event->pos() * d_ptr->m_pixelRatio,
-                                event->button(), event->buttons(), event->modifiers());
-        d_ptr->m_presentation->mouseMoveEvent(&scaledEvent);
-    } else {
-        d_ptr->m_presentation->mouseMoveEvent(event);
-    }
-}
-
-void Q3DSWidget::wheelEvent(QWheelEvent *event)
-{
-    d_ptr->m_presentation->wheelEvent(event);
-}
-
-void Q3DSWidget::keyPressEvent(QKeyEvent *event)
-{
-    d_ptr->m_presentation->keyPressEvent(event);
-}
-
-void Q3DSWidget::keyReleaseEvent(QKeyEvent *event)
-{
-    d_ptr->m_presentation->keyReleaseEvent(event);
-}
-
-Q3DSWidgetPrivate::Q3DSWidgetPrivate(Q3DSWidget *q)
-    : QObject(q)
-  , q_ptr(q)
-  , m_viewerApp(nullptr)
-  , m_timer(nullptr)
-  , m_updateInterval(-1)
-  , m_pixelRatio(1.0)
-  , m_settings(new Q3DSViewerSettings(this))
-  , m_presentation(new Q3DSPresentation(this))
-{
-    m_startupTimer.start();
-    connect(m_presentation, &Q3DSPresentation::sourceChanged, this, &Q3DSWidgetPrivate::reset);
-}
-
-Q3DSWidgetPrivate::~Q3DSWidgetPrivate()
-{
-    releaseRuntime();
-
-    delete m_timer;
-}
-
-void Q3DSWidgetPrivate::reset()
-{
-    if (m_viewerApp) {
-        releaseRuntime();
-        initializeRuntime();
-    }
-}
-
-void Q3DSWidgetPrivate::setUpdateInterval(int interval)
-{
-    if (m_updateInterval != interval) {
-        m_updateInterval = interval;
-        resetUpdateTimer();
-        Q_EMIT q_ptr->updateIntervalChanged(m_updateInterval);
-    }
-}
-
-bool Q3DSWidgetPrivate::initialize()
-{
-    Q_ASSERT(q_ptr->context());
-
-    if (m_presentation->source().isEmpty()) {
-        qWarning("Failed to initialize Q3DSWidget,"
-                 " presentation source must be set before calling initialize()");
-        return false;
-    }
-
-    QFileInfo info(Q3DSUtils::urlToLocalFileOrQrc(m_presentation->source()));
-    if (!info.exists()) {
-        qWarning() << "Failed to initialize Q3DSWidget, the presentation doesn't exist:"
-                   << m_presentation->source().toString();
-        return false;
-    }
-
-    shutdown();
-
-    connect(q_ptr->context(), &QOpenGLContext::aboutToBeDestroyed,
-            this, &Q3DSWidgetPrivate::shutdown);
-
-    bool success = initializeRuntime();
-
-    if (success)
-        Q_EMIT q_ptr->runningChanged(true);
-
-    return success;
-}
-
-Q3DSViewerSettings *Q3DSWidgetPrivate::settings()
-{
-    return m_settings;
-}
-
-Q3DSPresentation *Q3DSWidgetPrivate::presentation()
-{
-    return m_presentation;
-}
-
-void Q3DSWidgetPrivate::shutdown()
-{
-    bool oldInitialized = (m_viewerApp != nullptr);
-
-    if (q_ptr->context()) {
-        disconnect(q_ptr->context(), &QOpenGLContext::aboutToBeDestroyed,
-                   this, &Q3DSWidgetPrivate::shutdown);
-    }
-
-    releaseRuntime();
-
-    if (oldInitialized)
-        Q_EMIT q_ptr->runningChanged(false);
-}
-
-bool Q3DSWidgetPrivate::initializeRuntime()
-{
-    Q_ASSERT(!m_viewerApp);
-
-    q_ptr->makeCurrent();
-
-    m_viewerApp = &Q3DSViewerApp::Create(q_ptr->context(), new Qt3DSAudioPlayerImpl(),
-                                         &m_startupTimer);
-
-    Q_ASSERT(m_viewerApp);
-
-    const QString localSource = Q3DSUtils::urlToLocalFileOrQrc(m_presentation->source());
-
-    if (!m_viewerApp->InitializeApp(int(q_ptr->width() * m_pixelRatio),
-                                    int(q_ptr->height() * m_pixelRatio),
-                                    q_ptr->context()->format(),
-                                    q_ptr->defaultFramebufferObject(), localSource,
-                                    m_presentation->variantList(),
-                                    m_presentation->delayedLoading(),
-                                    m_presentation->d_ptr->streamProxy())) {
-        releaseRuntime();
-        qWarning("Failed to initialize runtime");
-        return false;
-    }
-
-    m_settings->d_ptr->setViewerApp(m_viewerApp);
-    m_presentation->d_ptr->setViewerApp(m_viewerApp);
-
-    resetUpdateTimer();
-
-    return true;
-}
-
-void Q3DSWidgetPrivate::releaseRuntime()
-{
-    m_settings->d_ptr->setViewerApp(nullptr);
-    m_presentation->d_ptr->setViewerApp(nullptr);
-
-    if (m_viewerApp) {
-        q_ptr->makeCurrent();
-        m_viewerApp->Release();
-        m_viewerApp = nullptr;
-    }
-
-    resetUpdateTimer();
-}
-
-void Q3DSWidgetPrivate::resetUpdateTimer()
-{
-    if (m_viewerApp && m_updateInterval >= 0) {
-        if (!m_timer) {
-            m_timer = new QTimer();
-            connect(m_timer, &QTimer::timeout,
-                    q_ptr, static_cast<QWidgetVoidSlot>(&QWidget::update));
-        }
-        m_timer->start(m_updateInterval);
-    } else if (m_timer) {
-        m_timer->stop();
-    }
-}
-
-QT_END_NAMESPACE
diff --git a/src/Runtime/api/studio3d/q3dswidget.h b/src/Runtime/api/studio3d/q3dswidget.h
deleted file mode 100644
index ad5d823d..00000000
--- a/src/Runtime/api/studio3d/q3dswidget.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 - 2016 NVIDIA Corporation.
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt 3D Studio.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef Q3DSWIDGET_H
-#define Q3DSWIDGET_H
-
-#include <QtStudio3D/qstudio3dglobal.h>
-#include <QtWidgets/QOpenGLWidget>
-#include <QtCore/QUrl>
-
-QT_BEGIN_NAMESPACE
-
-class Q3DSWidgetPrivate;
-class Q3DSViewerSettings;
-class Q3DSPresentation;
-
-class Q_STUDIO3D_EXPORT Q3DSWidget : public QOpenGLWidget
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(Q3DSWidget)
-    Q_PROPERTY(int updateInterval READ updateInterval WRITE setUpdateInterval NOTIFY updateIntervalChanged)
-    Q_PROPERTY(bool running READ isRunning NOTIFY runningChanged)
-
-public:
-    explicit Q3DSWidget(QWidget *parent = nullptr);
-    virtual ~Q3DSWidget();
-
-    bool initialize();
-
-    // Property accessors
-    int updateInterval() const;
-    bool isRunning() const;
-
-    Q3DSViewerSettings *settings() const;
-    Q3DSPresentation *presentation() const;
-
-public Q_SLOTS:
-    void setUpdateInterval(int interval);
-    void shutdown();
-    void reset();
-
-Q_SIGNALS:
-    void updateIntervalChanged(bool autoUpdate);
-    void runningChanged(bool initialized);
-
-protected:
-    // Qt event handling
-    void mousePressEvent(QMouseEvent *event) override;
-    void mouseReleaseEvent(QMouseEvent *event) override;
-    void mouseMoveEvent(QMouseEvent *event) override;
-    void wheelEvent(QWheelEvent *event) override;
-    void keyPressEvent(QKeyEvent *event) override;
-    void keyReleaseEvent(QKeyEvent *e) override;
-
-    // Qt overrides
-    void initializeGL() override;
-    void resizeGL(int w, int h) override;
-    void paintGL() override;
-
-private:
-    Q_DISABLE_COPY(Q3DSWidget)
-    Q3DSWidgetPrivate *d_ptr;
-};
-QT_END_NAMESPACE
-#endif // Q3DSWIDGET_H
diff --git a/src/Runtime/api/studio3d/q3dswidget_p.h b/src/Runtime/api/studio3d/q3dswidget_p.h
deleted file mode 100644
index 03ca6aac..00000000
--- a/src/Runtime/api/studio3d/q3dswidget_p.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 - 2016 NVIDIA Corporation.
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt 3D Studio.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the QtStudio3D API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-
-#ifndef Q3DSWIDGET_P_H
-#define Q3DSWIDGET_P_H
-
-#include "q3dswidget.h"
-#include "Qt3DSViewerApp.h"
-
-#include <QtCore/qtimer.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q3DSViewerSettings;
-class Q3DSPresentation;
-
-class Q_STUDIO3D_EXPORT Q3DSWidgetPrivate : public QObject
-{
-public:
-    Q_OBJECT
-    Q_DECLARE_PUBLIC(Q3DSWidget)
-
-public:
-    explicit Q3DSWidgetPrivate(Q3DSWidget *q);
-    virtual ~Q3DSWidgetPrivate();
-
-    void reset();
-    void setUpdateInterval(int interval);
-    bool initialize();
-
-    Q3DSViewerSettings *settings();
-    Q3DSPresentation *presentation();
-
-private Q_SLOTS:
-    void shutdown();
-
-private:
-    bool initializeRuntime();
-    void releaseRuntime();
-    void resetUpdateTimer();
-
-    Q3DSWidget *q_ptr;
-
-    Q3DSViewer::Q3DSViewerApp *m_viewerApp;
-    QTimer *m_timer;
-    int m_updateInterval;
-    qreal m_pixelRatio;
-    QElapsedTimer m_startupTimer;
-
-    Q3DSViewerSettings *m_settings;
-    Q3DSPresentation *m_presentation;
-};
-
-QT_END_NAMESPACE
-
-#endif // Q3DSWIDGET_P_H
diff --git a/src/Runtime/commoninclude.pri b/src/Runtime/commoninclude.pri
deleted file mode 100644
index 18e242e9..00000000
--- a/src/Runtime/commoninclude.pri
+++ /dev/null
@@ -1,84 +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/utf8cpp/2.3.2/source \
-    $$PWD/../3rdparty/color \
-    $$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/ogl-runtime/src/api/studio3d/q3dsdatainput.cpp b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdatainput.cpp
new file mode 100644
index 00000000..2e6281e6
--- /dev/null
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdatainput.cpp
@@ -0,0 +1,403 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt 3D Studio.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "q3dsdatainput_p.h"
+#include "q3dspresentation_p.h"
+#include "q3dscommandqueue_p.h"
+
+#include <QtCore/qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmltype DataInput
+    \instantiates Q3DSDataInput
+    \inqmlmodule Qt3DStudio
+    \ingroup OpenGLRuntime
+    \brief Controls a data input entry in a Qt 3D Studio presentation.
+    This class is a convenience class for controlling a data input in a presentation.
+    DataInput provides a clean contract between the presentation design and the code.
+    It hides the presentation details from the code while providing a contractual access
+    point to code for controlling aspects of the presentation (e.g. timeline of a
+    subpresentation). It also allows the design to use a single DataInput to drive
+    multiple aspects of the design (e.g. DataInput for speed can change the color of
+    the speedometer, angle of the needle).
+
+    \note There is a performance cost for each registered DataInput, so try to avoid
+    creating unnecessary DataInputs.
+
+    \sa Presentation, DataOutput, Presentation::slideExited, Presentation::slideEntered
+    \sa Presentation::customSignalEmitted
+*/
+
+/*!
+    \class Q3DSDataInput
+    \inmodule OpenGLRuntime
+    \since Qt 3D Studio 2.0
+    \brief Controls a data input entry in a Qt 3D Studio presentation.
+    This class is a convenience class for controlling a data input in a presentation.
+    DataInput provides a clean contract between the presentation design and the code.
+    It hides the presentation details from the code while providing a contractual access
+    point to code for controlling aspects of the presentation (e.g. timeline of a
+    subpresentation). It also allows the design to use a single DataInput to drive
+    multiple aspects of the design (e.g. DataInput for speed can change the color of
+    the speedometer, angle of the needle).
+
+    \note There is a performance cost for each registered DataInput, so try to avoid
+    creating unnecessary DataInputs.
+
+    For other integration points between code and presentation see:
+    \sa Q3DSPresentation::customSignalEmitted
+    \sa Q3DSPresentation::slideEntered
+    \sa Q3DSPresentation::slideExited
+    \sa Q3DSDataOutput
+
+    \sa Q3DSPresentation
+*/
+
+/*!
+    \internal
+ */
+Q3DSDataInput::Q3DSDataInput(QObject *parent)
+    : QObject(parent)
+    , d_ptr(new Q3DSDataInputPrivate(this))
+{
+}
+
+/*!
+    \internal
+ */
+Q3DSDataInput::Q3DSDataInput(const QString &name, QObject *parent)
+    : QObject(parent)
+    , d_ptr(new Q3DSDataInputPrivate(this))
+{
+    d_ptr->m_name = name;
+}
+
+/*!
+    Constructs a Q3DSDataInput instance and initializes the \a name. The
+    constructed instance is automatically associated with the specified \a
+    presentation. An optional \a parent object can be specified.
+ */
+Q3DSDataInput::Q3DSDataInput(Q3DSPresentation *presentation, const QString &name, QObject *parent)
+    : QObject(parent)
+    , d_ptr(new Q3DSDataInputPrivate(this))
+{
+    d_ptr->m_name = name;
+    d_ptr->m_presentation = presentation;
+    if (presentation)
+        presentation->registerDataInput(this);
+}
+
+/*!
+    \internal
+ */
+Q3DSDataInput::Q3DSDataInput(Q3DSDataInputPrivate *d, Q3DSPresentation *presentation,
+                             const QString &name, QObject *parent)
+    : QObject(parent)
+    , d_ptr(d)
+{
+    d_ptr->m_name = name;
+    d_ptr->m_presentation = presentation;
+    if (presentation)
+        presentation->registerDataInput(this);
+}
+
+/*!
+    Destructor.
+ */
+Q3DSDataInput::~Q3DSDataInput()
+{
+    delete d_ptr;
+}
+
+/*!
+    \qmlproperty string DataInput::name
+
+    Specifies the name of the controlled data input element in the
+    presentation. The name must match a name of a data input defined
+    in the presentation. This property must be set before setting the
+    value property.
+ */
+
+/*!
+    \property Q3DSDataInput::name
+
+    Specifies the name of the controlled data input element in the
+    presentation. The name must match a name of a data input defined
+    in the presentation.
+
+    This property must be set before setting the value property.
+    The initial value is provided via the constructor, but the name
+    can also be changed later on.
+ */
+QString Q3DSDataInput::name() const
+{
+    return d_ptr->m_name;
+}
+
+void Q3DSDataInput::setName(const QString &name)
+{
+    if (d_ptr->m_name != name) {
+        d_ptr->m_name = name;
+        if (d_ptr->m_presentation)
+            d_ptr->m_presentation->registerDataInput(this);
+        Q_EMIT nameChanged();
+    }
+}
+
+/*!
+    \qmlproperty variant DataInput::value
+
+    Specifies the value of the controlled data input element in the
+    presentation.
+
+    The value of this property only accounts for changes done via the same
+    Q3DSDataInput instance. If the value of the same data input in the
+    presentation is changed elsewhere, for example via animations or
+    Q3DSPresentation::setAttribute(), those changes are not reflected in the
+    value of this property. Due to this uncertainty, this property treats all
+    value sets as changes even if the newly set value is the same value as the
+    previous value.
+
+    To get actual values from the presentation, use DataOutput.
+    \sa DataOutput
+*/
+/*!
+    \property Q3DSDataInput::value
+
+    Specifies the value of the controlled data input element in the
+    presentation.
+
+    The value of this property only accounts for changes done via the same
+    Q3DSDataInput instance. If the value of the same data input in the
+    presentation is changed elsewhere, for example via animations or
+    Q3DSPresentation::setAttribute(), those changes are not reflected in the
+    value of this property. Due to this uncertainty, this property treats all
+    value sets as changes even if the newly set value is the same value as the
+    previous value.
+
+    To get actual values from the presentation, use DataOutput.
+    \sa DataOutput
+*/
+QVariant Q3DSDataInput::value() const
+{
+    return d_ptr->m_value;
+}
+
+/*!
+   \property Q3DSDataInput::min
+
+    Contains the minimum range value for datainput. Returned value is zero
+    for datainput types other than \e {Ranged Number}.
+
+    \note This value is read-only.
+ */
+float Q3DSDataInput::min() const
+{
+    if (!d_ptr->m_presentation)
+        return 0.0f;
+
+    return d_ptr->m_presentation->d_ptr->dataInputMin(d_ptr->m_name);
+}
+
+/*!
+    \property Q3DSDataInput::max
+
+    Contains the maximum range value for datainput. Returned value is zero
+    for datainput types other than \e {Ranged Number}.
+
+    \note This value is read-only.
+ */
+float Q3DSDataInput::max() const
+{
+    if (!d_ptr->m_presentation)
+        return 0.0f;
+
+    return d_ptr->m_presentation->d_ptr->dataInputMax(d_ptr->m_name);
+}
+
+/*!
+    Returns true if presentation (or its subpresentation) associated with
+    this datainput has a datainput definition with a matching name. Returns
+    false if the datainput has no associated presentation, or if a match is not found.
+ */
+bool Q3DSDataInput::isValid() const
+{
+    if (d_ptr->m_presentation)
+        return d_ptr->m_presentation->d_ptr->isValidDataInput(this);
+    else
+        return false;
+}
+
+/*!
+    \brief Q3DSDataInput::setValue Set value of the data input.
+    \param value New value to be set.
+    \note For performance reasons do not call setValue unnecessarily.
+ */
+void Q3DSDataInput::setValue(const QVariant &value)
+{
+    // Since properties controlled by data inputs can change without the current value being
+    // reflected on the value of the DataInput element, we allow setting the value to the
+    // same one it was previously and still consider it a change.
+    // For example, when controlling timeline, the value set to DataInput will only be
+    // the current value for one frame if presentation has a running animation.
+    // In order to track an element property, see DataOutput API.
+    d_ptr->setValue(value, ValueRole::Value);
+    Q_EMIT valueChanged();
+}
+
+void Q3DSDataInputPrivate::setPresentation(Q3DSPresentation *presentation)
+{
+    m_presentation = presentation;
+}
+
+Q3DSDataInputPrivate::Q3DSDataInputPrivate(Q3DSDataInput *parent)
+    : q_ptr(parent)
+{
+}
+
+Q3DSDataInputPrivate::~Q3DSDataInputPrivate()
+{
+    if (m_presentation)
+        m_presentation->unregisterDataInput(q_ptr);
+}
+
+void Q3DSDataInputPrivate::setValue(const QVariant &value, Q3DSDataInput::ValueRole valueRole)
+{
+    m_value = value;
+    if (m_presentation)
+        m_presentation->setDataInputValue(m_name, m_value, valueRole);
+}
+
+void Q3DSDataInputPrivate::setViewerApp(Q3DSViewer::Q3DSViewerApp *app)
+{
+    m_viewerApp = app;
+
+    if (m_viewerApp && m_value.isValid())
+        setValue(m_value);
+}
+
+void Q3DSDataInputPrivate::setCommandQueue(CommandQueue *queue)
+{
+    m_commandQueue = queue;
+
+    if (m_commandQueue && m_value.isValid())
+        setValue(m_value);
+}
+
+
+/*!
+    \qmltype DataInput
+    \instantiates Q3DSDataInput
+    \inqmlmodule QtStudio3D
+    \ingroup OpenGLRuntime
+
+    \brief Controls a data input entry in a Qt 3D Studio presentation.
+
+    This type is a convenience for controlling a data in a presentation. Its functionality is
+    equivalent to \c{Presentation::setDataInputValue()}, however it has a big advantage
+    of being able to use QML property bindings, thus avoiding the need to having to resort
+    to a JavaScript function call for every value change.
+
+    As an example:
+
+    \qml
+        Studio3D {
+            ...
+            Presentation {
+                id: presentation
+                ...
+                property string text: ""
+                DataInput {
+                    name: "inputForSomeTextNode"
+                    value: presentation.text
+                }
+            }
+        }
+
+        Button {
+            onClicked: presentation.text = "Hello World"
+        }
+    \endqml
+
+    The example assumes that a data input connection was made in Qt 3D Studio
+    presentation using Qt 3D Studio editor between the \c textstring property of
+    target property and a data input name \c inputForSomeTextNode. As the value
+    is now set via a property, the full set of QML property bindings techniques
+    are available.
+
+    \sa Studio3D, Presentation
+*/
+
+/*!
+    \qmlproperty string DataInput::name
+
+    Specifies the name of the controlled data input element in the
+    presentation. This property must be set as part of DataInput declaration,
+    although it is changeable afterwards, if desired.
+*/
+
+/*!
+    \qmlproperty variant DataInput::value
+
+    Specifies the value of the controlled data input element in the presentation.
+
+    The value of this property only accounts for changes done via the same
+    DataInput instance. If the value of the underlying attribute in the
+    presentation is changed elsewhere, for example via animations or
+    Presentation::setAttribute(), those changes are not reflected in the value
+    of this property. Due to this uncertainty, this property treats all value
+    sets as changes even if the newly set value is the same value as the
+    previous value.
+*/
+
+/*!
+    \qmlproperty real DataInput::min
+
+    Contains the minimum value of the controlled data input element range.
+
+    This property is applicable only to data input type \e {Ranged Number}. For other
+    types, value returned is zero.
+
+    \note This value is read-only.
+*/
+
+/*!
+    \qmlproperty real DataInput::max
+
+    Contains the maximum value of the controlled data input element range.
+
+    This property is applicable only to data input type \e {Ranged Number}. For other
+    types, value returned is zero.
+
+    \note This value is read-only.
+*/
+
+QT_END_NAMESPACE
diff --git a/src/Runtime/api/studio3d/q3dsdatainput.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdatainput.h
index d57b5f18..4504e5d2 100644
--- a/src/Runtime/api/studio3d/q3dsdatainput.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdatainput.h
@@ -46,8 +46,8 @@ class Q_STUDIO3D_EXPORT Q3DSDataInput : public QObject
 
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
-    Q_PROPERTY(float max READ max WRITE setMax NOTIFY maxChanged)
-    Q_PROPERTY(float min READ min WRITE setMin NOTIFY minChanged)
+    Q_PROPERTY(float max READ max CONSTANT)
+    Q_PROPERTY(float min READ min CONSTANT)
 public:
     explicit Q3DSDataInput(QObject *parent = nullptr);
     explicit Q3DSDataInput(const QString &name, QObject *parent = nullptr);
@@ -71,14 +71,10 @@ public:
 public Q_SLOTS:
     void setName(const QString &name);
     void setValue(const QVariant &value);
-    void setMin(float min);
-    void setMax(float max);
 
 Q_SIGNALS:
     void nameChanged();
     void valueChanged();
-    void minChanged();
-    void maxChanged();
 
 protected:
     explicit Q3DSDataInput(Q3DSDataInputPrivate *d, Q3DSPresentation *presentation,
@@ -88,6 +84,7 @@ protected:
 private:
     Q_DISABLE_COPY(Q3DSDataInput)
     friend class Q3DSPresentationPrivate;
+    friend class Q3DSRenderer;
 };
 
 QT_END_NAMESPACE
diff --git a/src/Runtime/api/studio3d/q3dsdatainput_p.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdatainput_p.h
index 8f5be06f..6107add9 100644
--- a/src/Runtime/api/studio3d/q3dsdatainput_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdatainput_p.h
@@ -75,6 +75,7 @@ protected:
     float m_min = 0;
 
     friend class Q3DSPresentationPrivate;
+    friend class Q3DSRenderer;
 };
 
 QT_END_NAMESPACE
diff --git a/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdataoutput.cpp b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdataoutput.cpp
new file mode 100644
index 00000000..3cb13a0e
--- /dev/null
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsdataoutput.cpp
@@ -0,0 +1,225 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt 3D Studio.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "q3dsdataoutput_p.h"
+#include "q3dspresentation_p.h"
+#include "q3dscommandqueue_p.h"
+
+/*!
+    \qmltype DataOutput
+    \instantiates Q3DSDataOutput
+    \inqmlmodule Qt3DStudio
+    \ingroup OpenGLRuntime
+    \brief Provides notifications from data output entries in Qt 3D Studio presentation.
+    This class is a convenience class for listening for changes in the Qt 3D Studio
+    presentation attributes. DataOutput provides a clean contract between the presentation
+    design and the code. It hides the presentation details from the code while providing a
+    contractual access point to code to be notified when aspects of the presentation change
+    (e.g. movement of an element in the presentation due to timeline animation).
+
+    DataOutput can be attached to same attributes in the design as DataInput is, including
+    presentation timeline. Only exception is slide changes. Slide changes are already notified
+    through \c{Presentation::slideEntered} and \c{Presentation::slideExited} signals.
+
+    \note There is a performance cost for each registered DataOutput, so try to avoid
+    creating unnecessary DataOutputs.
+
+    \sa Presentation, DataInput, Presentation::slideExited, Presentation::slideEntered
+    \sa Presentation::customSignalEmitted
+*/
+
+/*!
+    \class Q3DSDataOutput
+    \inmodule OpenGLRuntime
+    \since Qt 3D Studio 2.4
+    \brief Provides notifications from data output entries in Qt 3D Studio presentation.
+    This class is a convenience class for listening for changes in the Qt 3D Studio
+    presentation attributes. DataOutput provides a clean contract between the presentation
+    design and the code. It hides the presentation details from the code while providing a
+    contractual access point to code to be notified when aspects of the presentation change
+    (e.g. movement of an element in the presentation due to timeline animation).
+
+    DataOutput can be attached to same attributes in the design as DataInput is, including
+    presentation timeline. Only excaption is slide changes Slide changes are already notified
+    through \c{Q3DSPresentation::slideEntered} and \c{Q3DSPresentation::slideExited} signals.
+
+    \note There is a performance cost for each registered DataOutput, so try to avoid
+    creating unnecessary DataOutputs.
+
+    For other integration points between code and presentation see:
+    \sa Q3DSPresentation::customSignalEmitted
+    \sa Q3DSPresentation::slideEntered
+    \sa Q3DSPresentation::slideExited
+    \sa Q3DSDataInput
+
+    \sa Q3DSPresentation
+*/
+Q3DSDataOutput::Q3DSDataOutput(QObject *parent)
+  : QObject(parent)
+  , d_ptr(new Q3DSDataOutputPrivate(this))
+{
+
+}
+
+Q3DSDataOutput::Q3DSDataOutput(const QString &name, QObject *parent)
+    : QObject(parent)
+    , d_ptr(new Q3DSDataOutputPrivate(this))
+{
+    d_ptr->m_name = name;
+}
+
+Q3DSDataOutput::~Q3DSDataOutput()
+{
+    delete d_ptr;
+}
+
+/*!
+    \qmlproperty string DataOutput::name
+
+    Specifies the name of the observed data output element in the
+    presentation. The name must match a name of a data output defined
+    in the presentation. This property must be set before setting the value
+    property.
+ */
+
+/*!
+    \property Q3DSDataOutput::name
+
+    Specifies the name of the observed data output element in the
+    presentation. The name must match a name of a data output defined
+    in the presentation.
+
+    This property must be set before setting the value property.
+    The initial value is provided via the constructor, but the name
+    can also be changed later on.
+ */
+QString Q3DSDataOutput::name() const
+{
+    return d_ptr->m_name;
+}
+
+void Q3DSDataOutput::setName(const QString &name)
+{
+    if (d_ptr->m_name != name) {
+        d_ptr->m_name = name;
+        if (d_ptr->m_presentation)
+            d_ptr->m_presentation->registerDataOutput(this);
+        Q_EMIT nameChanged(name);
+    }
+}
+
+/*!
+    \qmlproperty DataOutput::value
+
+    Contains the read-only value of the controlled data output element in the
+    presentation.
+
+    The value of this property accounts for actual value in the last processed
+    frame of the presentation. This includes animation timeline driven changes,
+    changes done via DataInput and changes done via Behavior scripts.
+*/
+
+/*!
+    \property Q3DSDataOutput::value
+
+    Contains the read-only value of the controlled data output element in the
+    presentation.
+
+    The value of this property accounts for actual value in the last processed
+    frame of the presentation. This includes animation timeline driven changes,
+    changes done via DataInput and changes done via Behavior scripts.
+*/
+QVariant Q3DSDataOutput::value() const
+{
+    return d_ptr->m_value;
+}
+
+/*!
+ * \qmlsignal DataOutput::valueChanged
+    Emitted when the value of the observed DataOutput has changed in the
+    presentation.
+    \param newValue The new value of the observed DataOutput.
+ */
+
+/*!
+    \fn Q3DSDataOutput::valueChanged
+    Emitted when the value of the observed DataOutput has changed in the
+    presentation.
+    \param newValue The new value of the observed DataOutput.
+ */
+
+/*!
+ * \internal
+ */
+void Q3DSDataOutput::setValue(const QVariant &value)
+{
+    if (d_ptr->m_value == value)
+        return;
+
+    d_ptr->m_value = value;
+    Q_EMIT valueChanged(value);
+}
+
+void Q3DSDataOutputPrivate::setPresentation(Q3DSPresentation *presentation)
+{
+    m_presentation = presentation;
+}
+
+Q3DSDataOutputPrivate::Q3DSDataOutputPrivate(Q3DSDataOutput *parent)
+    : q_ptr(parent)
+{
+}
+
+Q3DSDataOutputPrivate::~Q3DSDataOutputPrivate()
+{
+    if (m_presentation)
+        m_presentation->unregisterDataOutput(q_ptr);
+}
+
+void Q3DSDataOutputPrivate::setValue(const QVariant &value)
+{
+    m_value = value;
+    Q_EMIT q_ptr->valueChanged(value);
+}
+
+void Q3DSDataOutputPrivate::setViewerApp(Q3DSViewer::Q3DSViewerApp *app)
+{
+    m_viewerApp = app;
+
+    if (m_viewerApp && m_value.isValid())
+        setValue(m_value);
+}
+
+void Q3DSDataOutputPrivate::setCommandQueue(CommandQueue *queue)
+{
+    m_commandQueue = queue;
+
+    if (m_commandQueue && m_value.isValid())
+        setValue(m_value);
+}
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 ac3221dd..16ae1102 100644
--- a/src/Runtime/api/studio3d/q3dselement.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dselement.cpp
@@ -37,12 +37,58 @@
 
 QT_BEGIN_NAMESPACE
 
+/*!
+    \qmltype Element
+    \instantiates Q3DSElement
+    \inqmlmodule Qt3DStudio
+    \ingroup OpenGLRuntime
+    \brief Control type for elements in a Qt 3D Studio presentation.
+
+    This class is provided for backwards compatibility. We recommend using
+    DataInput and DataOutput APIs for contractual and clean API between
+    the design and the code.
+
+    \sa DataInput, DataOutput
+
+    This type is a convenience for controlling the properties of a scene object
+    (such as, model, material, camera, layer) in a Qt 3D Studio presentation.
+
+    \note The functionality of Element is equivalent to
+    Presentation::setAttribute() and Presentation::fireEvent().
+
+    \sa Studio3D, SceneElement, Presentation, DataInput, DataOutput
+*/
+
+/*!
+    \class Q3DSElement
+    \inmodule OpenGLRuntime
+    \since Qt 3D Studio 2.0
+
+    \brief Controls a scene object (node) in a Qt 3D Studio presentation.
+
+    This class is provided for backwards compatibility. We recommend using
+    DataInput and DataOutput APIs for contractual and clean API between
+    the design and the code.
+
+    This class is a convenience class for controlling the properties of a scene
+    object (such as, model, material, camera, layer) in a Qt 3D Studio
+    presentation.
+
+    \sa Q3DSWidget, Q3DSSurfaceViewer, Q3DSSceneElement
+ */
+
+/*!
+    \internal
+ */
 Q3DSElement::Q3DSElement(QObject *parent)
     : QObject(parent)
     , d_ptr(new Q3DSElementPrivate(this))
 {
 }
 
+/*!
+    \internal
+ */
 Q3DSElement::Q3DSElement(const QString &elementPath, QObject *parent)
     : QObject(parent)
     , d_ptr(new Q3DSElementPrivate(this))
@@ -50,6 +96,12 @@ Q3DSElement::Q3DSElement(const QString &elementPath, QObject *parent)
     d_ptr->m_elementPath = elementPath;
 }
 
+/*!
+    Constructs a Q3DSElement instance controlling the scene object specified by
+    \a elementPath. An optional \a parent object can be specified. The
+    constructed instance is automatically associated with the specified \a
+    presentation. An optional \a parent object can be specified.
+ */
 Q3DSElement::Q3DSElement(Q3DSPresentation *presentation, const QString &elementPath,
                          QObject *parent)
     : QObject(parent)
@@ -60,6 +112,9 @@ Q3DSElement::Q3DSElement(Q3DSPresentation *presentation, const QString &elementP
         presentation->registerElement(this);
 }
 
+/*!
+    \internal
+ */
 Q3DSElement::Q3DSElement(Q3DSElementPrivate *d, Q3DSPresentation *presentation,
                          const QString &elementPath, QObject *parent)
     : QObject(parent)
@@ -70,12 +125,54 @@ Q3DSElement::Q3DSElement(Q3DSElementPrivate *d, Q3DSPresentation *presentation,
         presentation->registerElement(this);
 }
 
+/*!
+    Destructor.
+ */
 Q3DSElement::~Q3DSElement()
 {
     // Private class isn't QObject, so we need to delete it explicitly
     delete d_ptr;
 }
 
+/*!
+    \qmlproperty string Element::elementPath
+
+    Holds the element path of the presentation element.
+
+    An element path refers to an object in the scene by name, for example,
+    \c{Scene.Layer.Camera}. Here the right camera object gets chosen even if
+    the scene contains other layers with the default camera names (for instance
+    \c{Scene.Layer2.Camera}).
+
+    To reference an object stored in a property of another object, the dot
+    syntax can be used. The most typical example of this is changing the source
+    of a texture map by changing the \c sourcepath property on the object
+    selected by \c{SomeMaterial.diffusemap}.
+
+    To access an object in a sub-presentation, prepend the name of the
+    sub-presentation followed by a colon, for example,
+    \c{SubPresentationOne:Scene.Layer.Camera}.
+ */
+
+/*!
+    \property Q3DSElement::elementPath
+
+    Holds the element path of the presentation element.
+
+    An element path refers to an object in the scene by name, for example,
+    \c{Scene.Layer.Camera}. Here the right camera object gets chosen even if
+    the scene contains other layers with the default camera names (for instance
+    \c{Scene.Layer2.Camera}).
+
+    To reference an object stored in a property of another object, the dot
+    syntax can be used. The most typical example of this is changing the source
+    of a texture map by changing the \c sourcepath property on the object
+    selected by \c{SomeMaterial.diffusemap}.
+
+    To access an object in a sub-presentation, prepend the name of the
+    sub-presentation followed by a colon, for example,
+    \c{SubPresentationOne:Scene.Layer.Camera}.
+ */
 QString Q3DSElement::elementPath() const
 {
     return d_ptr->m_elementPath;
@@ -89,6 +186,20 @@ void Q3DSElement::setElementPath(const QString &elementPath)
     }
 }
 
+/*!
+    \qmlmethod void Element::setAttribute(string attributeName, variant value)
+
+    Sets the \a value of an attribute (property) of the scene object specified
+    by this Element instance. The \a attributeName is the \l{Attribute
+    Names}{scripting name} of the attribute.
+*/
+
+/*!
+    Sets the \a value of an attribute (property) of the scene object
+    specified by elementPath.
+
+    The \a attributeName is the \l{Attribute Names}{scripting name} of the attribute.
+ */
 void Q3DSElement::setAttribute(const QString &attributeName, const QVariant &value)
 {
     if (d_ptr->m_presentation)
@@ -97,6 +208,25 @@ void Q3DSElement::setAttribute(const QString &attributeName, const QVariant &val
         qWarning() << __FUNCTION__ << "Element is not registered to any presentation!";
 }
 
+/*!
+    \qmlmethod void Element::fireEvent(string eventName)
+
+    Dispatches an event with \a eventName on the scene object
+    specified by elementPath.
+
+    Appropriate actions created in Qt 3D Studio or callbacks registered using
+    the registerForEvent() method in attached \c{behavior scripts} will be
+    executed in response to the event.
+*/
+
+/*!
+    Dispatches an event with \a eventName on the scene object
+    specified by elementPath.
+
+    Appropriate actions created in Qt 3D Studio or callbacks registered using
+    the registerForEvent() method in attached (behavior) scripts will be
+    executed in response to the event.
+ */
 void Q3DSElement::fireEvent(const QString &eventName)
 {
     if (d_ptr->m_presentation)
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 40bb95b9..0968e3f1 100644
--- a/src/Runtime/api/studio3d/q3dsimagesequencegeneratorthread.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsimagesequencegeneratorthread.cpp
@@ -131,7 +131,7 @@ void Q3DSImageSequenceGeneratorThread::run() {
     viewer.setAutoSize(false);
     viewer.setSize(size);
 
-    if (!viewer.initialize(m_surface, m_context, fbo.handle())) {
+    if (!viewer.create(m_surface, m_context, fbo.handle())) {
         QString error = QObject::tr("Viewer initialization failed.");
         qWarning() << "Generating image sequence failed -" << error;
         Q_EMIT generationFinished(false, error);
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 8370dbb6..204b2035 100644
--- a/src/Runtime/api/studio3d/q3dspresentation.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dspresentation.cpp
@@ -42,71 +42,266 @@
 
 QT_BEGIN_NAMESPACE
 
+/*!
+    \class Q3DSPresentation
+    \inmodule OpenGLRuntime
+    \since Qt 3D Studio 2.0
+
+    \brief Represents a Qt 3D Studio presentation.
+
+    This class provides properties and methods for controlling a
+    presentation.
+
+    Qt 3D Studio supports multiple presentations in one project. There
+    is always a main presentation and zero or more
+    subpresentations. The subpresentations are composed into the
+    main presentations either as contents of Qt 3D Studio layers or as
+    texture maps.
+
+    In the filesystem each presentation corresponds to one \c{.uip}
+    presentation file. When present, the \c{.uia} project file ties
+    these together by specifying a name for each of the
+    (sub-)presentations and specifies which one is the main one.
+
+    The \c{.uia} project also defines \l{DataInput}s and
+    \l{DataOutput}s that are exported by the presentations.
+    \l{DataInput}s provide a way to provide input to the presentation
+    to e.g. control a timeline of a subpresentation from code.
+    \c{DataOutput}s provide a way to get notified when an attribute
+    is changed in the presentation by animation timeline,
+    by behavior scripts or by a \l{DataInput}.
+
+    From the API point of view Q3DSPresentation corresponds to the
+    main presentation. The source property can refer either to a
+    \c{.uia} or \c{.uip} file. When specifying a file with \c{.uip}
+    extension and a \c{.uia} is present with the same name, the
+    \c{.uia} is loaded automatically and thus sub-presentation
+    information is available regardless.
+
+    \note This class should not be instantiated directly when working with the
+    C++ APIs. Q3DSSurfaceViewer and Q3DSWidget create a Q3DSPresentation
+    instance implicitly. This can be queried via
+    Q3DSSurfaceViewer::presentation() or Q3DSWidget::presentation().
+ */
+
+/*!
+    Constructs a new Q3DSPresentation with the given \a parent.
+ */
 Q3DSPresentation::Q3DSPresentation(QObject *parent)
     : QObject(parent)
     , d_ptr(new Q3DSPresentationPrivate(this))
 {
 }
 
+/*!
+    Destructor.
+ */
 Q3DSPresentation::~Q3DSPresentation()
 {
 }
 
+/*!
+    \qmlproperty string Presentation::source
+
+    Holds the name of the main presentation file (\c{*.uia} or
+    \c{*.uip}). This may be either a local file or qrc URL.
+
+    The names of all further assets (image files for texture maps, qml
+    behavior scripts, mesh files) will be resolved relative to the
+    location of the presentation, unless they use absolute paths. This
+    allows bundling all assets next to the presentation in the Qt
+    resource system.
+
+    Currently set \c{variantList} property will modify which variant groups
+    and tags are loaded from the presentations. See
+    Q3DSPresentation::variantList property.
+*/
+
+/*!
+    \property Q3DSPresentation::source
+
+    Holds the name of the main presentation file (\c{*.uia} or
+    \c{*.uip}). This may be either a local file or qrc URL.
+
+    The names of all further assets (image files for texture maps, qml
+    behavior scripts, mesh files) will be resolved relative to the
+    location of the presentation, unless they use absolute paths. This
+    allows bundling all assets next to the presentation in the Qt
+    resource system.
+
+    Currently set variantList will modify which variant groups
+    and tags are loaded from the presentations. See
+    Q3DSPresentation::variantList property.
+*/
 QUrl Q3DSPresentation::source() const
 {
     return d_ptr->m_source;
 }
 
+void Q3DSPresentation::setSource(const QUrl &source)
+{
+    if (d_ptr->m_source != source) {
+        d_ptr->setSource(source);
+        Q_EMIT sourceChanged(source);
+    }
+}
+
+/*!
+    \qmlproperty variant Presentation::variantList
+
+    Holds a list of (variant group):(variant) tags that are loaded when the
+    \c{source} property is set. If this list is left empty (default), no variant
+    filtering is applied and all items are loaded regardless of variant tags in
+    the presentation. Variant mechanism allows one presentation project to
+    contain multiple variants of the presentation and the decision which variant
+    set is loaded is determined during runtime based on the \c{variantList}.
+
+    Variants are divided to variant groups, e.g. one variant group could be
+    \c{region} and the variants within that group could be e.g. \c{US, EU, CH}.
+    Another variant group could be e.g. \c{power} and variants within that could
+    be e.g. \c{gas, electric, diesel}. To filter in this example an electric
+    variant for the EU region, the variantList needs to contain two strings
+    "region:EU" and "power:electric". Also of course the presentation project
+    needs to contain these variant groups and tags applied appropriately to the
+    presentation content.
+
+    When variant filters are used, the decision what gets loaded and what is not
+    loaded is based on checking every item in the presentation:
+    \list
+    \li If the item has no variant tags, it will be loaded.
+    \li If the item has no tags defined for the checked variant group(s),
+        it will be loaded.
+    \li If the item has tag(s) for the variant group, any of those tags must
+        match any of the variants defined in the filter for that group.
+    \endlist
+
+    If the item doesn't fulfill the above rules it will not be loaded.
+*/
+
+/*!
+    \property Q3DSPresentation::variantList
+
+    Holds a list of (variant group):(variant) tags that are loaded when the
+    \c{source} property is set. If this list is left empty (default), no variant
+    filtering is applied and all items are loaded regardless of variant tags in
+    the presentation. Variant mechanism allows one presentation project to
+    contain multiple variants of the presentation and the decision which variant
+    set is loaded is determined during runtime based on the \c{variantList}.
+
+    Variants are divided to variant groups, e.g. one variant group could be
+    \c{region} and the variants within that group could be e.g. \c{US, EU, CH}.
+    Another variant group could be e.g. \c{power} and variants within that could
+    be e.g. \c{gas, electric, diesel}. To filter in this example an electric
+    variant for the EU region, the variantList needs to contain two strings
+    "region:EU" and "power:electric". Also of course the presentation project
+    needs to contain these variant groups and tags applied appropriately to the
+    presentation content.
+
+    When variant filters are used, the decision what gets loaded and what is not
+    loaded is based on checking every item in the presentation:
+    \list
+    \li If the item has no variant tags, it will be loaded.
+    \li If the item has no tags defined for the checked variant group(s),
+        it will be loaded.
+    \li If the item has tag(s) for the variant group, any of those tags must
+        match any of the variants defined in the filter for that group.
+    \endlist
+
+    If the item doesn't fulfill the above rules it will not be loaded.
+*/
 QStringList Q3DSPresentation::variantList() const
 {
     return d_ptr->m_variantList;
 }
 
+void Q3DSPresentation::setVariantList(const QStringList &variantList)
+{
+    if (d_ptr->m_variantList != variantList) {
+        d_ptr->setVariantList(variantList);
+        Q_EMIT variantListChanged(variantList);
+    }
+}
+
+/*!
+    \internal
+ */
 void Q3DSPresentation::registerElement(Q3DSElement *element)
 {
     d_ptr->registerElement(element);
 }
 
+/*!
+    \internal
+ */
 void Q3DSPresentation::unregisterElement(Q3DSElement *element)
 {
     d_ptr->unregisterElement(element);
 }
 
+/*!
+    \internal
+ */
 Q3DSElement *Q3DSPresentation::registeredElement(const QString &elementPath) const
 {
     return d_ptr->m_elements.value(elementPath, nullptr);
 }
 
+/*!
+    \internal
+ */
 void Q3DSPresentation::registerDataInput(Q3DSDataInput *dataInput)
 {
     d_ptr->registerDataInput(dataInput);
 }
 
+/*!
+    \internal
+ */
 void Q3DSPresentation::unregisterDataInput(Q3DSDataInput *dataInput)
 {
     d_ptr->unregisterDataInput(dataInput);
 }
 
+/*!
+    \internal
+ */
 Q3DSDataInput *Q3DSPresentation::registeredDataInput(const QString &name) const
 {
     return d_ptr->m_dataInputs.value(name, nullptr);
 }
 
+/*!
+    \internal
+ */
 void Q3DSPresentation::registerDataOutput(Q3DSDataOutput *dataOutput)
 {
     d_ptr->registerDataOutput(dataOutput);
 }
 
+/*!
+    \internal
+ */
 void Q3DSPresentation::unregisterDataOutput(Q3DSDataOutput *dataOutput)
 {
     d_ptr->unregisterDataOutput(dataOutput);
 }
 
+/*!
+    \internal
+ */
 Q3DSDataOutput *Q3DSPresentation::registeredDataOutput(const QString &name) const
 {
     return d_ptr->m_dataOutputs.value(name, nullptr);
 }
 
+/*!
+    Returns a list of datainputs defined for this presentation. Use setDataInputValue()
+    interface to set a datainput value using datainput name, or call Q3DSDataInput::setValue
+    directly for a specific datainput.
+
+    \sa setDataInputValue
+    \sa Q3DSDataInput
+ */
 QVector<Q3DSDataInput *> Q3DSPresentation::dataInputs() const
 {
     QVector<Q3DSDataInput *> ret;
@@ -117,17 +312,41 @@ QVector<Q3DSDataInput *> Q3DSPresentation::dataInputs() const
     return ret;
 }
 
-QVariantList Q3DSPresentation::getDataOutputs() const
+/*!
+    \qmlmethod variant Presentation::getDataInputs
+    Returns a list of datainputs defined for this presentation. Use setDataInputValue()
+    interface to set a datainput value using datainput name, or call Q3DSDataInput::setValue
+    directly for a specific datainput.
+
+    \sa DataInput
+ */
+
+/*!
+    Returns a list of datainputs defined for this presentation. Use setDataInputValue()
+    interface to set a datainput value using datainput name, or call Q3DSDataInput::setValue
+    directly for a specific datainput.
+
+    \sa setDataInputValue
+    \sa Q3DSDataInput
+ */
+QVariantList Q3DSPresentation::getDataInputs() const
 {
     QVariantList ret;
-    const auto dataoutputs = dataOutputs();
+    const auto datainputs = dataInputs();
 
-    for (const auto &it : dataoutputs)
+    for (const auto &it : datainputs)
         ret.append(QVariant::fromValue(it));
 
     return ret;
 }
 
+/*!
+    Returns a list of dataoutputs defined for this presentation. Use Qt's connect() method
+    to connect slots to the valueChanged() signal in the required \l{DataOutput}s to get notified
+    when the value tracked by the DataOutput is changed.
+
+    \sa Q3DSDataOutput
+ */
 QVector<Q3DSDataOutput *> Q3DSPresentation::dataOutputs() const
 {
     QVector<Q3DSDataOutput *> ret;
@@ -138,33 +357,59 @@ QVector<Q3DSDataOutput *> Q3DSPresentation::dataOutputs() const
     return ret;
 }
 
-QVariantList Q3DSPresentation::getDataInputs() const
+/*!
+    \qmlmethod variant Presentation::getDataOutputs
+
+    Returns a list of dataoutputs defined for this presentation. Connect slots to the
+    \c{valueChanged()} signal in the required \l{DataOutput}s to get notified
+    when the value tracked by the DataOutput is changed.
+
+    \sa SDataOutput
+ */
+/*!
+ * \brief Q3DSPresentation::getDataOutputs Returns \l{DataOutput}s.
+    Returns a list of dataoutputs defined for this presentation. Use Qt's connect() method
+    to connect slots to the valueChanged() signal in the required \l{DataOutput}s to get notified
+    when the value tracked by the DataOutput is changed.
+
+    \sa Q3DSDataOutput
+ */
+QVariantList Q3DSPresentation::getDataOutputs() const
 {
     QVariantList ret;
-    const auto datainputs = dataInputs();
+    const auto dataoutputs = dataOutputs();
 
-    for (const auto &it : datainputs)
+    for (const auto &it : dataoutputs)
         ret.append(QVariant::fromValue(it));
 
     return ret;
 }
 
-void Q3DSPresentation::setSource(const QUrl &source)
-{
-    if (d_ptr->m_source != source) {
-        d_ptr->setSource(source);
-        Q_EMIT sourceChanged(source);
-    }
-}
+/*!
+    \qmlproperty bool Presentation::delayedLoading
 
-void Q3DSPresentation::setVariantList(const QStringList &variantList)
-{
-    if (d_ptr->m_variantList != variantList) {
-        d_ptr->setVariantList(variantList);
-        Q_EMIT variantListChanged(variantList);
-    }
-}
+    This property controls whether the presentation resources are loaded while loading
+    the presentation(false) or afterwards when they are actually used in the presentation(true).
+    The resources are loaded per slide basis so that all resources required by a slide will be
+    loaded at once.
+
+    The resources can be images, subpresentations, materials, effects and meshes.
+
+    Default is \c{false}.
+  */
+
+/*!
+    \property Q3DSPresentation::delayedLoading
+
+    This property controls whether the presentation resources are loaded while loading
+    the presentation(false) or afterwards when they are actually used in the presentation(true).
+    The resources are loaded per slide basis so that all resources required by a slide will be
+    loaded at once.
 
+    The resources can be images, subpresentations, materials, effects and meshes.
+
+    Default is \c{false}.
+  */
 bool Q3DSPresentation::delayedLoading() const
 {
     return d_ptr->m_delayedLoading;
@@ -178,6 +423,18 @@ void Q3DSPresentation::setDelayedLoading(bool enable)
     }
 }
 
+/*!
+    \qmlmethod Presentation::preloadSlide
+    Preloads slide resources to memory. All resources required by the given slide will be
+    loaded in the background. This function has effect only when delayed loading is enabled.
+    \param elementPath
+ */
+/*!
+    \brief Q3DSPresentation::preloadSlide
+    Preloads slide resources to memory. All resources required by the given slide will be
+    loaded in the background. This function has effect only when delayed loading is enabled.
+    \param elementPath
+ */
 void Q3DSPresentation::preloadSlide(const QString &elementPath)
 {
     if (d_ptr->m_viewerApp)
@@ -186,6 +443,19 @@ void Q3DSPresentation::preloadSlide(const QString &elementPath)
         d_ptr->m_commandQueue->queueCommand(elementPath, CommandType_PreloadSlide);
 }
 
+/*!
+    \qmlmethod Presentation::unloadSlide
+    Unloads slide resources from memory. If the slide is current, then the resources are unloaded
+    when the slide is changed. This function has effect only when delayed loading is enabled.
+    \param elementPath
+ */
+
+/*!
+    \brief Q3DSPresentation::unloadSlide
+    Unloads slide resources from memory. If the slide is current, then the resources are unloaded
+    when the slide is changed. This function has effect only when delayed loading is enabled.
+    \param elementPath
+ */
 void Q3DSPresentation::unloadSlide(const QString &elementPath)
 {
     if (d_ptr->m_viewerApp)
@@ -194,6 +464,21 @@ void Q3DSPresentation::unloadSlide(const QString &elementPath)
         d_ptr->m_commandQueue->queueCommand(elementPath, CommandType_UnloadSlide);
 }
 
+/*!
+    This API is for backwards compatibility. We recommend using \l{DataInput}s to control
+    slide changes. \l{DataInput} provides stronger contract between the design and
+    code as it avoids use of elementPath (a reference to design's internal structure).
+
+    Requests a time context (a Scene or a Component object) to change
+    to a specific slide by \a index. If the context is already on that
+    slide, playback will start over.
+
+    If \a elementPath points to a time context, that element is
+    controlled. For all other element types the time context owning
+    that element is controlled instead.  You can target the command to
+    a specific sub-presentation by adding "SubPresentationId:" in
+    front of the element path, for example \c{"SubPresentationOne:Scene"}.
+ */
 void Q3DSPresentation::goToSlide(const QString &elementPath, unsigned int index)
 {
     if (d_ptr->m_viewerApp) {
@@ -204,6 +489,21 @@ void Q3DSPresentation::goToSlide(const QString &elementPath, unsigned int index)
     }
 }
 
+/*!
+    This API is for backwards compatibility. We recommend using \l{DataInput}s to control
+    slide changes. \l{DataInput} provides stronger contract between the design and
+    code as it avoids use of elementPath (a reference to design's internal structure).
+
+    Requests a time context (a Scene or a Component object) to change
+    to a specific slide by \a name. If the context is already on that
+    slide, playback will start over.
+
+    If \a elementPath points to a time context, that element is
+    controlled. For all other element types the time context owning
+    that element is controlled instead.  You can target the command to
+    a specific sub-presentation by adding "SubPresentationId:" in
+    front of the element path, for example \c{"SubPresentationOne:Scene"}.
+ */
 void Q3DSPresentation::goToSlide(const QString &elementPath, const QString &name)
 {
     if (d_ptr->m_viewerApp) {
@@ -215,6 +515,22 @@ void Q3DSPresentation::goToSlide(const QString &elementPath, const QString &name
     }
 }
 
+/*!
+    This API is for backwards compatibility. We recommend using \l{DataInput}s to control
+    slide changes. \l{DataInput} provides stronger contract between the design and
+    code as it avoids use of elementPath (a reference to design's internal structure).
+
+    Requests a time context (a Scene or a Component object) to change to the
+    next or previous slide, depending on the value of \a next. If the context
+    is already at the last or first slide, \a wrap defines if wrapping over to
+    the first or last slide, respectively, occurs.
+
+    If \a elementPath points to a time context, that element is controlled. For
+    all other element types the time context owning that element is controlled
+    instead. You can target the command to a specific sub-presentation by
+    adding "SubPresentationId:" in front of the element path, for example
+    \c{"SubPresentationOne:Scene"}.
+ */
 void Q3DSPresentation::goToSlide(const QString &elementPath, bool next, bool wrap)
 {
     if (d_ptr->m_viewerApp) {
@@ -226,6 +542,36 @@ void Q3DSPresentation::goToSlide(const QString &elementPath, bool next, bool wra
     }
 }
 
+/*!
+    This API is for backwards compatibility. We recommend using \l{DataInput}s to control
+    slide changes. \l{DataInput} provides stronger contract between the design and
+    code as it avoids use of elementPath (a reference to design's internal structure).
+
+    Moves the timeline for a time context (a Scene or a Component element) to a
+    specific position. The position is given in seconds in \a timeSeconds.
+
+    If \a elementPath points to a time context, that element is
+    controlled. For all other element types the time context owning
+    that element is controlled instead.  You can target the command to
+    a specific sub-presentation by adding "SubPresentationId:" in
+    front of the element path, for example
+    \c{"SubPresentationOne:Scene"}.
+
+    The behavior when specifying a time before 0 or after the end time
+    for the current slide depends on the play mode of the slide:
+
+    \list
+    \li \c{Stop at End} - values outside the valid time range instead clamp to the boundaries.
+    For example, going to time -5 is the same as going to time 0.
+    \li \c{Looping} - values outside the valid time range mod into the valid range. For example,
+    going to time -4 on a 10 second slide is the same as going to time 6.
+    \li \c{Ping Pong} - values outside the valid time range bounce off the ends. For example,
+    going to time -4 is the same as going to time 4 (assuming the time context is at least 4 seconds
+    long), while going to time 12 on a 10 second slide is the same as going to time 8.
+    \li \c{Ping} - values less than 0 are treated as time 0, while values greater than the endtime
+    bounce off the end (eventually hitting 0.)
+    \endlist
+ */
 void Q3DSPresentation::goToTime(const QString &elementPath, float time)
 {
     if (d_ptr->m_viewerApp) {
@@ -236,6 +582,30 @@ void Q3DSPresentation::goToTime(const QString &elementPath, float time)
     }
 }
 
+/*!
+    This API is for backwards compatibility. We recommend using \l{DataInput}s to control
+    attributes in the presentation. \l{DataInput} provides stronger contract between the
+    design and code as it avoids use of elementPath (a reference to design's
+    internal structure).
+
+    Sets the \a value of an attribute (property) on the object specified by
+    \a elementPath. The \a attributeName is the \l{Attribute Names}{scripting
+    name} of the attribute.
+
+    An element path refers to an object in the scene by name, for example,
+    \c{Scene.Layer.Camera}. Here the right camera object gets chosen even if
+    the scene contains other layers with the default camera names (for instance
+    \c{Scene.Layer2.Camera}).
+
+    To reference an object stored in a property of another object, the dot
+    syntax can be used. The most typical example of this is changing the source
+    of a texture map by changing the \c sourcepath property on the object
+    selected by \c{SomeMaterial.diffusemap}.
+
+    To access an object in a sub-presentation, prepend the name of the
+    sub-presentation followed by a colon, for example,
+    \c{SubPresentationOne:Scene.Layer.Camera}.
+ */
 void Q3DSPresentation::setAttribute(const QString &elementPath, const QString &attributeName,
                                     const QVariant &value)
 {
@@ -268,6 +638,12 @@ void Q3DSPresentation::setAttribute(const QString &elementPath, const QString &a
     }
 }
 
+// #TODO: QT3DS-3558
+/*!
+    \brief Q3DSPresentation::setPresentationActive
+    \param id
+    \param active
+ */
 void Q3DSPresentation::setPresentationActive(const QString &id, bool active)
 {
     if (d_ptr->m_viewerApp) {
@@ -278,6 +654,15 @@ void Q3DSPresentation::setPresentationActive(const QString &id, bool active)
     }
 }
 
+/*!
+    Dispatches a Qt 3D Studio presentation event with \a eventName on
+    scene object specified by \a elementPath. These events provide a
+    way to communicate with the \c .qml based \c{behavior scripts}
+    attached to scene objects since they can register to be notified
+    via Behavior::registerForEvent().
+
+    See setAttribute() for a description of \a elementPath.
+ */
 void Q3DSPresentation::fireEvent(const QString &elementPath, const QString &eventName)
 {
     if (d_ptr->m_viewerApp) {
@@ -289,6 +674,11 @@ void Q3DSPresentation::fireEvent(const QString &elementPath, const QString &even
     }
 }
 
+// #TODO: QT3DS-3559
+/*!
+    \brief Q3DSPresentation::setGlobalAnimationTime
+    \param milliseconds
+ */
 void Q3DSPresentation::setGlobalAnimationTime(qint64 milliseconds)
 {
     if (d_ptr->m_viewerApp) {
@@ -299,6 +689,23 @@ void Q3DSPresentation::setGlobalAnimationTime(qint64 milliseconds)
     }
 }
 
+/*!
+    Sets the \a value of a data input element \a name in the presentation.
+
+    Data input provides a higher level, designer-driven alternative to
+    Q3DSElement and setAttribute(). Instead of exposing a large set of
+    properties with their internal engine names, data input allows designers to
+    decide which properties should be writable by the application, and can
+    assign custom names to these data input entries, thus forming a
+    well-defined contract between the designer and the developer.
+
+    In addition, data input also allows controlling the time line and the
+    current slide for time context objects (Scene or Component). Therefore it
+    is also an alternative to the goToSlide() and goToTime() family of APIs and
+    to Q3DSSceneElement.
+
+    \sa DataInput
+ */
 void Q3DSPresentation::setDataInputValue(const QString &name, const QVariant &value,
                                          Q3DSDataInput::ValueRole valueRole)
 {
@@ -311,13 +718,14 @@ void Q3DSPresentation::setDataInputValue(const QString &name, const QVariant &va
     }
 }
 
-/**
-    Adds a new child element for the element specified by parentElementPath to the slide specified
-    with slideName. Only model element creation is currently supported.
+/*!
+ * \brief Q3DSPresentation::createElement Adds a new child element for the specified element.
+    Adds a new child element for the element specified by parentElementPath to the slide
+    specified with slideName. Only model element creation is currently supported.
     A referenced material element is also created for the new model element. The source material
     name can be specified with custom "material" property in the properties hash.
     The source material must exist in the material container of the presentation.
-*/
+ */
 void Q3DSPresentation::createElement(const QString &parentElementPath, const QString &slideName,
                                      const QHash<QString, QVariant> &properties)
 {
@@ -326,6 +734,13 @@ void Q3DSPresentation::createElement(const QString &parentElementPath, const QSt
     createElements(parentElementPath, slideName, theProperties);
 }
 
+// #TODO: QT3DS-3560
+/*!
+    \brief Q3DSPresentation::createElements
+    \param parentElementPath
+    \param slideName
+    \param properties
+ */
 void Q3DSPresentation::createElements(const QString &parentElementPath, const QString &slideName,
                                       const QVector<QHash<QString, QVariant>> &properties)
 {
@@ -340,9 +755,11 @@ void Q3DSPresentation::createElements(const QString &parentElementPath, const QS
     }
 }
 
-/**
+/*!
+    \brief Q3DSPresentation::deleteElement
     Removes an element added by createElement and all its child elements.
-*/
+    \param elementPath
+ */
 void Q3DSPresentation::deleteElement(const QString &elementPath)
 {
     QStringList elementPaths;
@@ -350,6 +767,11 @@ void Q3DSPresentation::deleteElement(const QString &elementPath)
     deleteElements(elementPaths);
 }
 
+/*!
+    \brief Q3DSPresentation::deleteElements
+    Removes the given list of elements added by createElement and all their child elements.
+    \param elementPaths QStringList containing the elementPaths of dynamically created objects.
+ */
 void Q3DSPresentation::deleteElements(const QStringList &elementPaths)
 {
     if (d_ptr->m_viewerApp) {
@@ -361,13 +783,16 @@ void Q3DSPresentation::deleteElements(const QStringList &elementPaths)
     }
 }
 
-/**
+/*!
+    \brief Q3DSPresentation::createMaterial
     Creates a material specified by the materialDefinition parameter into the material
     container of the presentation that owns the element specified by the elementPath parameter.
     After creation, the material can be used for new elements created via createElement.
     The materialDefinition parameter can contain either the file path to a material definition
     file or a material definition in the Qt 3D Studion material data format.
-*/
+    \param elementPath
+    \param materialDefinition
+ */
 void Q3DSPresentation::createMaterial(const QString &elementPath,
                                       const QString &materialDefinition)
 {
@@ -376,6 +801,12 @@ void Q3DSPresentation::createMaterial(const QString &elementPath,
     createMaterials(elementPath, materialDefinitions);
 }
 
+/*!
+    \brief Q3DSPresentation::createMaterials
+    Same as createMaterial, but creates multiple materials.
+    \param elementPath
+    \param materialDefinitions
+ */
 void Q3DSPresentation::createMaterials(const QString &elementPath,
                                        const QStringList &materialDefinitions)
 {
@@ -467,6 +898,9 @@ void Q3DSPresentation::mousePressEvent(QMouseEvent *e)
     }
 }
 
+/*!
+ * \internal
+ */
 void Q3DSPresentation::mouseReleaseEvent(QMouseEvent *e)
 {
     if (d_ptr->m_viewerApp) {
@@ -477,6 +911,9 @@ void Q3DSPresentation::mouseReleaseEvent(QMouseEvent *e)
     }
 }
 
+/*!
+ * \internal
+ */
 void Q3DSPresentation::mouseMoveEvent(QMouseEvent *e)
 {
     if (d_ptr->m_viewerApp) {
@@ -487,6 +924,9 @@ void Q3DSPresentation::mouseMoveEvent(QMouseEvent *e)
     }
 }
 
+/*!
+ * \internal
+ */
 void Q3DSPresentation::wheelEvent(QWheelEvent *e)
 {
     QPoint pixelData = e->pixelDelta();
@@ -516,6 +956,9 @@ void Q3DSPresentation::wheelEvent(QWheelEvent *e)
     }
 }
 
+/*!
+ * \internal
+ */
 void Q3DSPresentation::keyPressEvent(QKeyEvent *e)
 {
     if (d_ptr->m_viewerApp) {
@@ -526,6 +969,9 @@ void Q3DSPresentation::keyPressEvent(QKeyEvent *e)
     }
 }
 
+/*!
+ * \internal
+ */
 void Q3DSPresentation::keyReleaseEvent(QKeyEvent *e)
 {
     if (d_ptr->m_viewerApp) {
@@ -536,6 +982,97 @@ void Q3DSPresentation::keyReleaseEvent(QKeyEvent *e)
     }
 }
 
+// #TODO: QT3DS-3562 Most Presentation signals missing documentation
+/*!
+ * \qmlsignal Presentation::slideEntered
+ * Emitted when
+ * \param elementPath
+ * \param index
+ * \param name
+ */
+
+/*!
+ * \fn Q3DSPresentation::slideEntered
+ * Emitted when
+ * \param elementPath
+ * \param index
+ * \param name
+ */
+
+/*!
+ * \qmlsignal Presentation::slideExited
+ * Emitted when
+ * \param elementPath
+ * \param index
+ * \param name
+ */
+
+/*!
+ * \fn Q3DSPresentation::slideExited
+ * Emitted when
+ * \param elementPath
+ * \param index
+ * \param name
+ */
+
+/*!
+ * \fn Q3DSPresentation::dataInputsReady
+ * Emitted when \l{DataInput}s in the Studio project have been parsed and data inputs are available
+ * through dataInputs() and getDataInputs() methods.
+ */
+
+/*!
+ * \fn Q3DSPresentation::dataOutputsReady
+ * Emitted when \l{DataOutput}s in the Studio project have been parsed and data outputs are available
+ * through dataOutputs() and getDataOutputs() methods.
+ */
+
+/*!
+ * \qmlsignal Presentation::customSignalEmitted
+ * Emitted when
+ * \param elementPath
+ * \param name
+ */
+
+/*!
+ * \fn Q3DSPresentation::customSignalEmitted
+ * Emitted when
+ * \param elementPath
+ * \param name
+ */
+
+/*!
+ * \qmlsignal Presentation::elementsCreated
+ * Emitted when
+ * \param elementPaths
+ * \param error
+ */
+
+/*!
+ * \fn Q3DSPresentation::elementsCreated
+ * Emitted when
+ * \param elementPaths
+ * \param error
+ */
+
+/*!
+ * \qmlsignal Presentation::materialsCreated
+ * Emitted when
+ * \param materialNames
+ * \param error
+ */
+
+/*!
+ * \fn Q3DSPresentation::materialsCreated
+ * Emitted when
+ * \param materialNames
+ * \param error
+ */
+
+
+/*!
+ * \internal
+ */
 Q3DSPresentationPrivate::Q3DSPresentationPrivate(Q3DSPresentation *q)
     : QObject(q)
     , q_ptr(q)
@@ -672,14 +1209,17 @@ void Q3DSPresentationPrivate::requestResponseHandler(CommandType commandType, vo
             // Check and append to QML-side list if the (UIA) presentation has additional datainputs
             // that are not explicitly defined in QML code.
             auto receivedDI = response->at(i).value<Q3DSDataInput *>();
+            // For QML behind async command queue, we cache min/max values in addition
+            // to name, in order to be able to return values initially set in UIA file (in QML
+            // getters).
             if (!m_dataInputs.contains(receivedDI->name())) {
-                // For QML behind async command queue, we cache min/max values in addition
-                // to name, in order to be able to return values initially set in UIA file (in QML
-                // setter/getters).
                 auto newDI = new Q3DSDataInput(receivedDI->name(), nullptr);
                 newDI->d_ptr->m_min = receivedDI->d_ptr->m_min;
                 newDI->d_ptr->m_max = receivedDI->d_ptr->m_max;
                 registerDataInput(newDI);
+            } else {
+                m_dataInputs[receivedDI->name()]->d_ptr->m_min = receivedDI->d_ptr->m_min;
+                m_dataInputs[receivedDI->name()]->d_ptr->m_max = receivedDI->d_ptr->m_max;
             }
         }
         delete response;
diff --git a/src/Runtime/api/studio3d/q3dspresentation.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dspresentation.h
index 60191be2..436e6844 100644
--- a/src/Runtime/api/studio3d/q3dspresentation.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dspresentation.h
@@ -128,9 +128,6 @@ Q_SIGNALS:
     void sourceChanged(const QUrl &source);
     void slideEntered(const QString &elementPath, unsigned int index, const QString &name);
     void slideExited(const QString &elementPath, unsigned int index, const QString &name);
-    // Indicates that data input and output definitions in the Studio project have been parsed
-    // and datainputs/dataoutputs are available through dataInputs() / getDataInputs().
-    // and datainputs are available through dataInputs() / getDataInputs().
     void dataInputsReady();
     void dataOutputsReady();
     void customSignalEmitted(const QString &elementPath, const QString &name);
@@ -145,7 +142,6 @@ private:
 
     friend class Q3DSPresentationItem;
     friend class Q3DSSurfaceViewerPrivate;
-    friend class Q3DSWidgetPrivate;
     friend class Q3DSRenderer;
     friend class Q3DSStudio3D;
     friend class Q3DSDataInput;
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 2eef5d00..3f860d65 100644
--- a/src/Runtime/api/studio3d/q3dssceneelement.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssceneelement.cpp
@@ -37,16 +37,63 @@
 
 QT_BEGIN_NAMESPACE
 
+/*!
+    \qmltype SceneElement
+    \instantiates Q3DSSceneElement
+    \inqmlmodule Qt3DStudio
+    \ingroup OpenGLRuntime
+    \brief Controls the special Scene or Component scene objects in a Qt 3D
+    Studio presentation.
+
+    This class is a convenience class for controlling the properties of Scene
+    and Component objects in the scene. These are special since they have a
+    time context, meaning they control a timeline and a set of associated
+    slides.
+
+    \sa Studio3D, Element, Presentation
+*/
+
+/*!
+    \class Q3DSSceneElement
+    \inherits Q3DSElement
+    \inmodule OpenGLRuntime
+    \since Qt 3D Studio 2.0
+
+    \brief Controls the special Scene or Component scene objects in a Qt 3D
+    Studio presentation.
+
+    This class is a convenience class for controlling the properties of Scene
+    and Component objects in the scene. These are special since they have a
+    time context, meaning they control a timline and a set of associated
+    slides.
+
+    \note The functionality of Q3DSSceneElement is equivalent to
+    Q3DSPresentation::goToTime() and Q3DSPresentation::goToSlide().
+
+    \sa Q3DSPresentation, Q3DSWidget, Q3DSSurfaceViewer, Q3DSElement
+ */
+
+/*!
+    \internal
+ */
 Q3DSSceneElement::Q3DSSceneElement(QObject *parent)
     : Q3DSElement(new Q3DSSceneElementPrivate(this), nullptr, QString(), parent)
 {
 }
 
+/*!
+    \internal
+ */
 Q3DSSceneElement::Q3DSSceneElement(const QString &elementPath, QObject *parent)
     : Q3DSElement(new Q3DSSceneElementPrivate(this), nullptr, elementPath, parent)
 {
 }
 
+/*!
+    Constructs a Q3DSSceneElement instance and associated it with the object
+    specified by \a elementPath and the given \a presentation. An optional \a
+    parent object can be specified.
+ */
 Q3DSSceneElement::Q3DSSceneElement(Q3DSPresentation *presentation, const QString &elementPath,
                                    QObject *parent)
     : Q3DSElement(new Q3DSSceneElementPrivate(this), presentation, elementPath, parent)
@@ -54,32 +101,42 @@ Q3DSSceneElement::Q3DSSceneElement(Q3DSPresentation *presentation, const QString
 
 }
 
+/*!
+   Destructor.
+ */
 Q3DSSceneElement::~Q3DSSceneElement()
 {
 }
 
-int Q3DSSceneElement::currentSlideIndex() const
-{
-    Q_D(const Q3DSSceneElement);
-    return d->m_currentSlideIndex;
-}
+/*!
+    \qmlproperty int SceneElement::currentSlideIndex
 
-int Q3DSSceneElement::previousSlideIndex() const
-{
-    Q_D(const Q3DSSceneElement);
-    return d->m_previousSlideIndex;
-}
+    Holds the index of the currently active slide of the tracked time context.
 
-QString Q3DSSceneElement::currentSlideName() const
-{
-    Q_D(const Q3DSSceneElement);
-    return d->m_currentSlideName;
-}
+    \note If this property is set to something else than the default slide for
+    the scene at the initial declaration of SceneElement, a changed signal for
+    the default slide may still be emitted before the slide changes to the
+    desired one. This happens in order to ensure we end up with the index of
+    the slide that is actually shown even if the slide specified in the initial
+    declaration is invalid.
+*/
 
-QString Q3DSSceneElement::previousSlideName() const
+/*!
+    \property Q3DSSceneElement::currentSlideIndex
+
+    Holds the index of the currently active slide of the tracked time context.
+
+    \note If this property is set to something else than the default slide for
+    the scene at the initial declaration of SceneElement, a changed signal for
+    the default slide may still be emitted before the slide changes to the
+    desired one. This happens in order to ensure we end up with the index of
+    the slide that is actually shown even if the slide specified in the initial
+    declaration is invalid.
+*/
+int Q3DSSceneElement::currentSlideIndex() const
 {
     Q_D(const Q3DSSceneElement);
-    return d->m_previousSlideName;
+    return d->m_currentSlideIndex;
 }
 
 void Q3DSSceneElement::setCurrentSlideIndex(int currentSlideIndex)
@@ -98,6 +155,57 @@ void Q3DSSceneElement::setCurrentSlideIndex(int currentSlideIndex)
     }
 }
 
+/*!
+    \property int SceneElement::previousSlideIndex
+
+    Holds the index of the previously active slide of the tracked time context.
+
+    Note: This property is read-only.
+*/
+/*!
+    \property Q3DSSceneElement::previousSlideIndex
+
+    Holds the index of the previously active slide of the tracked time context.
+
+    This property is read-only.
+*/
+int Q3DSSceneElement::previousSlideIndex() const
+{
+    Q_D(const Q3DSSceneElement);
+    return d->m_previousSlideIndex;
+}
+
+/*!
+    \qmlproperty string SceneElement::currentSlideName
+
+    Holds the name of the currently active slide of the tracked time context.
+
+    \note If this property is set to something else than the default slide for
+    the scene at the initial declaration of SceneElement, a changed signal for
+    the default slide may still be emitted before the slide changes to the
+    desired one. This happens in order to ensure we end up with the index of
+    the slide that is actually shown even if the slide specified in the initial
+    declaration is invalid.
+*/
+
+/*!
+    \property Q3DSSceneElement::currentSlideName
+
+    Holds the name of the currently active slide of the tracked time context.
+
+    \note If this property is set to something else than the default slide for
+    the scene at the initial declaration of SceneElement, a changed signal for
+    the default slide may still be emitted before the slide changes to the
+    desired one. This happens in order to ensure we end up with the index of
+    the slide that is actually shown even if the slide specified in the initial
+    declaration is invalid.
+*/
+QString Q3DSSceneElement::currentSlideName() const
+{
+    Q_D(const Q3DSSceneElement);
+    return d->m_currentSlideName;
+}
+
 void Q3DSSceneElement::setCurrentSlideName(const QString &currentSlideName)
 {
     Q_D(Q3DSSceneElement);
@@ -115,18 +223,52 @@ void Q3DSSceneElement::setCurrentSlideName(const QString &currentSlideName)
     }
 }
 
+/*!
+    \qmlmproperty string SceneElement::previousSlideName
+
+    Holds the name of the previously active slide of the tracked time context.
+
+    Note: This property is read-only.
+*/
+/*!
+    \property Q3DSSceneElement::previousSlideName
+
+    Holds the name of the previously active slide of the tracked time context.
+
+    This property is read-only.
+*/
+QString Q3DSSceneElement::previousSlideName() const
+{
+    Q_D(const Q3DSSceneElement);
+    return d->m_previousSlideName;
+}
+
+/*!
+    Requests a time context (a Scene or a Component object) to change to the
+    next or previous slide, depending on the value of \a next. If the context
+    is already at the last or first slide, \a wrap defines if wrapping over to
+    the first or last slide, respectively, occurs.
+ */
 void Q3DSSceneElement::goToSlide(bool next, bool wrap)
 {
     Q_D(Q3DSSceneElement);
     d->goToSlide(next, wrap);
 }
 
+/*!
+    Moves the timeline for a time context (a Scene or a Component element) to a
+    specific position. The position is given in seconds in \a timeSeconds.
+ */
 void Q3DSSceneElement::goToTime(float time)
 {
     Q_D(Q3DSSceneElement);
     d->goToTime(time);
 }
 
+
+/*!
+    \internal
+ */
 Q3DSSceneElementPrivate::Q3DSSceneElementPrivate(Q3DSSceneElement *parent)
     : Q3DSElementPrivate(parent)
     , m_currentSlideIndex(0)
@@ -136,10 +278,16 @@ Q3DSSceneElementPrivate::Q3DSSceneElementPrivate(Q3DSSceneElement *parent)
 {
 }
 
+/*!
+    \internal
+ */
 Q3DSSceneElementPrivate::~Q3DSSceneElementPrivate()
 {
 }
 
+/*!
+    \internal
+ */
 void Q3DSSceneElementPrivate::handleSlideEntered(int index, const QString &name)
 {
     Q_Q(Q3DSSceneElement);
@@ -175,6 +323,9 @@ void Q3DSSceneElementPrivate::handleSlideEntered(int index, const QString &name)
     }
 }
 
+/*!
+    \internal
+ */
 void Q3DSSceneElementPrivate::goToSlide(bool next, bool wrap)
 {
     if (m_presentation)
@@ -183,6 +334,9 @@ void Q3DSSceneElementPrivate::goToSlide(bool next, bool wrap)
         qWarning() << __FUNCTION__ << "Element is not registered to any presentation!";
 }
 
+/*!
+    \internal
+ */
 void Q3DSSceneElementPrivate::goToTime(float time)
 {
     if (m_presentation)
@@ -191,6 +345,9 @@ void Q3DSSceneElementPrivate::goToTime(float time)
         qWarning() << __FUNCTION__ << "Element is not registered to any presentation!";
 }
 
+/*!
+    \internal
+ */
 void Q3DSSceneElementPrivate::setViewerApp(Q3DSViewer::Q3DSViewerApp *app)
 {
     Q_Q(Q3DSSceneElement);
@@ -221,6 +378,9 @@ void Q3DSSceneElementPrivate::setViewerApp(Q3DSViewer::Q3DSViewerApp *app)
     }
 }
 
+/*!
+    \internal
+ */
 void Q3DSSceneElementPrivate::setCommandQueue(CommandQueue *queue)
 {
     Q_Q(Q3DSSceneElement);
@@ -248,6 +408,9 @@ void Q3DSSceneElementPrivate::setCommandQueue(CommandQueue *queue)
     }
 }
 
+/*!
+    \internal
+ */
 void Q3DSSceneElementPrivate::requestResponseHandler(CommandType commandType, void *requestData)
 {
     switch (commandType) {
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 cea764e7..23782f2f 100644
--- a/src/Runtime/api/studio3d/q3dssurfaceviewer.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer.cpp
@@ -47,42 +47,146 @@ using namespace Q3DSViewer;
 
 QT_BEGIN_NAMESPACE
 
+/*!
+    \class Q3DSSurfaceViewer
+    \inmodule OpenGLRuntime
+    \since Qt 3D Studio 2.0
+
+    \brief Renders a Qt 3D Studio presentation on a QWindow or an offscreen
+    render target using OpenGL.
+
+    Q3DSSurfaceViewer is used to render Qt 3D Studio presentations onto a
+    QSurface. In practice this means two types of uses: rendering to an
+    on-screen QWindow, or rendering to an offscreen render target (typically an
+    OpenGL texture via a framebuffer object and a QOffscreenSurface).
+
+    \section2 Example Usage
+
+    \code
+    int main(int argc, char *argv[])
+    {
+        QGuiApplication app(argc, argv);
+
+        QOpenGLContext context;
+        context.create();
+
+        QWindow window;
+        window.setSurfaceType(QSurface::OpenGLSurface);
+        window.setFormat(context.format());
+        window.create();
+
+        Q3DSSurfaceViewer viewer;
+        viewer.presentation()->setSource(QUrl(QStringLiteral("qrc:/my_presentation.uip")));
+        viewer.setUpdateInterval(0); // enable automatic updates
+
+        // Register a scene object for slide management (optional)
+        Q3DSSceneElement scene(viewer.presentation(), QStringLiteral("Scene"));
+
+        // Register an element object for attribute setting (optional)
+        Q3DSElement element(viewer.presentation(), QStringLiteral("Scene.Layer.myCarModel"));
+
+        viewer.create(&window, &context);
+
+        w.resize(1024, 768);
+        w.show();
+
+        return app.exec();
+    }
+    \endcode
+
+    \sa Q3DSWidget
+ */
+
+/*!
+ * \brief Q3DSSurfaceViewer::Q3DSSurfaceViewer Constructor.
+ * \param parent Optional parent of the object.
+ */
 Q3DSSurfaceViewer::Q3DSSurfaceViewer(QObject *parent)
     : QObject(parent)
     , d_ptr(new Q3DSSurfaceViewerPrivate(this))
 {
 }
 
+/*!
+ * \brief Q3DSSurfaceViewer::~Q3DSSurfaceViewer Destructor
+ */
 Q3DSSurfaceViewer::~Q3DSSurfaceViewer()
 {
     delete d_ptr;
 }
 
-bool Q3DSSurfaceViewer::initialize(QSurface *surface, QOpenGLContext *context, GLuint fboId)
+/*!
+    Initializes Q3DSSurfaceViewer to render the presentation to the given
+    \a surface using the \a context.
+
+    The source property of the attached presentation must be set before the
+    viewer can be initialized.
+
+    Returns whether the initialization succeeded.
+
+    \sa running, Q3DSPresentation::source, presentation()
+*/
+bool Q3DSSurfaceViewer::create(QSurface *surface, QOpenGLContext *context)
 {
-    return d_ptr->initialize(surface, context, fboId);
+    // #TODO: QT3DS-3531 Fix this to behave as in RT2
+    return create(surface, context, 0);
 }
 
-void Q3DSSurfaceViewer::shutdown()
+
+/*!
+    Initializes Q3DSSurfaceViewer to render the presentation to the given
+    \a surface using the \a context and optional framebuffer id (\a fboId). If
+    \a fboId is omitted, it defaults to zero.
+
+    The source property of the attached presentation must be set before the
+    viewer can be initialized.
+
+    Returns whether the initialization succeeded.
+
+    \sa running, Q3DSPresentation::source, presentation()
+*/
+bool Q3DSSurfaceViewer::create(QSurface *surface, QOpenGLContext *context, GLuint fboId)
 {
-    d_ptr->shutdown();
+    return d_ptr->initialize(surface, context, fboId);
 }
 
-void Q3DSSurfaceViewer::reset()
+/*!
+    Releases the presentation and all related resources.
+    The Q3DSSurfaceViewer instance can be reused by calling create() again.
+ */
+void Q3DSSurfaceViewer::destroy()
 {
-    d_ptr->reset();
+    d_ptr->destroy();
 }
 
+/*!
+    Updates the surface viewer with a new frame.
+*/
 void Q3DSSurfaceViewer::update()
 {
     d_ptr->update();
 }
 
+/*!
+    Grabs the data rendered to the framebuffer into an image using the given \a
+    rect. The \a rect parameter is optional. If it is omitted, the whole
+    framebuffer is captured.
+
+    \note This is a potentially expensive operation.
+*/
 QImage Q3DSSurfaceViewer::grab(const QRect &rect)
 {
     return d_ptr->grab(rect);
 }
 
+/*!
+    \property Q3DSSurfaceViewer::size
+
+    Holds the desired size of the presentation. Relevant only when
+    autoSize is set to \c false.
+
+    \sa autoSize
+*/
 QSize Q3DSSurfaceViewer::size() const
 {
     return d_ptr->m_size;
@@ -93,6 +197,22 @@ void Q3DSSurfaceViewer::setSize(const QSize &size)
     d_ptr->setSize(size);
 }
 
+/*!
+    \property Q3DSSurfaceViewer::autoSize
+
+    Specifies whether the viewer should change the size of the presentation
+    automatically to match the surface size when surface size changes. The
+    \l{Q3DSSurfaceViewer::size}{size} property is updated automatically
+    whenever the viewer is \l{Q3DSSurfaceViewer::update()}{updated} if this
+    property value is \c{true}.
+
+    When rendering offscreen, via a QOffscreenSurface, this property must be
+    set to \c{false} by the application since it is then up to the application
+    to provide a QOpenGLFramebufferObject with the desired size. The size of
+    the Q3DSSurfaceViewer must be set to the same value.
+
+    The default value is \c{true}.
+*/
 bool Q3DSSurfaceViewer::autoSize() const
 {
     return d_ptr->m_autoSize;
@@ -106,6 +226,17 @@ void Q3DSSurfaceViewer::setAutoSize(bool autoSize)
     }
 }
 
+/*!
+    \property Q3DSSurfaceViewer::updateInterval
+
+    Holds the viewer update interval in milliseconds. If the value is negative,
+    the viewer doesn't update the presentation automatically.
+
+    The default value is -1, meaning there are no automatic updates and
+    update() must be called manually.
+
+    \sa update()
+*/
 int Q3DSSurfaceViewer::updateInterval() const
 {
     return d_ptr->m_updateInterval;
@@ -116,41 +247,78 @@ void Q3DSSurfaceViewer::setUpdateInterval(int interval)
     d_ptr->setUpdateInterval(interval);
 }
 
+/*!
+    \property Q3DSSurfaceViewer::running
+
+    The value of this property is \c true when the presentation has been loaded
+    and is ready to be shown.
+
+    This property is read-only.
+*/
 bool Q3DSSurfaceViewer::isRunning() const
 {
     return d_ptr->m_viewerApp != nullptr;
 }
 
+//     #TODO QT3DS-3534
+
+/*!
+    \property Q3DSSurfaceViewer::presentationId
+ */
 QString Q3DSSurfaceViewer::presentationId() const
 {
     return d_ptr->m_id;
 }
 
+/*!
+    Returns the framebuffer id given in initialization.
+
+    \sa create()
+*/
 int Q3DSSurfaceViewer::fboId() const
 {
     return d_ptr->m_fboId;
 }
 
+/*!
+    Returns the surface given in initialization.
+
+    \sa create()
+*/
 QSurface *Q3DSSurfaceViewer::surface() const
 {
     return d_ptr->m_surface;
 }
 
+/*!
+    Returns the context given in initialization.
+
+    \sa create()
+*/
 QOpenGLContext *Q3DSSurfaceViewer::context() const
 {
     return d_ptr->m_context;
 }
 
+/*!
+    Returns the settings object used by the Q3DSSurfaceViewer.
+*/
 Q3DSViewerSettings *Q3DSSurfaceViewer::settings() const
 {
     return d_ptr->m_settings;
 }
 
+/*!
+    Returns the presentation object used by the Q3DSSurfaceViewer.
+*/
 Q3DSPresentation *Q3DSSurfaceViewer::presentation() const
 {
     return d_ptr->m_presentation;
 }
 
+/*!
+ * \internal
+ */
 void Q3DSSurfaceViewer::setPresentationId(const QString &id)
 {
     if (d_ptr->m_id != id) {
@@ -161,6 +329,51 @@ void Q3DSSurfaceViewer::setPresentationId(const QString &id)
     }
 }
 
+// TODO: QT3DS-3563
+
+/*!
+ * \brief Q3DSSurfaceViewer::qmlEngine
+ * \return
+ */
+QQmlEngine *Q3DSSurfaceViewer::qmlEngine() const
+{
+    Q_D(const Q3DSSurfaceViewer);
+    return d->qmlEngine;
+}
+
+/*!
+ * \brief Q3DSSurfaceViewer::setQmlEngine
+ * \param qmlEngine
+ */
+void Q3DSSurfaceViewer::setQmlEngine(QQmlEngine *qmlEngine)
+{
+    Q_D(Q3DSSurfaceViewer);
+    d->qmlEngine = qmlEngine;
+}
+
+
+/*!
+    \fn Q3DSSurfaceViewer::frameUpdate()
+
+    Emitted each time a frame has been rendered.
+*/
+
+/*!
+    \fn Q3DSSurfaceViewer::presentationLoaded()
+
+    Emitted when the presentation has been loaded and is ready
+    to be shown.
+*/
+
+/*!
+    \fn Q3DSSurfaceViewer::presentationReady()
+    Emitted when first frame is about to be shown. DataInputs and setAttribute
+    are ready to be used after this signal.
+ */
+
+/*!
+ * \internal
+ */
 Q3DSSurfaceViewerPrivate::Q3DSSurfaceViewerPrivate(Q3DSSurfaceViewer *q)
     : QObject(q)
     , q_ptr(q)
@@ -180,6 +393,9 @@ Q3DSSurfaceViewerPrivate::Q3DSSurfaceViewerPrivate(Q3DSSurfaceViewer *q)
             this, &Q3DSSurfaceViewerPrivate::reset);
 }
 
+/*!
+ * \internal
+ */
 Q3DSSurfaceViewerPrivate::~Q3DSSurfaceViewerPrivate()
 {
     releaseRuntime();
@@ -187,14 +403,9 @@ Q3DSSurfaceViewerPrivate::~Q3DSSurfaceViewerPrivate()
     delete m_timer;
 }
 
-void Q3DSSurfaceViewerPrivate::reset()
-{
-    if (m_viewerApp) {
-        releaseRuntime();
-        initializeRuntime();
-    }
-}
-
+/*!
+ * \internal
+ */
 void Q3DSSurfaceViewerPrivate::setSize(const QSize &size)
 {
     if (m_size != size) {
@@ -210,6 +421,9 @@ void Q3DSSurfaceViewerPrivate::setSize(const QSize &size)
     }
 }
 
+/*!
+ * \internal
+ */
 void Q3DSSurfaceViewerPrivate::setUpdateInterval(int interval)
 {
     if (m_updateInterval != interval) {
@@ -219,6 +433,9 @@ void Q3DSSurfaceViewerPrivate::setUpdateInterval(int interval)
     }
 }
 
+/*!
+ * \internal
+ */
 bool Q3DSSurfaceViewerPrivate::initialize(QSurface *surface, QOpenGLContext *context, GLuint fboId)
 {
     Q_ASSERT(context);
@@ -237,7 +454,7 @@ bool Q3DSSurfaceViewerPrivate::initialize(QSurface *surface, QOpenGLContext *con
         return false;
     }
 
-    shutdown();
+    destroy();
 
     m_surface = surface;
     m_context = context;
@@ -247,7 +464,7 @@ bool Q3DSSurfaceViewerPrivate::initialize(QSurface *surface, QOpenGLContext *con
 
     surfaceObject()->installEventFilter(this);
 
-    connect(context, &QOpenGLContext::aboutToBeDestroyed, this, &Q3DSSurfaceViewerPrivate::shutdown);
+    connect(context, &QOpenGLContext::aboutToBeDestroyed, this, &Q3DSSurfaceViewerPrivate::destroy);
 
     bool success = initializeRuntime();
 
@@ -257,14 +474,16 @@ bool Q3DSSurfaceViewerPrivate::initialize(QSurface *surface, QOpenGLContext *con
     return success;
 }
 
-
-void Q3DSSurfaceViewerPrivate::shutdown()
+/*!
+ * \internal
+ */
+void Q3DSSurfaceViewerPrivate::destroy()
 {
     bool oldInitialized = (m_viewerApp != nullptr);
 
     if (m_context) {
         disconnect(m_context, &QOpenGLContext::aboutToBeDestroyed,
-                   this, &Q3DSSurfaceViewerPrivate::shutdown);
+                   this, &Q3DSSurfaceViewerPrivate::destroy);
     }
 
     if (m_surface)
@@ -280,7 +499,9 @@ void Q3DSSurfaceViewerPrivate::shutdown()
         Q_EMIT q_ptr->runningChanged(false);
 }
 
-
+/*!
+ * \internal
+ */
 void Q3DSSurfaceViewerPrivate::update()
 {
     if (m_viewerApp && m_viewerApp->IsInitialised()) {
@@ -302,6 +523,9 @@ void Q3DSSurfaceViewerPrivate::update()
 extern Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format,
                                                   bool include_alpha);
 
+/*!
+ * \internal
+ */
 QImage Q3DSSurfaceViewerPrivate::grab(const QRect &rect)
 {
     QRect captureRect;
@@ -341,30 +565,35 @@ QImage Q3DSSurfaceViewerPrivate::grab(const QRect &rect)
     return image;
 }
 
-QQmlEngine *Q3DSSurfaceViewer::qmlEngine() const
-{
-    Q_D(const Q3DSSurfaceViewer);
-    return d->qmlEngine;
-}
-
-void Q3DSSurfaceViewer::setQmlEngine(QQmlEngine *qmlEngine)
-{
-    Q_D(Q3DSSurfaceViewer);
-    d->qmlEngine = qmlEngine;
-}
-
+/*!
+ * \internal
+ */
 bool Q3DSSurfaceViewerPrivate::eventFilter(QObject *obj, QEvent *e)
 {
     if (m_surface && e->type() == QEvent::PlatformSurface) {
         if (surfaceObject() == obj) {
             QPlatformSurfaceEvent *ev = static_cast<QPlatformSurfaceEvent *>(e);
             if (ev->surfaceEventType() == QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed)
-                shutdown();
+                destroy();
         }
     }
     return QObject::eventFilter(obj, e);
 }
 
+/*!
+ * \internal
+ */
+void Q3DSSurfaceViewerPrivate::reset()
+{
+    if (m_viewerApp) {
+        releaseRuntime();
+        initializeRuntime();
+    }
+}
+
+/*!
+ * \internal
+ */
 bool Q3DSSurfaceViewerPrivate::initializeRuntime()
 {
     Q_ASSERT(!m_viewerApp);
@@ -407,6 +636,9 @@ bool Q3DSSurfaceViewerPrivate::initializeRuntime()
     return true;
 }
 
+/*!
+ * \internal
+ */
 void Q3DSSurfaceViewerPrivate::releaseRuntime()
 {
     m_settings->d_ptr->setViewerApp(nullptr);
@@ -423,6 +655,9 @@ void Q3DSSurfaceViewerPrivate::releaseRuntime()
     resetUpdateTimer();
 }
 
+/*!
+ * \internal
+ */
 void Q3DSSurfaceViewerPrivate::resetUpdateTimer()
 {
     if (m_viewerApp && m_updateInterval >= 0) {
@@ -436,6 +671,9 @@ void Q3DSSurfaceViewerPrivate::resetUpdateTimer()
     }
 }
 
+/*!
+ * \internal
+ */
 QObject *Q3DSSurfaceViewerPrivate::surfaceObject()
 {
     if (m_surface) {
diff --git a/src/Runtime/api/studio3d/q3dssurfaceviewer.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer.h
index c0ae05a0..5c166af9 100644
--- a/src/Runtime/api/studio3d/q3dssurfaceviewer.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer.h
@@ -50,55 +50,61 @@ class Q_STUDIO3D_EXPORT Q3DSSurfaceViewer : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(Q3DSSurfaceViewer)
+
+    // #TODO: QT3DS-3532 SurfaceViewer API missing error string
+    //Q_PROPERTY(QString error READ error NOTIFY errorChanged)
+    Q_PROPERTY(bool running READ isRunning NOTIFY runningChanged)
     Q_PROPERTY(QSize size READ size WRITE setSize NOTIFY sizeChanged)
     Q_PROPERTY(bool autoSize READ autoSize WRITE setAutoSize NOTIFY autoSizeChanged)
     Q_PROPERTY(int updateInterval READ updateInterval WRITE setUpdateInterval NOTIFY updateIntervalChanged)
-    Q_PROPERTY(bool running READ isRunning NOTIFY runningChanged)
     Q_PROPERTY(QString presentationId READ presentationId WRITE setPresentationId NOTIFY presentationIdChanged)
 
 public:
     explicit Q3DSSurfaceViewer(QObject *parent = nullptr);
     ~Q3DSSurfaceViewer();
 
-    bool initialize(QSurface *surface, QOpenGLContext *context, GLuint fboId = 0);
+    bool create(QSurface *surface, QOpenGLContext *context);
+    bool create(QSurface *surface, QOpenGLContext *context, GLuint fboId);
+    void destroy();
 
-    QImage grab(const QRect &rect = QRect());
+    Q3DSPresentation *presentation() const;
+    Q3DSViewerSettings *settings() const;
 
-    QQmlEngine *qmlEngine() const;
-    void setQmlEngine(QQmlEngine *qmlEngine);
+    bool isRunning() const;
 
-    // Property accessors
     QSize size() const;
+    void setSize(const QSize &size);
+
     bool autoSize() const;
+    void setAutoSize(bool autoSize);
+
     int updateInterval() const;
-    bool isRunning() const;
-    QString presentationId() const;
+    void setUpdateInterval(int interval);
 
     int fboId() const;
     QSurface *surface() const;
     QOpenGLContext *context() const;
 
-    Q3DSViewerSettings *settings() const;
-    Q3DSPresentation *presentation() const;
+    QImage grab(const QRect &rect = QRect());
+
+    QQmlEngine *qmlEngine() const;
+    void setQmlEngine(QQmlEngine *qmlEngine);
+    QString presentationId() const;
 
 public Q_SLOTS:
-    void setSize(const QSize &size);
-    void setAutoSize(bool autoSize);
-    void setUpdateInterval(int interval);
     void update();
-    void shutdown();
-    void reset();
     void setPresentationId(const QString &id);
 
 Q_SIGNALS:
     void presentationLoaded();
     void presentationReady();
+    void frameUpdate();
+
+    void presentationIdChanged(const QString &id);
     void sizeChanged(const QSize &size);
     void autoSizeChanged(bool autoSize);
     void updateIntervalChanged(bool autoUpdate);
     void runningChanged(bool initialized);
-    void frameUpdate();
-    void presentationIdChanged(const QString &id);
 
 private:
     Q_DISABLE_COPY(Q3DSSurfaceViewer)
diff --git a/src/Runtime/api/studio3d/q3dssurfaceviewer_p.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer_p.h
index 656d139c..fc6b4cc8 100644
--- a/src/Runtime/api/studio3d/q3dssurfaceviewer_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer_p.h
@@ -62,7 +62,6 @@ public:
     explicit Q3DSSurfaceViewerPrivate(Q3DSSurfaceViewer *parent = nullptr);
     ~Q3DSSurfaceViewerPrivate();
 
-    void reset();
     void setSize(const QSize &size);
     void setUpdateInterval(int interval);
     bool initialize(QSurface *surface, QOpenGLContext *context, GLuint fboId);
@@ -71,12 +70,13 @@ public:
     QImage grab(const QRect &rect);
 
 private Q_SLOTS:
-    void shutdown();
+    void destroy();
 
 protected:
     bool eventFilter(QObject *obj, QEvent *e) override;
 
 private:
+    void reset();
     bool initializeRuntime();
     void releaseRuntime();
     void resetUpdateTimer();
diff --git a/src/Runtime/api/studio3d/q3dsviewersettings.cpp b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsviewersettings.cpp
index b6660c84..187729a0 100644
--- a/src/Runtime/api/studio3d/q3dsviewersettings.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsviewersettings.cpp
@@ -37,46 +37,79 @@
 
 QT_BEGIN_NAMESPACE
 
+/*!
+    \qmltype ViewerSettings
+    \instantiates Q3DSViewerSettings
+    \inqmlmodule Qt3DStudio
+    \ingroup OpenGLRuntime
+    \brief Qt 3D Studio presentation viewer settings.
+
+    This type provides properties to define presentation independent viewer settings.
+
+    \note ViewerSettings are only applicable when \l Studio3D is used in the
+    default mode, showing the final, composed image from the Qt 3D Studio
+    renderer.
+
+    \sa Studio3D
+*/
+
+/*!
+    \class Q3DSViewerSettings
+    \inmodule OpenGLRuntime
+    \since Qt 3D Studio 2.0
+
+    \brief Qt 3D Studio presentation viewer settings.
+
+    Q3DSViewerSettings provides properties to define presentation independent
+    viewer settings.
+
+    \note This class should not be instantiated directly when working with the
+    C++ APIs. Q3DSSurfaceViewer and Q3DSWidget create a Q3DSViewerSettings
+    instance implicitly. This can be queried via Q3DSSurfaceViewer::settings()
+    or Q3DSWidget::settings().
+ */
+
+/*!
+ * \internal
+ */
 Q3DSViewerSettings::Q3DSViewerSettings(QObject *parent)
     : QObject(parent)
     , d_ptr(new Q3DSViewerSettingsPrivate(this))
 {
 }
 
+/*!
+ * \internal
+ */
 Q3DSViewerSettings::~Q3DSViewerSettings()
 {
 }
 
-QColor Q3DSViewerSettings::matteColor() const
-{
-    return d_ptr->m_matteColor;
-}
+/*!
+    \enum Q3DSViewerSettings::ScaleMode
 
-bool Q3DSViewerSettings::isShowRenderStats() const
-{
-    return d_ptr->m_showRenderStats;
-}
+    This enumeration specifies the possible scaling modes.
 
-Q3DSViewerSettings::ShadeMode Q3DSViewerSettings::shadeMode() const
-{
-    return d_ptr->m_shadeMode;
-}
+    \value ScaleModeFit Scales the presentation to fit the output area.
+    \value ScaleModeFill Scales the presentation to completely fill the output area.
+    This is the default.
+    \value ScaleModeCenter Centers the presentation in the output area without scaling it.
+*/
 
-Q3DSViewerSettings::ScaleMode Q3DSViewerSettings::scaleMode() const
-{
-    return d_ptr->m_scaleMode;
-}
+/*!
+    \qmlproperty QColor ViewerSettings::matteColor
 
-void Q3DSViewerSettings::save(const QString &group, const QString &organization,
-                                      const QString &application)
-{
-    d_ptr->save(group, organization, application);
-}
+    Specifies the matte color.
+ */
 
-void Q3DSViewerSettings::load(const QString &group, const QString &organization,
-                                      const QString &application)
+/*!
+    \property Q3DSViewerSettings::matteColor
+
+    Specifies the matte color.
+ */
+QColor Q3DSViewerSettings::matteColor() const
 {
-    d_ptr->load(group, organization, application);
+    return d_ptr->m_matteColor;
 }
 
 void Q3DSViewerSettings::setMatteColor(const QColor &color)
@@ -87,6 +120,34 @@ void Q3DSViewerSettings::setMatteColor(const QColor &color)
     }
 }
 
+/*!
+    \qmlproperty bool ViewerSettings::showRenderStats
+
+    If this property is set to \c true, the simple profile
+    view is displayed in-scene, on top of the 3D content.
+
+    \note this feature can be disabled at build time, in which case this
+    property has no effect.
+
+    The default value is \c{false}.
+*/
+
+/*!
+    \property Q3DSViewerSettings::showRenderStats
+
+    When this property is \c{true}, the simple profile
+    view is displayed in-scene, on top of the 3D content.
+
+    \note This feature can be disabled at build time, in which case this
+    property has no effect.
+
+    Default value is \c{false}.
+*/
+bool Q3DSViewerSettings::isShowRenderStats() const
+{
+    return d_ptr->m_showRenderStats;
+}
+
 void Q3DSViewerSettings::setShowRenderStats(bool show)
 {
     if (d_ptr->m_showRenderStats != show) {
@@ -95,13 +156,65 @@ void Q3DSViewerSettings::setShowRenderStats(bool show)
     }
 }
 
+/*!
+    \qmlproperty ViewerSettings::shadeMode
+ */
+
+/*!
+    \property Q3DSViewerSettings::shadeMode
+ */
+Q3DSViewerSettings::ShadeMode Q3DSViewerSettings::shadeMode() const
+{
+    return d_ptr->m_shadeMode;
+}
+
 void Q3DSViewerSettings::setShadeMode(Q3DSViewerSettings::ShadeMode mode)
 {
     if (d_ptr->m_shadeMode != mode) {
         d_ptr->setShadeMode(mode);
         Q_EMIT shadeModeChanged(mode);
     }
+}
+
+/*!
+    \qmlproperty enumeration ViewerSettings::scaleMode
+
+    Specifies the scaling mode. The default value \c is ScaleModeFill where the
+    size of the presentation on-screen follows and fills the size of the output
+    area (the window, the screen, or the area occupied by the Studio3D
+    element).
+
+    During the design phase it can be valuable to see the presentation with
+    some other scaling approach. For example, the Qt 3D Studio Viewer
+    application uses ScaleModeCenter by default.
+
+    \value ScaleModeFit Scales the presentation to fit the output area.
+    \value ScaleModeFill Scales the presentation to completely fill the output area.
+    \value ScaleModeCenter Centers the presentation in the output area without scaling it.
 
+    The default value is \c{ScaleModeFill}.
+*/
+/*!
+    \property Q3DSViewerSettings::scaleMode
+
+    Specifies the scaling mode. The default value \c is ScaleModeFill where the
+    size of the presentation on-screen follows and fills the size of the output
+    area (the window, the screen, or the area occupied by the \l Studio3D
+    element).
+
+    During the design phase it can be valuable to see the presentation with
+    some other scaling approach. For example, the Qt 3D Studio Viewer
+    application uses ScaleModeCenter by default.
+
+    \value ScaleModeFit Scales the presentation to fit the output area.
+    \value ScaleModeFill Scales the presentation to completely fill the output area.
+    \value ScaleModeCenter Centers the presentation in the output area without scaling it.
+
+    The default value is \c{ScaleModeFill}.
+ */
+Q3DSViewerSettings::ScaleMode Q3DSViewerSettings::scaleMode() const
+{
+    return d_ptr->m_scaleMode;
 }
 
 void Q3DSViewerSettings::setScaleMode(Q3DSViewerSettings::ScaleMode mode)
@@ -112,6 +225,50 @@ void Q3DSViewerSettings::setScaleMode(Q3DSViewerSettings::ScaleMode mode)
     }
 }
 
+/*!
+    \qmmlmethod ViewerSettings::save
+    Persistently saves the viewer \l{QSettings}{settings} using \a group, \a organization and
+    \a application.
+    \param group
+    \param organization
+    \param application
+ */
+/*!
+ * \brief Q3DSViewerSettings::save  Persistently saves the viewer \l{QSettings}{settings}
+    Persistently saves the viewer \l{QSettings}{settings} using \a group, \a organization and
+    \a application.
+    \param group
+    \param organization
+    \param application
+ */
+void Q3DSViewerSettings::save(const QString &group, const QString &organization,
+                                      const QString &application)
+{
+    d_ptr->save(group, organization, application);
+}
+
+/*!
+    \qmlmethod ViewerSettings::load
+    Loads previously saved viewer \l{QSettings}{settings} using \a group, \a organization and
+    \a application.
+    \param group
+    \param organization
+    \param application
+ */
+/*!
+ * \brief Q3DSViewerSettings::load Loads previously saved viewer \l{QSettings}{settings}
+    Loads previously saved viewer \l{QSettings}{settings} using \a group, \a organization and
+    \a application.
+    \param group
+    \param organization
+    \param application
+ */
+void Q3DSViewerSettings::load(const QString &group, const QString &organization,
+                                      const QString &application)
+{
+    d_ptr->load(group, organization, application);
+}
+
 Q3DSViewerSettingsPrivate::Q3DSViewerSettingsPrivate(Q3DSViewerSettings *q)
     : QObject(q)
     , q_ptr(q)
diff --git a/src/Runtime/api/studio3d/q3dsviewersettings.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsviewersettings.h
index 82d7d62e..5d7abf68 100644
--- a/src/Runtime/api/studio3d/q3dsviewersettings.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dsviewersettings.h
@@ -44,9 +44,12 @@ class Q_STUDIO3D_EXPORT Q3DSViewerSettings : public QObject
     Q_DECLARE_PRIVATE(Q3DSViewerSettings)
     Q_ENUMS(ShadeMode)
     Q_ENUMS(ScaleMode)
+
+// #TODO: QT3DS-3542 Q3DSViewerSettings API is missing property matteEnabled compared to 2.3
+//    Q_PROPERTY(bool matteEnabled READ matteEnabled WRITE setMatteEnabled NOTIFY matteEnabledChanged)
+
     Q_PROPERTY(QColor matteColor READ matteColor WRITE setMatteColor NOTIFY matteColorChanged)
     Q_PROPERTY(bool showRenderStats READ isShowRenderStats WRITE setShowRenderStats NOTIFY showRenderStatsChanged)
-    Q_PROPERTY(ShadeMode shadeMode READ shadeMode WRITE setShadeMode NOTIFY shadeModeChanged)
     Q_PROPERTY(ScaleMode scaleMode READ scaleMode WRITE setScaleMode NOTIFY scaleModeChanged)
 
 public:
@@ -66,7 +69,6 @@ public:
 
     QColor matteColor() const;
     bool isShowRenderStats() const;
-    ShadeMode shadeMode() const;
     ScaleMode scaleMode() const;
 
     Q_INVOKABLE void save(const QString &group, const QString &organization = QString(),
@@ -77,7 +79,6 @@ public:
 public Q_SLOTS:
     void setMatteColor(const QColor &color);
     void setShowRenderStats(bool show);
-    void setShadeMode(ShadeMode mode);
     void setScaleMode(ScaleMode mode);
 
 Q_SIGNALS:
@@ -90,8 +91,10 @@ private:
     Q_DISABLE_COPY(Q3DSViewerSettings)
     Q3DSViewerSettingsPrivate *d_ptr;
 
+    ShadeMode shadeMode() const;
+    void setShadeMode(ShadeMode mode);
+
     friend class Q3DSSurfaceViewerPrivate;
-    friend class Q3DSWidgetPrivate;
     friend class Q3DSRenderer;
     friend class Q3DSStudio3D;
 };
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 e2592426..62d0613f 100644
--- a/src/Runtime/api/studio3d/studio3d.pro
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/studio3d.pro
@@ -16,8 +16,6 @@ LIBS += \
 HEADERS += \
     q3dsdataoutput.h \
     q3dsdataoutput_p.h \
-    q3dswidget.h \
-    q3dswidget_p.h \
     q3dssurfaceviewer.h \
     q3dssurfaceviewer_p.h \
     qstudio3dglobal.h \
@@ -39,8 +37,7 @@ HEADERS += \
     q3dsgeometry.h \
     q3dsgeometry_p.h
 
-SOURCES += q3dswidget.cpp \
-           q3dsdataoutput.cpp \
+SOURCES += q3dsdataoutput.cpp \
            q3dssurfaceviewer.cpp \
            viewerqmlstreamproxy.cpp \
            q3dsviewersettings.cpp \
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 cb571d87..407739e5 100644
--- a/src/Runtime/api/studio3dqml/q3dspresentationitem.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dspresentationitem.cpp
@@ -37,6 +37,45 @@
 
 QT_BEGIN_NAMESPACE
 
+/*!
+    \qmltype Presentation
+    \instantiates Q3DSPresentationItem
+    \inqmlmodule QtStudio3D
+    \ingroup OpenGLRuntime
+    \inherits Q3DSPresentation
+    \keyword Studio3D
+
+    \brief Represents a Qt 3D Studio presentation.
+
+    This item provides properties and methods for controlling a
+    presentation.
+
+    Qt 3D Studio supports multiple presentations in one project. There
+    is always a main presentation and zero or more
+    sub-presentations. The sub-presentations are composed into the
+    main presentations either as contents of Qt 3D Studio layers or as
+    texture maps.
+
+    In the filesystem each presentation corresponds to one \c{.uip}
+    presentation file. When present, the \c{.uia} project file ties
+    these together by specifying a name for each of the
+    (sub-)presentations and specifies which one is the main one.
+
+    The \c{.uia} project also defines \l{DataInput}s and
+    \l{DataOutput}s that are exported by the presentations.
+    \l{DataInput}s provide a way to provide input to the presentation
+    to e.g. control a timeline of a subpresentation from code.
+    \l{DataOutput}s provide a way to get notified when an attribute
+    is changed in the presentation by animation timeline,
+    by behavior scripts or by a \l{DataInput}.
+
+    From the API point of view Presentation corresponds to the
+    main presentation. The source property can refer either to a
+    \c{.uia} or \c{.uip} file. When specifying a file with \c{.uip}
+    extension and a \c{.uia} is present with the same name, the
+    \c{.uia} is loaded automatically and thus sub-presentation
+    information is available regardless.
+ */
 Q3DSPresentationItem::Q3DSPresentationItem(QObject *parent)
     : Q3DSPresentation(parent)
     , m_subPresentationSettings(nullptr)
@@ -47,6 +86,12 @@ Q3DSPresentationItem::~Q3DSPresentationItem()
 {
 }
 
+// #TODO: QT3DS-3565 subPresentationSettings is missing documentation
+/*!
+    \qmlproperty SubPresentationSettings Presentation::subPresentationSettings
+
+    Note: This property is read-only.
+ */
 Q3DSSubPresentationSettings *Q3DSPresentationItem::subPresentationSettings() const
 {
     return m_subPresentationSettings;
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 a3d7b2d8..bbfee502 100644
--- a/src/Runtime/api/studio3dqml/q3dsrenderer.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dsrenderer.cpp
@@ -37,6 +37,7 @@
 #include <QtStudio3D/private/q3dsviewersettings_p.h>
 #include <QtStudio3D/private/q3dspresentation_p.h>
 #include <QtStudio3D/private/studioutils_p.h>
+#include <QtStudio3D/private/q3dsdatainput_p.h>
 
 #include <QtCore/qdebug.h>
 #include <QtGui/qwindow.h>
@@ -413,11 +414,16 @@ void Q3DSRenderer::processCommands()
         }
         case CommandType_RequestDataInputs: {
             QVariantList *requestData = new QVariantList();
-            if (m_presentation) {
-                const auto diList = m_presentation->dataInputs();
+            if (m_runtime) {
+                const auto diList = m_runtime->dataInputs();
 
-                for (const auto &it : diList)
-                    requestData->append(QVariant::fromValue(it));
+                for (const auto &it : diList) {
+                    Q3DSDataInput *newIt = new Q3DSDataInput(it, nullptr);
+                    newIt->d_ptr->m_max = m_runtime->dataInputMax(it);
+                    newIt->d_ptr->m_min = m_runtime->dataInputMin(it);
+
+                    requestData->append(QVariant::fromValue(newIt));
+                }
             }
 
             Q_EMIT requestResponse(cmd.m_elementPath, cmd.m_commandType, requestData);
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 41f59f44..3d48babc 100644
--- a/src/Runtime/api/studio3dqml/q3dsstudio3d.cpp
+++ b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dsstudio3d.cpp
@@ -43,37 +43,154 @@
 
 QT_BEGIN_NAMESPACE
 
+/*!
+    \qmltype Studio3D
+    \instantiates Q3DSStudio3D
+    \inqmlmodule QtStudio3D
+    \ingroup OpenGLRuntime
+    \inherits Item
+    \keyword Studio3D
+
+    \brief Qt 3D Studio presentation viewer.
+
+    This type enables developers to embed Qt 3D Studio presentations in Qt
+    Quick.
+
+    \section2 Example Usage
+
+    \qml
+    Studio3D {
+        id: studio3D
+        anchors.fill: parent
+
+        Presentation {
+            source: "qrc:///presentation.uia"
+            SceneElement {
+                id: scene
+                elementPath: "Scene"
+                currentSlideIndex: 2
+            }
+            Element {
+                id: textLabel
+                elementPath: "Scene.Layer.myLabel"
+            }
+        }
+        ViewerSettings {
+            showRenderStats: true
+        }
+        onRunningChanged: {
+            console.log("Presentation ready!");
+        }
+    }
+    \endqml
+
+    \section2 Controlling the presentation
+
+    Like the example above suggests, Studio3D and the other types under the
+    QtStudio3D import offer more than simply rendering the animated Qt 3D
+    Studio presentation. They also offer scene manipulation, including
+
+    \list
+
+    \li querying and changing scene object properties (for example, the
+    transform of a model, colors and other settings of a material, etc.) via
+    Presentation::getAttribute(), Presentation::setAttribute(), \l Element, and
+    \l DataInput,
+
+    \li changing slides (and thus starting the relevant animations and applying
+    the scene object property changes associated with the new slide) via
+    Presentation::goToSlide(), \l SceneElement, and \l DataInput,
+
+    \li and controlling the timeline (the current playback position for the
+    key-frame based animations) both on the main scene and on individual
+    Component nodes via Presentation::goToTime(), \l SceneElement, and \l DataInput.
+
+    \endlist
+
+    \sa Presentation
+*/
+
+/*!
+    \qmlsignal Studio3D::frameUpdate()
+
+    This signal is emitted each time a frame has been rendered.
+*/
+
+/*!
+    \qmlsignal Studio3D::presentationLoaded()
+
+    This signal is emitted when the presentation has been loaded and is ready
+    to be shown.
+*/
+
+/*!
+    \qmlsignal Studio3D::presentationReady()
+
+    This signal is emitted when the presentation has fully initialized its 3D
+    scene for the first frame.
+
+    The difference to presentationLoaded() is that this signal is emitted only
+    when the asynchronous operations needed to build to 3D scene and the first
+    frame have completed.
+
+    When implementing splash screens via Loader items and the Item::visible
+    property, this is the signal that should be used to trigger hiding the
+    splash screen.
+*/
+
 Q3DSStudio3D::Q3DSStudio3D()
     : m_viewerSettings(nullptr)
     , m_presentation(nullptr)
     , m_emitRunningChange(false)
     , m_isRunning(false)
-    , m_ignoreMouseEvents(false)
-    , m_ignoreWheelEvents(false)
-    , m_ignoreKeyboardEvents(false)
+    , m_eventIgnoreFlags(EnableAllEvents)
     , m_pixelRatio(1.0)
 {
     setMirrorVertically(true);
     connect(this, &Q3DSStudio3D::windowChanged, this, &Q3DSStudio3D::handleWindowChanged);
     connect(this, &Q3DSStudio3D::visibleChanged, this, &Q3DSStudio3D::handleVisibleChanged);
 
-    setIgnoreEvents(false, false, false);
+    updateEventMasks();
 }
 
 Q3DSStudio3D::~Q3DSStudio3D()
 {
 }
 
+/*!
+    \qmlproperty Presentation Studio3D::presentation
+
+    Accessor for the presentation. Applications are expected to create a single
+    Presentation child object for Studio3D. If this is omitted, a presentation
+    is created automatically.
+
+    This property is read-only.
+*/
 Q3DSPresentationItem *Q3DSStudio3D::presentation() const
 {
     return m_presentation;
 }
 
+// #TODO: QT3DS-3566 viewerSettings is missing documentation
+/*!
+    \qmlproperty ViewerSettings Studio3D::viewerSettings
+
+    This property is read-only.
+*/
 Q3DSViewerSettings *Q3DSStudio3D::viewerSettings() const
 {
     return m_viewerSettings;
 }
 
+/*!
+    \qmlproperty string Studio3D::error
+
+    Contains the text for the error message that was generated during the
+    loading of the presentation. When no error occurred or there is no
+    presentation loaded, the value is an empty string.
+
+    This property is read-only.
+*/
 QString Q3DSStudio3D::error() const
 {
     return m_error;
@@ -87,20 +204,45 @@ void Q3DSStudio3D::setError(const QString &error)
     }
 }
 
-void Q3DSStudio3D::setIgnoreEvents(bool mouse, bool wheel, bool keyboard)
+/*!
+    \qmlproperty EventIgnoreFlags Studio3D::ignoredEvents
+
+    This property can be used to ignore mouse/wheel/keyboard events.
+    By default all events are enabled.
+*/
+
+Q3DSStudio3D::EventIgnoreFlags Q3DSStudio3D::ignoredEvents() const
+{
+    return m_eventIgnoreFlags;
+}
+
+void Q3DSStudio3D::setIgnoredEvents(EventIgnoreFlags flags)
 {
-    // TODO: It might be beneficial to have these as properties so they could be acceessed from QML
-    m_ignoreMouseEvents = mouse;
-    m_ignoreWheelEvents = wheel;
-    m_ignoreKeyboardEvents = keyboard;
+    if (m_eventIgnoreFlags == flags)
+        return;
+
+    m_eventIgnoreFlags = flags;
+    updateEventMasks();
+    Q_EMIT ignoredEventsChanged();
+}
 
-    if (mouse)
+/*!
+    \internal
+ */
+void Q3DSStudio3D::updateEventMasks()
+{
+    if (m_eventIgnoreFlags.testFlag(IgnoreMouseEvents)) {
         setAcceptedMouseButtons(Qt::NoButton);
-    else
-        setAcceptedMouseButtons(Qt::LeftButton | Qt::RightButton | Qt::MiddleButton);
-    setAcceptHoverEvents(!mouse);
+        setAcceptHoverEvents(false);
+    } else {
+        setAcceptedMouseButtons(Qt::MouseButtonMask);
+        setAcceptHoverEvents(true);
+    }
 }
 
+/*!
+    \internal
+ */
 void Q3DSStudio3D::componentComplete()
 {
     const auto childObjs = children();
@@ -134,6 +276,9 @@ void Q3DSStudio3D::componentComplete()
     QQuickFramebufferObject::componentComplete();
 }
 
+/*!
+    \internal
+ */
 void Q3DSStudio3D::handleWindowChanged(QQuickWindow *window)
 {
     if (!window)
@@ -148,13 +293,19 @@ void Q3DSStudio3D::handleWindowChanged(QQuickWindow *window)
     connect(window, &QQuickWindow::afterSynchronizing, this, &Q3DSStudio3D::update);
 }
 
-// Queue up a command to inform the renderer of a newly-changed visible/hidden status.
+/*!
+    \internal
+    Queue up a command to inform the renderer of a newly-changed visible/hidden status.
+ */
 void Q3DSStudio3D::handleVisibleChanged()
 {
     m_pendingCommands.m_visibleChanged = true;
     m_pendingCommands.m_visible = isVisible();
 }
 
+/*!
+    \brief internal
+ */
 void Q3DSStudio3D::reset()
 {
     // Fake a source change to trigger a reloading of the presentation
@@ -164,6 +315,9 @@ void Q3DSStudio3D::reset()
     m_pendingCommands.m_variantList = m_presentation->variantList();
 }
 
+/*!
+    \internal
+ */
 void Q3DSStudio3D::requestResponseHandler(const QString &elementPath, CommandType commandType,
                                       void *requestData)
 {
@@ -203,7 +357,10 @@ void Q3DSStudio3D::requestResponseHandler(const QString &elementPath, CommandTyp
     }
 }
 
-// Create the Q3DSRenderer. Invoked automatically by the QML scene graph.
+/*!
+    \internal
+    Create the Q3DSRenderer. Invoked automatically by the QML scene graph.
+ */
 QQuickFramebufferObject::Renderer *Q3DSStudio3D::createRenderer() const
 {
     // It is "illegal" to create a connection between the renderer
@@ -234,23 +391,33 @@ QQuickFramebufferObject::Renderer *Q3DSStudio3D::createRenderer() const
     return renderer;
 }
 
+/*!
+    \qmlproperty bool Studio3D::running
+
+    The value of this property is \c true when the presentation has been loaded
+    and is ready to be shown.
+
+    This property is read-only.
+*/
 bool Q3DSStudio3D::isRunning() const
 {
     return m_isRunning;
 }
 
-/** Emit QML `runningChanged` and `frameUpdate` and signals.
- *  This method is called every frame, and emits the `frameUpdate` signal every frame,
- *  regardless of plugin visibility. This allows a hidden Qt3DSView to still process
- *  information every frame, even though the Renderer is not rendering.
- *
- *  To prevent expensive onFrameUpdate handlers from being processed when hidden,
- *  add an early return to the top like:
- *
- *      onFrameUpdate: {
- *          if (!visible) return;
- *          ...
- *      }
+/*!
+    \internal
+    Emit QML `runningChanged` and `frameUpdate` and signals.
+    This method is called every frame, and emits the `frameUpdate` signal every frame,
+    regardless of plugin visibility. This allows a hidden Qt3DSView to still process
+    information every frame, even though the Renderer is not rendering.
+
+    To prevent expensive onFrameUpdate handlers from being processed when hidden,
+    add an early return to the top like:
+
+        onFrameUpdate: {
+            if (!visible) return;
+            ...
+        }
  */
 void Q3DSStudio3D::tick()
 {
@@ -267,7 +434,10 @@ void Q3DSStudio3D::tick()
     }
 }
 
-// Copies the list of commands previously queued up. Called by Q3DSRenderer::synchronize().
+/*!
+    \internal
+    Copies the list of commands previously queued up. Called by Q3DSRenderer::synchronize().
+  */
 void Q3DSStudio3D::getCommands(bool emitInitialize, CommandQueue &renderQueue)
 {
     if (emitInitialize)
@@ -277,62 +447,87 @@ void Q3DSStudio3D::getCommands(bool emitInitialize, CommandQueue &renderQueue)
     m_pendingCommands.clear(false);
 }
 
+/*!
+    \internal
+ */
 void Q3DSStudio3D::mousePressEvent(QMouseEvent *event)
 {
-    if (!m_ignoreMouseEvents) {
-        if (m_pixelRatio != 1.0) {
-            QMouseEvent scaledEvent(event->type(), event->pos() * m_pixelRatio,
-                                    event->button(), event->buttons(), event->modifiers());
-            m_presentation->mousePressEvent(&scaledEvent);
-        } else {
-            m_presentation->mousePressEvent(event);
-        }
+    if (m_eventIgnoreFlags.testFlag(IgnoreMouseEvents))
+        return;
+
+    if (m_pixelRatio != 1.0) {
+        QMouseEvent scaledEvent(event->type(), event->pos() * m_pixelRatio,
+                                event->button(), event->buttons(), event->modifiers());
+        m_presentation->mousePressEvent(&scaledEvent);
+    } else {
+        m_presentation->mousePressEvent(event);
     }
 }
 
+/*!
+    \internal
+ */
 void Q3DSStudio3D::mouseReleaseEvent(QMouseEvent *event)
 {
-    if (!m_ignoreMouseEvents) {
-        if (m_pixelRatio != 1.0) {
-            QMouseEvent scaledEvent(event->type(), event->pos() * m_pixelRatio,
-                                    event->button(), event->buttons(), event->modifiers());
-            m_presentation->mouseReleaseEvent(&scaledEvent);
-        } else {
-            m_presentation->mouseReleaseEvent(event);
-        }
+    if (m_eventIgnoreFlags.testFlag(IgnoreMouseEvents))
+        return;
+
+    if (m_pixelRatio != 1.0) {
+        QMouseEvent scaledEvent(event->type(), event->pos() * m_pixelRatio,
+                                event->button(), event->buttons(), event->modifiers());
+        m_presentation->mouseReleaseEvent(&scaledEvent);
+    } else {
+        m_presentation->mouseReleaseEvent(event);
     }
 }
 
+/*!
+    \internal
+ */
 void Q3DSStudio3D::mouseMoveEvent(QMouseEvent *event)
 {
-    if (!m_ignoreMouseEvents) {
-        if (m_pixelRatio != 1.0) {
-            QMouseEvent scaledEvent(event->type(), event->pos() * m_pixelRatio,
-                                    event->button(), event->buttons(), event->modifiers());
-            m_presentation->mouseMoveEvent(&scaledEvent);
-        } else {
-            m_presentation->mouseMoveEvent(event);
-        }
+    if (m_eventIgnoreFlags.testFlag(IgnoreMouseEvents))
+        return;
+
+    if (m_pixelRatio != 1.0) {
+        QMouseEvent scaledEvent(event->type(), event->pos() * m_pixelRatio,
+                                event->button(), event->buttons(), event->modifiers());
+        m_presentation->mouseMoveEvent(&scaledEvent);
+    } else {
+        m_presentation->mouseMoveEvent(event);
     }
 }
 
+/*!
+    \internal
+ */
 void Q3DSStudio3D::wheelEvent(QWheelEvent *event)
 {
-    if (!m_ignoreWheelEvents)
-        m_presentation->wheelEvent(event);
+    if (m_eventIgnoreFlags.testFlag(IgnoreWheelEvents))
+        return;
+
+    m_presentation->wheelEvent(event);
 }
 
+/*!
+    \internal
+ */
 void Q3DSStudio3D::keyPressEvent(QKeyEvent *event)
 {
-    if (m_ignoreKeyboardEvents)
+    if (m_eventIgnoreFlags.testFlag(IgnoreKeyboardEvents))
         return;
+
     m_presentation->keyPressEvent(event);
 }
 
+/*!
+    \internal
+ */
 void Q3DSStudio3D::keyReleaseEvent(QKeyEvent *event)
 {
-    if (m_ignoreKeyboardEvents)
+    if (m_eventIgnoreFlags.testFlag(IgnoreKeyboardEvents))
         return;
+
     if (!event->isAutoRepeat())
         m_presentation->keyReleaseEvent(event);
 }
diff --git a/src/Runtime/api/studio3dqml/q3dsstudio3d_p.h b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dsstudio3d_p.h
index 0fd3b9d0..eed8459a 100644
--- a/src/Runtime/api/studio3dqml/q3dsstudio3d_p.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dsstudio3d_p.h
@@ -59,8 +59,19 @@ class Q3DSStudio3D : public QQuickFramebufferObject
     Q_PROPERTY(Q3DSPresentationItem *presentation READ presentation CONSTANT)
     Q_PROPERTY(Q3DSViewerSettings *viewerSettings READ viewerSettings CONSTANT)
     Q_PROPERTY(QString error READ error NOTIFY errorChanged)
+    Q_PROPERTY(EventIgnoreFlags ignoredEvents READ ignoredEvents WRITE setIgnoredEvents NOTIFY ignoredEventsChanged)
 
 public:
+    enum EventIgnoreFlag {
+        EnableAllEvents = 0,
+        IgnoreMouseEvents = 0x01,
+        IgnoreWheelEvents = 0x02,
+        IgnoreKeyboardEvents = 0x04,
+        IgnoreAllInputEvents = IgnoreMouseEvents | IgnoreWheelEvents | IgnoreKeyboardEvents
+    };
+    Q_DECLARE_FLAGS(EventIgnoreFlags, EventIgnoreFlag)
+    Q_FLAG(EventIgnoreFlags)
+
     Q3DSStudio3D();
     ~Q3DSStudio3D() override;
 
@@ -81,7 +92,8 @@ public:
     void keyPressEvent(QKeyEvent *event) override;
     void keyReleaseEvent(QKeyEvent *event) override;
 
-    void setIgnoreEvents(bool mouse, bool wheel, bool keyboard);
+    EventIgnoreFlags ignoredEvents() const;
+    void setIgnoredEvents(EventIgnoreFlags flags);
 
     void componentComplete() override;
 
@@ -89,6 +101,7 @@ Q_SIGNALS:
     void frameUpdate();
     void runningChanged(bool initialized);
     void errorChanged(const QString &error);
+    void ignoredEventsChanged();
     void presentationReady();
     void presentationLoaded();
 
@@ -101,6 +114,8 @@ protected Q_SLOTS:
     void tick();
     void requestResponseHandler(const QString &elementPath, CommandType commandType,
                                 void *requestData);
+private:
+    void updateEventMasks();
 
 protected:
     Q3DSViewerSettings *m_viewerSettings;
@@ -108,15 +123,15 @@ protected:
 
     bool m_emitRunningChange;
     bool m_isRunning;
-    bool m_ignoreMouseEvents;
-    bool m_ignoreWheelEvents;
-    bool m_ignoreKeyboardEvents;
+    EventIgnoreFlags m_eventIgnoreFlags;
 
     CommandQueue m_pendingCommands;
     qreal m_pixelRatio;
     QString m_error;
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(Q3DSStudio3D::EventIgnoreFlags)
+
 QT_END_NAMESPACE
 
 #endif // Q3DS_STUDIO3D_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 197582b0..89bb4de7 100644
--- a/src/Runtime/Source/datamodel/Qt3DSMetadata.cpp
+++ b/src/Runtime/ogl-runtime/src/datamodel/Qt3DSMetadata.cpp
@@ -608,7 +608,7 @@ public:
         } break;
         case qt3dsdm::AdditionalMetaDataType::Range: {
             const SMetaDataRange &range = argInfo.m_MetaDataData.getData<SMetaDataRange>();
-            arg.m_MetaDataRange = eastl::make_pair(range.m_Min, range.m_Max);
+            arg.m_MetaDataRange = eastl::make_pair(range.m_min, range.m_max);
         } break;
         default:
             break;
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 361e522b..457b042f 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMAnimation.h
@@ -26,9 +26,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#pragma once
 #ifndef QT3DSDM_ANIMATION_H
 #define QT3DSDM_ANIMATION_H
+
 #include "Qt3DSDMHandles.h"
 #include "Qt3DSDMDataTypes.h"
 #include "Qt3DSDMValue.h"
@@ -63,7 +63,8 @@ struct SEaseInEaseOutKeyframe : public SLinearKeyframe
     float m_EaseIn;
     float m_EaseOut;
 };
-}
+
+} // namespace qt3dsdm
 
 namespace qt3ds {
 namespace foundation {
@@ -292,10 +293,11 @@ typedef std::shared_ptr<IAnimationCore> TAnimationCorePtr;
 
 struct SGetOrSetKeyframeInfo
 {
-    float m_Value;
-    float m_EaseIn;
-    float m_EaseOut;
-    bool m_AnimationTrackIsDynamic;
+    float m_Value = 0.0;
+    float m_EaseIn = -1.f;
+    float m_EaseOut = -1.f;
+    bool m_AnimationTrackIsDynamic = false;
+
     SGetOrSetKeyframeInfo(float inValue, float inEaseIn = -1.f, float inEaseOut = -1.f,
                           bool inDynamic = false)
         : m_Value(inValue)
@@ -304,13 +306,8 @@ struct SGetOrSetKeyframeInfo
         , m_AnimationTrackIsDynamic(inDynamic)
     {
     }
-    SGetOrSetKeyframeInfo()
-        : m_Value(0)
-        , m_EaseIn(-1.f)
-        , m_EaseOut(-1.f)
-        , m_AnimationTrackIsDynamic(false)
-    {
-    }
+    SGetOrSetKeyframeInfo() = default;
+
 };
 /**
  *	Interface from studio into the animation system that speaks
@@ -543,17 +540,21 @@ inline std::tuple<bool, size_t> GetVariantAnimatableAndArity(const SValue &inVal
 inline std::tuple<bool, size_t> GetDatatypeAnimatableAndArity(DataModelDataType::Value inDataType)
 {
     switch (inDataType) {
-    default:
-        return std::make_tuple(false, 0);
     case DataModelDataType::Long:
     case DataModelDataType::Float:
         return std::make_tuple(true, 1);
+
     case DataModelDataType::Float2:
         return std::make_tuple(true, 2);
+
     case DataModelDataType::Float3:
         return std::make_tuple(true, 3);
+
     case DataModelDataType::Float4:
         return std::make_tuple(true, 4);
+
+    default:
+        return std::make_tuple(false, 0);
     }
 }
 
@@ -569,11 +570,12 @@ struct SAnimationApplier
 {
     float m_Value;
     size_t m_Index;
-    SValue operator()(const bool &) { return m_Value > 0.5f ? true : false; }
+    SValue operator()(const bool &) { return m_Value > 0.5f; }
     SValue operator()(const qt3ds::QT3DSI32 &) { return static_cast<qt3ds::QT3DSI32>(m_Value + .5f); }
     SValue operator()(const float &) { return m_Value; }
     SValue operator()(const SFloat2 &inValue) { return SetFloatValue(m_Value, m_Index, inValue); }
     SValue operator()(const SFloat3 &inValue) { return SetFloatValue(m_Value, m_Index, inValue); }
+    SValue operator()(const SFloat4 &inValue) { return SetFloatValue(m_Value, m_Index, inValue); }
     template <typename TDataType>
     SValue operator()(const TDataType &inValue)
     {
@@ -609,6 +611,7 @@ struct SAnimationGetter
     float operator()(const float &inValue) const { return inValue; }
     float operator()(const SFloat2 &inValue) const { return GetFloatValue(inValue, m_Index); }
     float operator()(const SFloat3 &inValue) const { return GetFloatValue(inValue, m_Index); }
+    float operator()(const SFloat4 &inValue) const { return GetFloatValue(inValue, m_Index); }
     template <typename TDataType>
     float operator()(const TDataType & /*inValue*/) const
     {
@@ -750,9 +753,10 @@ void CopyKeyframes(const IAnimationCore &inSourceAnimationCore, IAnimationCore &
                    Qt3DSDMAnimationHandle inDestAnimation, const TKeyframeHandleList &inKeyframes);
 
 Qt3DSDMAnimationHandle CopyAnimation(TAnimationCorePtr inSourceAnimationCore,
-                                    Qt3DSDMAnimationHandle inAnimation, Qt3DSDMSlideHandle inNewSlide,
-                                    Qt3DSDMInstanceHandle inNewInstance,
-                                    Qt3DSDMPropertyHandle inNewProperty, size_t inNewIndex);
+                                     Qt3DSDMAnimationHandle inAnimation,
+                                     Qt3DSDMSlideHandle inNewSlide,
+                                     Qt3DSDMInstanceHandle inNewInstance,
+                                     Qt3DSDMPropertyHandle inNewProperty, size_t inNewIndex);
 
 struct SEaseInGetter
 {
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 bc4e905d..66f56ce8 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMMetaData.cpp
@@ -2103,8 +2103,9 @@ public:
         if (!inItem.empty()) {
             if (inType == AdditionalMetaDataType::Range) {
                 SMetaDataRange theRange(get<SMetaDataRange>(inItem));
-                inWriter.Att(L"min", theRange.m_Min);
-                inWriter.Att(L"max", theRange.m_Max);
+                inWriter.Att(L"min", theRange.m_min);
+                inWriter.Att(L"max", theRange.m_max);
+                inWriter.Att(L"decimals", theRange.m_decimals);
             } else if (inType == AdditionalMetaDataType::StringList) {
                 const TMetaDataStringList &theList(get<TMetaDataStringList>(inItem));
                 TCharStr theBuffer;
@@ -2170,7 +2171,8 @@ public:
         // Use the meta data extra information to force the type
         // to something that works correctly.
         SMetaDataRange theRange;
-        if (inReader.Att("min", theRange.m_Min) && inReader.Att("max", theRange.m_Max)) {
+        if (inReader.Att("min", theRange.m_min) && inReader.Att("max", theRange.m_max)) {
+            inReader.Att("decimals", theRange.m_decimals);
             ioItem = theRange;
             if (ioType == CompleteMetaDataType::Long)
                 ioType = CompleteMetaDataType::LongRange;
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 eb3433ab..b981b956 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaDataValue.h
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMMetaDataValue.h
@@ -71,25 +71,24 @@ typedef eastl::vector<TCharStr> TMetaDataStringList;
 // Float type metadata
 struct SMetaDataRange
 {
-    SMetaDataRange()
-        : m_Min(0.0f)
-        , m_Max(0.0f)
-    {
-    }
+    SMetaDataRange() {}
 
-    SMetaDataRange(float inMin, float inMax)
-        : m_Min(inMin)
-        , m_Max(inMax)
+    SMetaDataRange(float min, float max, int decimals = -1)
+        : m_min(min)
+        , m_max(max)
+        , m_decimals(decimals)
     {
     }
 
     bool operator==(const SMetaDataRange &other) const
     {
-        return m_Min == other.m_Min && m_Max == other.m_Max;
+        // no need to check m_decimals for quality as it is not significant to the range value
+        return m_min == other.m_min && m_max == other.m_max;
     }
 
-    float m_Min;
-    float m_Max;
+    float m_min = 0.0f;
+    float m_max = 0.0f;
+    int m_decimals = -1; // num decimals to show, -1: dynamically calculated
 };
 }
 
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 3d79ca33..2055adf1 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMXML.cpp
+++ b/src/Runtime/ogl-runtime/src/dm/systems/Qt3DSDMXML.cpp
@@ -36,7 +36,6 @@
 #include <memory>
 #include "foundation/StrConvertUTF.h"
 #include "foundation/StringTable.h"
-#include "utf8.h"
 #ifdef QT3DS_VC
 #include <winsock2.h>
 #include <windows.h> //output debug string
@@ -871,45 +870,8 @@ struct SimpleXmlWriter
         Write(' ');
         Write(name);
         Write("=\"");
-        size_t valueLen = strlen(NonNull(value));
-        TXMLCharPtr start = value;
-        TXMLCharPtr end = value + valueLen;
-        TXMLCharPtr last = start;
-        uint32_t item = 0;
-        // Write out the data escaping unicode values where necessary
-        // I am using utf8::internal because it returns an error code and does not through
-        // exceptions; we don't always know the system we are running on will support or handle
-        // exceptions gracefully.
-        for (utf8::internal::utf_error err_code = utf8::internal::validate_next(start, end, item);
-             last != end && err_code == utf8::internal::UTF8_OK;
-             err_code = utf8::internal::validate_next(start, end, item)) {
-            switch (item) {
-            case '\r':
-                break;
-            case '\n':
-                Write("&#10;");
-                break;
-            case '\t':
-                Write("&#09;");
-                break;
-            case '<':
-                Write("&lt;");
-                break;
-            case '>':
-                Write("&gt;");
-                break;
-            case '"':
-                Write("&quot;");
-                break;
-            case '&':
-                Write("&amp;");
-                break;
-            default:
-                m_Stream.Write(NVConstDataRef<QT3DSU8>((const QT3DSU8 *)last, (QT3DSU32)(start - last)));
-                break;
-            }
-            last = start;
-        }
+        QString str = QString::fromUtf8(nonNull(value)).toHtmlEscaped();
+        Write(str.toUtf8().constData());
         Write("\"");
     }
     template <typename TData>
@@ -922,32 +884,8 @@ struct SimpleXmlWriter
     {
         if (!IsTrivial(value)) {
             Close(false);
-            size_t valueLen = strlen(NonNull(value));
-            TXMLCharPtr start = value;
-            TXMLCharPtr end = value + valueLen;
-            TXMLCharPtr last = start;
-            uint32_t item = 0;
-            // Write out the data escaping unicode values where necessary
-            for (utf8::internal::utf_error err_code =
-                     utf8::internal::validate_next(start, end, item);
-                 last != end && err_code == utf8::internal::UTF8_OK;
-                 err_code = utf8::internal::validate_next(start, end, item)) {
-                switch (item) {
-                case '<':
-                    Write("&lt;");
-                    break;
-                case '>':
-                    Write("&gt;");
-                    break;
-                case '&':
-                    Write("&amp;");
-                    break;
-                default:
-                    m_Stream.Write(NVConstDataRef<QT3DSU8>((const QT3DSU8 *)last, (QT3DSU32)(start - last)));
-                    break;
-                }
-                last = start;
-            }
+            QString str = QString::fromUtf8(nonNull(value)).toHtmlEscaped();
+            Write(str.toUtf8().constData());
             m_OpenElements.back().second = true;
         }
     }
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 d73be064..92f17245 100644
--- a/src/Runtime/Source/foundation/Qt3DSSimpleTypes.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSSimpleTypes.h
@@ -38,6 +38,7 @@
 // Platform specific types:
 // Design note: Its OK to use int for general loop variables and temps.
 
+#include <QtCore/qglobal.h>
 #include "foundation/Qt3DS.h"
 #include "foundation/Qt3DSPreprocessor.h"
 #include "EABase/eabase.h"
@@ -45,14 +46,21 @@
 namespace qt3ds {
 #endif //#ifndef QT3DS_DOXYGEN
 
-typedef uint8_t QT3DSU8;
-typedef int8_t QT3DSI8;
-typedef uint16_t QT3DSU16;
-typedef int16_t QT3DSI16;
-typedef uint32_t QT3DSU32;
-typedef int32_t QT3DSI32;
-typedef uint64_t QT3DSU64;
-typedef int64_t QT3DSI64;
+typedef quint8 QT3DSU8;
+typedef qint8 QT3DSI8;
+typedef quint16 QT3DSU16;
+typedef qint16 QT3DSI16;
+typedef quint32 QT3DSU32;
+typedef qint32 QT3DSI32;
+
+// Android's definition of GLuint64 as unsigned long (64-bits) requires this workaround
+#if Q_PROCESSOR_WORDSIZE == 8 && defined(Q_OS_ANDROID)
+typedef unsigned long QT3DSU64;
+#else
+typedef quint64 QT3DSU64;
+#endif
+
+typedef qint64 QT3DSI64;
 typedef float QT3DSF32;
 typedef double QT3DSF64;
 typedef QT3DSI32 IntBool;
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 34840103..bd12dfaf 100644
--- a/src/Runtime/Source/foundation/XML.cpp
+++ b/src/Runtime/ogl-runtime/src/foundation/XML.cpp
@@ -39,7 +39,6 @@
 #include "foundation/Utils.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "EASTL/hash_map.h"
-#include "utf8.h"
 
 #ifdef QT3DS_VC
 #include <windows.h> //output debug string
@@ -435,45 +434,9 @@ struct SimpleXmlWriter
         Write(SNameNS(name, ns));
 
         Write("=\"");
-        size_t valueLen = strlen(nonNull(value));
-        TXMLCharPtr start = value;
-        TXMLCharPtr end = value + valueLen;
-        TXMLCharPtr last = start;
-        uint32_t item = 0;
-        // Write out the data escaping unicode values where necessary
-        // I am using utf8::internal because it returns an error code and does not through
-        // exceptions; we don't always know the system we are running on will support or handle
-        // exceptions gracefully.
-        for (utf8::internal::utf_error err_code = utf8::internal::validate_next(start, end, item);
-             last != end && err_code == utf8::internal::UTF8_OK;
-             err_code = utf8::internal::validate_next(start, end, item)) {
-            switch (item) {
-            case '\r':
-                break;
-            case '\n':
-                Write("&#10;");
-                break;
-            case '\t':
-                Write("&#09;");
-                break;
-            case '<':
-                Write("&lt;");
-                break;
-            case '>':
-                Write("&gt;");
-                break;
-            case '"':
-                Write("&quot;");
-                break;
-            case '&':
-                Write("&amp;");
-                break;
-            default:
-                m_Stream.Write(NVConstDataRef<QT3DSU8>((const QT3DSU8 *)last, (QT3DSU32)(start - last)));
-                break;
-            }
-            last = start;
-        }
+
+        QString str = QString::fromUtf8(nonNull(value)).toHtmlEscaped();
+        Write(str.toUtf8().constData());
         Write("\"");
     }
     template <typename TData>
@@ -486,32 +449,9 @@ struct SimpleXmlWriter
     {
         if (!isTrivial(value)) {
             Close(false);
-            size_t valueLen = strlen(nonNull(value));
-            TXMLCharPtr start = value;
-            TXMLCharPtr end = value + valueLen;
-            TXMLCharPtr last = start;
-            uint32_t item = 0;
-            // Write out the data escaping unicode values where necessary
-            for (utf8::internal::utf_error err_code =
-                     utf8::internal::validate_next(start, end, item);
-                 last != end && err_code == utf8::internal::UTF8_OK;
-                 err_code = utf8::internal::validate_next(start, end, item)) {
-                switch (item) {
-                case '<':
-                    Write("&lt;");
-                    break;
-                case '>':
-                    Write("&gt;");
-                    break;
-                case '&':
-                    Write("&amp;");
-                    break;
-                default:
-                    m_Stream.Write(NVConstDataRef<QT3DSU8>((const QT3DSU8 *)last, (QT3DSU32)(start - last)));
-                    break;
-                }
-                last = start;
-            }
+
+            QString str = QString::fromUtf8(nonNull(value)).toHtmlEscaped();
+            Write(str.toUtf8().constData());
             m_OpenElements.back().second = true;
         }
     }
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 ec231d83..e1b9e857 100644
--- a/src/QtExtras/qmlstreamer/q3dsqmlstream.cpp
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlstream.cpp
@@ -29,23 +29,61 @@
 
 #include "q3dsqmlstream.h"
 
+/*!
+    \qmltype QmlStream
+    \instantiates Q3DSQmlStream
+    \inqmlmodule Qt3DStudio
+    \ingroup OpenGLRuntime
+    \brief Allows streaming of QML as subpresentation.
+
+    \sa Studio3D, Presentation, SubPresentation
+*/
+/*!
+    \class Q3DSQmlStream
+    \inmodule OpenGLRuntime
+    \since Qt 3D Studio 2.0
+    \brief Allows streaming of QML as subpresentation.
+    \param parent
+ */
+
+/*!
+ * \brief Q3DSQmlStream::Q3DSQmlStream Constructor
+ * \param parent Optional parent object.
+ */
 Q3DSQmlStream::Q3DSQmlStream(QObject *parent)
     : QObject(parent)
     , m_item(nullptr)
 {
-
 }
 
+/*!
+ * \brief Q3DSQmlStream::~Q3DSQmlStream Destructor.
+ */
 Q3DSQmlStream::~Q3DSQmlStream()
 {
-
 }
 
+/*!
+ * \qmlproperty string QmlStream::presentationId
+ * Contains the presentation id of this subpresentation.
+ */
+/*!
+ * \property Q3DSQmlStream::presentationId
+ * Contains the presentation id of this subpresentation.
+ */
 QString Q3DSQmlStream::presentationId() const
 {
     return m_presentationId;
 }
 
+/*!
+ * \qmlproperty Item QmlStream::item
+ * Contains the Item to be streamed as subpresentation.
+ */
+/*!
+ * \property Q3DSQmlStream::item
+ * Contains the QQuickItem to be streamed as subpresentation.
+ */
 QQuickItem *Q3DSQmlStream::item() const
 {
     return m_item;
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 8487909b..bde5ad31 100644
--- a/src/QtExtras/qmlstreamer/q3dsqmlsubpresentationsettings.cpp
+++ b/src/Runtime/ogl-runtime/src/qmlstreamer/q3dsqmlsubpresentationsettings.cpp
@@ -30,10 +30,27 @@
 #include "q3dsqmlsubpresentationsettings.h"
 #include "q3dsqmlstream.h"
 
+/*!
+    \qmltype SubPresentationSettings
+    \instantiates Q3DSSubPresentationSettings
+    \inqmlmodule Qt3DStudio
+    \ingroup OpenGLRuntime
+    \brief
+
+    \sa Studio3D, Presentation, QmlStream
+*/
+/*!
+    \class Q3DSSubPresentationSettings
+    \inmodule OpenGLRuntime
+    \since Qt 3D Studio 2.0
+    \brief Settings for subpresentations.
+    \param parent
+
+    \sa Q3DSPresentation, Q3DSQmlStream
+ */
 Q3DSSubPresentationSettings::Q3DSSubPresentationSettings(QObject *parent)
     : QObject(parent)
 {
-
 }
 
 Q3DSSubPresentationSettings::~Q3DSSubPresentationSettings()
@@ -41,6 +58,14 @@ Q3DSSubPresentationSettings::~Q3DSSubPresentationSettings()
     qDeleteAll(m_list);
 }
 
+/*!
+ * \qmlproperty variant SubPresentationSettings::qmlStream
+ * Contains the QML streams to be used as subpresentations.
+ */
+/*!
+ * \property Q3DSSubPresentationSettings::qmlStreams
+ * Contains the QML streams to be used as subpresentations.
+ */
 QQmlListProperty<Q3DSQmlStream> Q3DSSubPresentationSettings::qmlStreams()
 {
     return QQmlListProperty<Q3DSQmlStream>(this, m_list);
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 20e3fd57..df2f00fa 100644
--- a/src/Runtime/Source/runtime/Qt3DSApplication.cpp
+++ b/src/Runtime/ogl-runtime/src/runtime/Qt3DSApplication.cpp
@@ -688,6 +688,7 @@ struct SApp : public IApplication
         , m_createSuccessful(false)
         , mRefCount(0)
     {
+        m_PresentationId.append("__initial");
         m_AudioPlayer.SetApplication(*this);
         eastl::string tempStr(inAppDir);
         CFileTools::NormalizePath(tempStr);
@@ -734,15 +735,22 @@ struct SApp : public IApplication
         if (oldId == id)
             return;
 
+        CRegisteredString idStr = m_CoreFactory->GetStringTable().RegisterStr(id);
         // Update id key in m_AssetMap
         TIdAssetMap::iterator iter
                 = m_AssetMap.find(m_CoreFactory->GetStringTable().RegisterStr(oldId));
         if (iter != m_AssetMap.end()
                 && iter->second->getType() == AssetValueTypes::Presentation) {
-            CRegisteredString idStr = m_CoreFactory->GetStringTable().RegisterStr(id);
             m_AssetMap.insert(eastl::make_pair(idStr, iter->second));
             m_AssetMap.erase(iter);
         }
+        for (unsigned i = 0; i < m_OrderedAssets.size(); i++) {
+            auto &asset = m_OrderedAssets[i];
+            if (oldId == asset.first.c_str()) {
+                asset.first = idStr;
+                break;
+            }
+        }
 
         m_PresentationId.assign(qPrintable(id));
     }
@@ -1489,12 +1497,12 @@ struct SApp : public IApplication
         m_variantConfig.setVariantList(variantList);
         bool retval = false;
         if (extension.comparei("uip") == 0) {
-            m_PresentationId.assign(filename.c_str());
+            m_PresentationId.assign("__initial");
             eastl::string relativePath = "./";
             relativePath.append(filename);
             relativePath.append(".");
             relativePath.append("uip");
-            RegisterAsset(SPresentationAsset(RegisterStr(filename.c_str()),
+            RegisterAsset(SPresentationAsset(RegisterStr(m_PresentationId.c_str()),
                                              RegisterStr(relativePath.c_str())));
             m_AppLoadContext = IAppLoadContext::CreateXMLLoadContext(*this, "");
 
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..77d4ee64 100644
--- a/src/Runtime/Source/runtimerender/Qt3DSRenderShaderCache.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/Qt3DSRenderShaderCache.cpp
@@ -282,6 +282,10 @@ struct ShaderCache : public IShaderCache
 
             if (m_RenderContext.IsAdvancedBlendHwSupportedKHR())
                 m_InsertStr += "layout(blend_support_all_equations) out;\n";
+
+            m_InsertStr += "#ifndef NO_FRAG_OUTPUT\n";
+            m_InsertStr += "out vec4 fragOutput;\n";
+            m_InsertStr += "#endif\n";
         }
     }
 
@@ -367,6 +371,17 @@ struct ShaderCache : public IShaderCache
 
         m_InsertStr.append(versionStr.toLatin1().data());
 
+        if (inFeatures.size()) {
+            for (QT3DSU32 idx = 0, end = inFeatures.size(); idx < end; ++idx) {
+                SShaderPreprocessorFeature feature(inFeatures[idx]);
+                m_InsertStr.append("#define ");
+                m_InsertStr.append(inFeatures[idx].m_Name.c_str());
+                m_InsertStr.append(" ");
+                m_InsertStr.append(feature.m_Enabled ? "1" : "0");
+                m_InsertStr.append("\n");
+            }
+        }
+
         if (isGlES) {
             if (!IQt3DSRenderer::IsGlEs3Context(m_RenderContext.GetRenderContextType())) {
                 if (shaderType == ShaderType::Fragment) {
@@ -435,31 +450,7 @@ struct ShaderCache : public IShaderCache
             m_InsertStr += "#define TESSELLATION_EVALUATION_SHADER 1\n";
         }
 
-        int fragOutputIndex = int(m_InsertStr.size());
         str.insert(0, m_InsertStr);
-        if (inFeatures.size()) {
-            eastl::string::size_type insertPos = int(m_InsertStr.size());
-            m_InsertStr.clear();
-            for (QT3DSU32 idx = 0, end = inFeatures.size(); idx < end; ++idx) {
-                SShaderPreprocessorFeature feature(inFeatures[idx]);
-                m_InsertStr.append("#define ");
-                m_InsertStr.append(inFeatures[idx].m_Name.c_str());
-                m_InsertStr.append(" ");
-                m_InsertStr.append(feature.m_Enabled ? "1" : "0");
-                m_InsertStr.append("\n");
-            }
-            str.insert(insertPos, m_InsertStr);
-            fragOutputIndex = insertPos + int(m_InsertStr.size());
-        }
-
-        // Add fragOutput for desktop OpenGL and OpenGL ES 3.x after feature defines
-        if (!isGlES || IQt3DSRenderer::IsGlEs3Context(m_RenderContext.GetRenderContextType())) {
-            m_InsertStr.clear();
-            m_InsertStr += "#ifndef NO_FRAG_OUTPUT\n";
-            m_InsertStr += "out vec4 fragOutput;\n";
-            m_InsertStr += "#endif\n";
-            str.insert(fragOutputIndex, m_InsertStr);
-        }
     }
     // Compile this program overwriting any existing ones.
     NVRenderShaderProgram *
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 6330919c..65d57da8 100644
--- a/src/Runtime/Source/system/Qt3DSTypes.h
+++ b/src/Runtime/ogl-runtime/src/system/Qt3DSTypes.h
@@ -30,6 +30,8 @@
 
 #pragma once
 
+#include <QtCore/qglobal.h>
+
 //==============================================================================
 //	Namespace
 //==============================================================================
@@ -39,14 +41,16 @@ namespace Q3DStudio {
 //	Typedefs
 //==============================================================================
 typedef bool BOOL; ///< true or false, usually 8 bits
-typedef signed char INT8; ///< A signed 8-bit integer, not a character
-typedef unsigned char UINT8; ///< An unsigned 8-bit integer 0-255, not a character
-typedef signed short INT16; ///< A signed 16-bit integer
-typedef unsigned short UINT16; ///< An unsigned 16-bit integer
-typedef int INT32; ///< A signed 32-bit integer
-typedef unsigned int UINT32; ///< An unsigned 32-bit integer
+typedef qint8 INT8; ///< A signed 8-bit integer, not a character
+typedef quint8 UINT8; ///< An unsigned 8-bit integer 0-255, not a character
+typedef qint16 INT16; ///< A signed 16-bit integer
+typedef quint16 UINT16; ///< An unsigned 16-bit integer
+typedef qint32 INT32; ///< A signed 32-bit integer
+typedef quint32 UINT32; ///< An unsigned 32-bit integer
 typedef float FLOAT; ///< A 32-bit floating point number
 typedef char CHAR; ///< String character, not a number
+typedef qint64 INT64;
+typedef quint64 UINT64;
 
 #ifndef TRUE
 #define TRUE 1
@@ -67,123 +71,11 @@ INT32 Q3DStudio_maxbits(const INT32 inBitCount, const BOOL inUnsigned);
 #define AKMAX_INT32 0x7FFFFFFFL
 #define AKMAX_UINT32 0xFFFFFFFFUL
 
-//==============================================================================
-//	Platform specific vectors and matrices
-//==============================================================================
-#if defined(_PCPLATFORM)
-
-typedef FILE TFile;
-typedef size_t TFileSize;
-
 #define Q3DStudio_INT64_C(x) x
 #define Q3DStudio_UINT64_C(x) x
 
-typedef __int64 INT64;
-typedef unsigned __int64 UINT64;
-
-struct VECTOR4
-{
-    union {
-        FLOAT v[4];
-        UINT32 u[4];
-    };
-
-    FLOAT &x() { return v[0]; }
-    FLOAT &y() { return v[1]; }
-    FLOAT &z() { return v[2]; }
-    FLOAT &w() { return v[3]; }
-};
-
-struct MATRIX16
-{
-    union {
-        VECTOR4 v[4];
-        FLOAT m[4][4];
-        FLOAT f[16];
-    };
-
-    FLOAT &_11() { return f[0]; }
-    FLOAT &_12() { return f[1]; }
-    FLOAT &_13() { return f[2]; }
-    FLOAT &_14() { return f[3]; }
-    FLOAT &_21() { return f[4]; }
-    FLOAT &_22() { return f[5]; }
-    FLOAT &_23() { return f[6]; }
-    FLOAT &_24() { return f[7]; }
-    FLOAT &_31() { return f[8]; }
-    FLOAT &_32() { return f[9]; }
-    FLOAT &_33() { return f[10]; }
-    FLOAT &_34() { return f[11]; }
-    FLOAT &_41() { return f[12]; }
-    FLOAT &_42() { return f[13]; }
-    FLOAT &_43() { return f[14]; }
-    FLOAT &_44() { return f[15]; }
-};
-
-#elif defined(_TEGRAPLATFORM)
-
-// TODO: sk - We used both WinCE and OpenKode file system utilities. Using non-OpenKode restores
-// functionality in a hacky way
-//			 but ultimately sticking to just 1 system would definitely be cleaner.
 typedef FILE TFile;
 typedef size_t TFileSize;
-// typedef KDFile 				TFile;
-// typedef KDsize 				TFileSize;
-
-#define Q3DStudio_INT64_C(x) x
-#define Q3DStudio_UINT64_C(x) x
-
-typedef __int64 INT64;
-typedef unsigned __int64 UINT64;
-
-struct VECTOR4
-{
-    union {
-        FLOAT v[4];
-        UINT32 u[4];
-    };
-    FLOAT &x() { return v[0]; }
-    FLOAT &y() { return v[1]; }
-    FLOAT &z() { return v[2]; }
-    FLOAT &w() { return v[3]; }
-};
-
-struct MATRIX16
-{
-    union {
-        VECTOR4 v[4];
-        FLOAT m[4][4];
-        FLOAT f[16];
-    };
-
-    FLOAT &_11() { return f[0]; }
-    FLOAT &_12() { return f[1]; }
-    FLOAT &_13() { return f[2]; }
-    FLOAT &_14() { return f[3]; }
-    FLOAT &_21() { return f[4]; }
-    FLOAT &_22() { return f[5]; }
-    FLOAT &_23() { return f[6]; }
-    FLOAT &_24() { return f[7]; }
-    FLOAT &_31() { return f[8]; }
-    FLOAT &_32() { return f[9]; }
-    FLOAT &_33() { return f[10]; }
-    FLOAT &_34() { return f[11]; }
-    FLOAT &_41() { return f[12]; }
-    FLOAT &_42() { return f[13]; }
-    FLOAT &_43() { return f[14]; }
-    FLOAT &_44() { return f[15]; }
-};
-
-#elif defined(_LINUXPLATFORM) || defined(_INTEGRITYPLATFORM)
-
-typedef FILE TFile;
-typedef size_t TFileSize;
-
-#define Q3DStudio_INT64_C(x) x
-#define Q3DStudio_UINT64_C(x) x
-
-typedef int64_t INT64;
-typedef uint64_t UINT64;
 
 struct VECTOR4
 {
@@ -224,13 +116,6 @@ struct MATRIX16
     FLOAT &_44() { return f[15]; }
 };
 
-#else
-
-#error "A platform must be defined"
-
-#endif
-
 typedef INT64 TMicroSeconds; ///< Time in microseconds
 typedef INT64 TTimeUnit; ///< Time in milliseconds
-
 } // namespace Q3DStudio
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..534af9f8 100644
--- a/tests/auto/runtime/runtime.pro
+++ b/tests/auto/runtime/runtime.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 CONFIG += testcase
-include($$PWD/../../../src/Runtime/commoninclude.pri)
+include($$PWD/../../../src/Runtime/ogl-runtime/commoninclude.pri)
 
 TARGET = tst_qt3dsruntime
 QT += testlib gui
@@ -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 \
diff --git a/tests/auto/studio3d/q3dswidget/q3dswidget.pro b/tests/auto/studio3d/q3dswidget/q3dswidget.pro
deleted file mode 100644
index 82339b2b..00000000
--- a/tests/auto/studio3d/q3dswidget/q3dswidget.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-CONFIG += testcase
-
-TARGET = tst_q3dswidget
-
-QT += testlib studio3d
-
-SOURCES += tst_q3dswidget.cpp
-
-RESOURCES += ../shared/shared_presentations.qrc
diff --git a/tests/auto/studio3d/q3dswidget/tst_q3dswidget.cpp b/tests/auto/studio3d/q3dswidget/tst_q3dswidget.cpp
deleted file mode 100644
index c92a9159..00000000
--- a/tests/auto/studio3d/q3dswidget/tst_q3dswidget.cpp
+++ /dev/null
@@ -1,1040 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of Qt 3D Studio.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest/QtTest>
-#include <QtStudio3D/q3dswidget.h>
-#include <QtStudio3D/q3dsviewersettings.h>
-#include <QtStudio3D/q3dspresentation.h>
-#include <QtStudio3D/q3dssceneelement.h>
-#include <QtGui/qwindow.h>
-#include <QtGui/qopenglcontext.h>
-#include <QtGui/qpixmap.h>
-#include <QtGui/qimage.h>
-#include <QtGui/qscreen.h>
-#include <QtGui/qopenglframebufferobject.h>
-#include <QtGui/qevent.h>
-#include <QtWidgets/qmainwindow.h>
-#include <QtCore/qurl.h>
-#include <QtCore/qfile.h>
-#include "../shared/shared_presentations.h"
-
-class tst_Q3DSWidget : public QObject
-{
-    Q_OBJECT
-public:
-    tst_Q3DSWidget();
-    ~tst_Q3DSWidget() {}
-
-private slots:
-    void initTestCase();
-    void init();
-    void cleanup();
-
-    void testBasics();
-    void testSourceChange();
-    void testUpdateInterval();
-    void testMultiple();
-    void testReset();
-    void testSettings();
-    void testPresentation();
-    void testPresentationActivation();
-    void testScene();
-    void testMouseInput();
-
-private:
-    QMainWindow *createWindow(const QSize &size);
-
-    // Created viewers are returned via *&viewer parameter rather than return value, so that we can
-    // use QCOMPARE and QVERIFY inside these functions (they require void return value).
-    void createViewer(Q3DSWidget *&viewer, QMainWindow *window, const QUrl &url,
-                      int updateInterval);
-    void createWindowAndViewer(Q3DSWidget *&viewer, const QUrl &url,
-                               const QSize &size = QSize(), int updateInterval = 0);
-    void checkPixel(Q3DSWidget *viewer, const QColor &color,
-                    const QPoint &pixel = QPoint(50, 50));
-
-    QMainWindow *m_window;
-    Q3DSWidget *m_viewer;
-};
-
-tst_Q3DSWidget::tst_Q3DSWidget()
-    : m_window(nullptr)
-    , m_viewer(nullptr)
-{
-}
-
-//#define DUMP_LOGFILE  // Uncomment log Qt 3D Studio internal messages to log.txt file
-void messageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
-{
-    Q_UNUSED(context);
-    switch (type) {
-    //    case QtDebugMsg:
-    case QtInfoMsg:
-    case QtWarningMsg:
-    case QtCriticalMsg: {
-#ifdef DUMP_LOGFILE
-        QFile file("log.txt");
-        if (file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append)) {
-            QTextStream stream(&file);
-            stream << msg << "\n";
-        }
-        file.close();
-#endif
-    } break; // swallow
-    case QtFatalMsg:
-        QFAIL(msg.toLocal8Bit().constData());
-    }
-}
-
-void tst_Q3DSWidget::initTestCase()
-{
-    qInstallMessageHandler(messageOutput);
-#ifdef DUMP_LOGFILE
-    QFile file("log.txt");
-    if (file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
-        QTextStream stream(&file);
-        stream << "Log file: " << QTime::currentTime().toString() << "\n";
-    }
-    file.close();
-#endif
-}
-
-void tst_Q3DSWidget::init()
-{
-}
-
-void tst_Q3DSWidget::cleanup()
-{
-    if (m_window)
-        m_window->close();
-
-    delete m_viewer;
-    m_viewer = nullptr;
-
-    delete m_window;
-    m_window = nullptr;
-}
-
-QMainWindow *tst_Q3DSWidget::createWindow(const QSize &size)
-{
-    QMainWindow *window = new QMainWindow();
-
-    window->resize(size);
-
-    return window;
-}
-
-void tst_Q3DSWidget::createViewer(Q3DSWidget *&viewer, QMainWindow *window, const QUrl &url,
-                                  int updateInterval)
-{
-    viewer = new Q3DSWidget();
-    QSignalSpy spy(viewer, &Q3DSWidget::runningChanged);
-
-    window->setCentralWidget(viewer);
-
-    viewer->presentation()->setSource(url);
-    QCOMPARE(viewer->presentation()->source(), url);
-
-    QVERIFY(spy.isValid());
-    QCOMPARE(spy.count(), 0);
-
-    viewer->setUpdateInterval(updateInterval);
-
-    QVERIFY(viewer->initialize());
-
-    QCOMPARE(spy.count(), 1);
-    QVERIFY(viewer->isRunning());
-}
-
-void tst_Q3DSWidget::createWindowAndViewer(Q3DSWidget *&viewer, const QUrl &url,
-                                           const QSize &size, int updateInterval)
-{
-    QSize actualSize = size;
-    if (actualSize.isEmpty())
-        actualSize = QSize(300, 200);
-
-    m_window = createWindow(actualSize);
-    m_window->show();
-
-    createViewer(viewer, m_window, url, updateInterval);
-
-    QGuiApplication::processEvents();
-}
-
-void tst_Q3DSWidget::checkPixel(Q3DSWidget *viewer, const QColor &color,
-                                const QPoint &pixel)
-{
-    // Grab operation is potentially costly, so retry only every second instead of using
-    // QTRY_COMPARE which would try it every 50ms. We also want to wait first as it takes some time
-    // for the presentation to be displayed.
-    QColor grabColor;
-    for (int i = 0; i < 20; i++) {
-        QTest::qWait(1000);
-        QImage image = viewer->grabFramebuffer();
-        grabColor = QColor(image.pixel(pixel));
-        if (grabColor == color)
-            break;
-    }
-    QCOMPARE(grabColor, color);
-}
-
-void tst_Q3DSWidget::testBasics()
-{
-    createWindowAndViewer(m_viewer, RED);
-
-    QSignalSpy spy(m_viewer, &Q3DSWidget::runningChanged);
-    QVERIFY(spy.isValid());
-
-    checkPixel(m_viewer, Qt::red);
-
-    m_viewer->shutdown();
-
-    QCOMPARE(spy.count(), 1);
-    QVERIFY(!m_viewer->isRunning());
-}
-
-void tst_Q3DSWidget::testSourceChange()
-{
-    createWindowAndViewer(m_viewer, RED);
-
-    QSignalSpy spy(m_viewer->presentation(), &Q3DSPresentation::sourceChanged);
-    QVERIFY(spy.isValid());
-    QVERIFY(m_viewer->presentation()->source() == RED);
-
-    checkPixel(m_viewer, Qt::red);
-
-    // Different source
-    m_viewer->presentation()->setSource(BLUE);
-    QCOMPARE(spy.count(), 1);
-    QVERIFY(m_viewer->presentation()->source() == BLUE);
-
-    checkPixel(m_viewer, Qt::blue);
-
-    // Reset same source
-    m_viewer->presentation()->setSource(BLUE);
-    QCOMPARE(spy.count(), 1);
-    QVERIFY(m_viewer->presentation()->source() == BLUE);
-
-    checkPixel(m_viewer, Qt::blue);
-
-    // Different source again
-    m_viewer->presentation()->setSource(RED);
-    QCOMPARE(spy.count(), 2);
-    QVERIFY(m_viewer->presentation()->source() == RED);
-
-    checkPixel(m_viewer, Qt::red);
-}
-
-void tst_Q3DSWidget::testUpdateInterval()
-{
-    createWindowAndViewer(m_viewer, ANIMATION);
-
-    m_viewer->settings()->setScaleMode(Q3DSViewerSettings::ScaleModeFill);
-
-    QSignalSpy spy(m_viewer, &Q3DSWidget::updateIntervalChanged);
-    QVERIFY(spy.isValid());
-    QVERIFY(m_viewer->updateInterval() == 0);
-
-    checkPixel(m_viewer, Qt::black);
-    {
-        // Grab two images two seconds apart to verify animation is happening
-        QImage image1 = m_viewer->grabFramebuffer();
-        QTest::qWait(2000);
-        QImage image2 = m_viewer->grabFramebuffer();
-        QVERIFY(image1 != image2);
-
-    }
-    {
-        m_viewer->setUpdateInterval(100000);
-        QVERIFY(m_viewer->updateInterval() == 100000);
-        QCOMPARE(spy.count(), 1);
-        // Can't test if animation actually stopped, as grabbing the viewer forces update on it
-    }
-    {
-        m_viewer->setUpdateInterval(20);
-        QCOMPARE(spy.count(), 2);
-        QVERIFY(m_viewer->updateInterval() == 20);
-
-        // Non-zero interval short enough to see animation
-        QImage image1 = m_viewer->grabFramebuffer();
-        QTest::qWait(2000);
-        QImage image2 = m_viewer->grabFramebuffer();
-        QVERIFY(image1 != image2);
-    }
-    {
-        m_viewer->setUpdateInterval(-1);
-        QCOMPARE(spy.count(), 3);
-        QVERIFY(m_viewer->updateInterval() == -1);
-        // Can't test if animation actually stopped, as grabbing the viewer forces update on it
-    }
-}
-
-void tst_Q3DSWidget::testMultiple()
-{
-    int viewerCount = 3;
-
-    QVector<QMainWindow *> windows;
-    QVector<Q3DSWidget *> viewers;
-
-    windows.resize(viewerCount);
-    viewers.resize(viewerCount);
-
-    QSize size(200, 150);
-    QUrl url;
-    for (int i = 0; i < viewerCount; i++) {
-        windows[i] = createWindow(size);
-        if (i % 2)
-            url = RED;
-        else
-            url = BLUE;
-        windows[i]->move(10 + i * 50, 10 + i * 50);
-        windows[i]->show();
-        createViewer(viewers[i], windows[i], url, 0);
-        QGuiApplication::processEvents();
-    }
-
-    for (int i = 0; i < viewerCount; i++) {
-        if (i % 2)
-            checkPixel(viewers[i], Qt::red);
-        else
-            checkPixel(viewers[i], Qt::blue);
-    }
-
-    for (QMainWindow *w : windows) {
-        w->close();
-        delete w;
-    }
-    windows.clear();
-}
-
-void tst_Q3DSWidget::testReset()
-{
-    createWindowAndViewer(m_viewer, RED);
-
-    checkPixel(m_viewer, Qt::red);
-
-    // TODO: change color of the cube to blue (not currently possible, API missing)
-    // checkPixel(m_viewer, Qt::blue);
-
-    m_viewer->reset();
-
-    checkPixel(m_viewer, Qt::red);
-}
-
-void tst_Q3DSWidget::testSettings()
-{
-    int width = 500;
-    int height = 500;
-
-    createWindowAndViewer(m_viewer, SETTINGS, QSize(width, height));
-
-    Q3DSViewerSettings *s = m_viewer->settings();
-
-    QSignalSpy spy1(s, &Q3DSViewerSettings::matteColorChanged);
-    QSignalSpy spy2(s, &Q3DSViewerSettings::showRenderStatsChanged);
-    QSignalSpy spy3(s, &Q3DSViewerSettings::shadeModeChanged);
-    QSignalSpy spy4(s, &Q3DSViewerSettings::scaleModeChanged);
-    QVERIFY(spy1.isValid());
-    QVERIFY(spy2.isValid());
-    QVERIFY(spy3.isValid());
-    QVERIFY(spy4.isValid());
-
-    // Check defaults
-    QCOMPARE(s->matteColor(), QColor(Qt::black));
-    QCOMPARE(s->isShowRenderStats(), false);
-    QCOMPARE(s->shadeMode(), Q3DSViewerSettings::ShadeModeShaded);
-    QCOMPARE(s->scaleMode(), Q3DSViewerSettings::ScaleModeCenter);
-
-    // Matte
-    checkPixel(m_viewer, Qt::black);
-
-    s->setMatteColor(Qt::cyan);
-    QCOMPARE(s->matteColor(), QColor(Qt::cyan));
-
-    QCOMPARE(spy1.count(), 1);
-    QCOMPARE(spy2.count(), 0);
-    QCOMPARE(spy3.count(), 0);
-    QCOMPARE(spy4.count(), 0);
-
-    checkPixel(m_viewer, Qt::cyan);
-
-    // Render stats
-    QImage image1 = m_viewer->grabFramebuffer();
-
-    s->setShowRenderStats(true);
-    QCOMPARE(s->isShowRenderStats(), true);
-
-    QCOMPARE(spy1.count(), 1);
-    QCOMPARE(spy2.count(), 1);
-    QCOMPARE(spy3.count(), 0);
-    QCOMPARE(spy4.count(), 0);
-
-    QImage image2 = m_viewer->grabFramebuffer();
-    QVERIFY(image1 != image2);
-
-    // ShadeMode
-    image1 = m_viewer->grabFramebuffer();
-
-    s->setShadeMode(Q3DSViewerSettings::ShadeModeShadedWireframe);
-    QCOMPARE(s->shadeMode(), Q3DSViewerSettings::ShadeModeShadedWireframe);
-
-    QCOMPARE(spy1.count(), 1);
-    QCOMPARE(spy2.count(), 1);
-    QCOMPARE(spy3.count(), 1);
-    QCOMPARE(spy4.count(), 0);
-
-    image2 = m_viewer->grabFramebuffer();
-    QVERIFY(image1 != image2);
-
-    // Restore shade mode so following tests are not affected by wireframes
-    s->setShadeMode(Q3DSViewerSettings::ShadeModeShaded);
-
-    // ScaleMode
-    checkPixel(m_viewer, Qt::cyan);
-    checkPixel(m_viewer, Qt::cyan, QPoint(50, height / 2));
-    s->setScaleMode(Q3DSViewerSettings::ScaleModeFit);
-    QCOMPARE(s->scaleMode(), Q3DSViewerSettings::ScaleModeFit);
-
-    QCOMPARE(spy1.count(), 1);
-    QCOMPARE(spy2.count(), 1);
-    QCOMPARE(spy3.count(), 2);
-    QCOMPARE(spy4.count(), 1);
-
-    checkPixel(m_viewer, Qt::cyan);
-    checkPixel(m_viewer, Qt::red, QPoint(50, height / 2));
-
-    s->setScaleMode(Q3DSViewerSettings::ScaleModeFill);
-    QCOMPARE(s->scaleMode(), Q3DSViewerSettings::ScaleModeFill);
-
-    QCOMPARE(spy1.count(), 1);
-    QCOMPARE(spy2.count(), 1);
-    QCOMPARE(spy3.count(), 2);
-    QCOMPARE(spy4.count(), 2);
-
-    checkPixel(m_viewer, Qt::blue);
-    checkPixel(m_viewer, Qt::red, QPoint(50, height / 2));
-
-    // Saving & loading settings
-    s->save(QStringLiteral("testViewer"), QStringLiteral("The Qt Company"),
-            QStringLiteral("tst_q3dsurfaceviewer"));
-
-    image1 = m_viewer->grabFramebuffer();
-
-    s->setMatteColor(Qt::yellow);
-    s->setShowRenderStats(false);
-    s->setShadeMode(Q3DSViewerSettings::ShadeModeShadedWireframe);
-    s->setScaleMode(Q3DSViewerSettings::ScaleModeFit);
-
-    QCOMPARE(s->matteColor(), QColor(Qt::yellow));
-    QCOMPARE(s->isShowRenderStats(), false);
-    QCOMPARE(s->shadeMode(), Q3DSViewerSettings::ShadeModeShadedWireframe);
-    QCOMPARE(s->scaleMode(), Q3DSViewerSettings::ScaleModeFit);
-
-    QCOMPARE(spy1.count(), 2);
-    QCOMPARE(spy2.count(), 2);
-    QCOMPARE(spy3.count(), 3);
-    QCOMPARE(spy4.count(), 3);
-
-    image2 = m_viewer->grabFramebuffer();
-
-    s->load(QStringLiteral("testViewer"), QStringLiteral("The Qt Company"),
-            QStringLiteral("tst_q3dsurfaceviewer"));
-
-    QCOMPARE(s->matteColor(), QColor(Qt::cyan));
-    QCOMPARE(s->isShowRenderStats(), true);
-    QCOMPARE(s->shadeMode(), Q3DSViewerSettings::ShadeModeShaded);
-    QCOMPARE(s->scaleMode(), Q3DSViewerSettings::ScaleModeFill);
-
-    QCOMPARE(spy1.count(), 3);
-    QCOMPARE(spy2.count(), 3);
-    QCOMPARE(spy3.count(), 4);
-    QCOMPARE(spy4.count(), 4);
-
-    QImage image3 = m_viewer->grabFramebuffer();
-    QVERIFY(image1 != image2);
-    QVERIFY(image3 != image2);
-    QVERIFY(image1 == image3);
-
-    // Clean up the settings so they don't pollute the system (and we have clean slate next time)
-    QSettings(QStringLiteral("The Qt Company"), QStringLiteral("tst_q3dwidget")).clear();
-}
-
-void tst_Q3DSWidget::testPresentation()
-{
-    createWindowAndViewer(m_viewer, MULTISLIDE);
-
-    m_viewer->setUpdateBehavior(QOpenGLWidget::PartialUpdate);
-
-    m_viewer->settings()->setScaleMode(Q3DSViewerSettings::ScaleModeFill);
-
-    QList<QVariant> args;
-    Q3DSPresentation *p = m_viewer->presentation();
-    QSignalSpy spy1(p, &Q3DSPresentation::slideEntered);
-    QSignalSpy spy2(p, &Q3DSPresentation::slideExited);
-    QVERIFY(spy1.isValid());
-    QVERIFY(spy2.isValid());
-
-    // There are three different "scenes":
-    // The main Scene, three slides: S1, S2, S3
-    // Two components on Scene.Layer:
-    //   Scene.Layer.Component1, two slides: C1S1, C1S2
-    //   Scene.Layer.Component2, two slides: C2S1, C2S2
-    // The component slides also get enter when parent slide is entered, but they do not get
-    // the corresponding exit if parent slide is exited.
-    QString path = QStringLiteral("Scene");
-    QString pathC1 = QStringLiteral("Scene.Layer.Component1");
-    QString pathC2 = QStringLiteral("Scene.Layer.Component2");
-    QPoint mainPoint(m_viewer->size().width() * 2 / 8, m_viewer->size().height() / 2);
-    QPoint bgPoint(m_viewer->size().width() * 2 / 8, m_viewer->size().height() / 32);
-    QPoint c1Point(m_viewer->size().width() * 5 / 8, m_viewer->size().height() / 2);
-    QPoint c2Point(m_viewer->size().width() * 7 / 8, m_viewer->size().height() / 2);
-
-    checkPixel(m_viewer, Qt::red, mainPoint);
-    checkPixel(m_viewer, Qt::green, c1Point);
-    checkPixel(m_viewer, Qt::yellow, c2Point);
-
-    QCOMPARE(spy1.count(), 3);
-    QCOMPARE(spy2.count(), 0);
-
-    // String Attribute
-    QImage image1 = m_viewer->grabFramebuffer();
-    p->setAttribute(QStringLiteral("Scene.Layer.Text"),
-                    QStringLiteral("textstring"), QStringLiteral("Test!"));
-    QImage image2 = m_viewer->grabFramebuffer();
-    QTRY_VERIFY(image1 != image2);
-
-    // Float Attribute
-    p->setAttribute(QStringLiteral("Scene.Layer.Rect.Material"),
-                    QStringLiteral("diffuse.r"), 0.0);
-    p->setAttribute(QStringLiteral("Scene.Layer.Rect.Material"),
-                    QStringLiteral("diffuse.g"), 1.0);
-    p->setAttribute(QStringLiteral("Scene.Layer.Rect.Material"),
-                    QStringLiteral("diffuse.b"), 1.0);
-
-    checkPixel(m_viewer, Qt::cyan, mainPoint);
-    checkPixel(m_viewer, Qt::green, c1Point);
-    checkPixel(m_viewer, Qt::yellow, c2Point);
-
-    p->setAttribute(QStringLiteral("Scene.Layer.Rect.Material"),
-                    QStringLiteral("diffuse.r"), 1.0);
-    p->setAttribute(QStringLiteral("Scene.Layer.Rect.Material"),
-                    QStringLiteral("diffuse.g"), 0.0);
-    p->setAttribute(QStringLiteral("Scene.Layer.Rect.Material"),
-                    QStringLiteral("diffuse.b"), 0.0);
-
-    checkPixel(m_viewer, Qt::red, mainPoint);
-    checkPixel(m_viewer, Qt::green, c1Point);
-    checkPixel(m_viewer, Qt::yellow, c2Point);
-
-    // Bool Attribute
-    checkPixel(m_viewer, Qt::yellow, bgPoint);
-    p->setAttribute(QStringLiteral("Scene"), QStringLiteral("bgcolorenable"), false);
-    checkPixel(m_viewer, Qt::black, bgPoint);
-
-    // Slide changes
-    p->goToSlide(path, 2);
-    checkPixel(m_viewer, Qt::blue, mainPoint);
-    checkPixel(m_viewer, Qt::blue, c1Point);
-    checkPixel(m_viewer, Qt::blue, c2Point);
-
-    QCOMPARE(spy1.count(), 4);
-    QCOMPARE(spy2.count(), 1);
-    args = spy1.last();
-    QCOMPARE(args.at(0).toString(), path);
-    QCOMPARE(args.at(1).toInt(), 2);
-    QCOMPARE(args.at(2).toString(), QStringLiteral("S2"));
-    args = spy2.last();
-    QCOMPARE(args.at(0).toString(), path);
-    QCOMPARE(args.at(1).toInt(), 1);
-    QCOMPARE(args.at(2).toString(), QStringLiteral("S1"));
-
-    // Time change
-    p->goToTime(path, 7);
-    checkPixel(m_viewer, Qt::black, mainPoint);
-    QCOMPARE(spy1.count(), 4);
-    QCOMPARE(spy2.count(), 1);
-
-    // More complex slide changes
-    // Changing slide that is not visible should not trigger enter signals
-    // The slides should still change, though, and become visible later when we switch back to S1
-    p->goToSlide(pathC1, QStringLiteral("C1S2"));
-    p->goToSlide(pathC2, QStringLiteral("C2S2"));
-    QCOMPARE(spy1.count(), 4);
-    QCOMPARE(spy2.count(), 1);
-
-    p->goToSlide(path, QStringLiteral("S1"));
-    checkPixel(m_viewer, Qt::red, mainPoint);
-    checkPixel(m_viewer, Qt::cyan, c1Point);
-    checkPixel(m_viewer, Qt::magenta, c2Point);
-    QCOMPARE(spy1.count(), 7);
-    QCOMPARE(spy2.count(), 2);
-
-    p->goToSlide(pathC1, QStringLiteral("C1S1"));
-    checkPixel(m_viewer, Qt::red, mainPoint);
-    checkPixel(m_viewer, Qt::green, c1Point);
-    checkPixel(m_viewer, Qt::magenta, c2Point);
-    QCOMPARE(spy1.count(), 8);
-    QCOMPARE(spy2.count(), 3);
-
-    args = spy1.last();
-    QCOMPARE(args.at(0).toString(), pathC1);
-    QCOMPARE(args.at(1).toInt(), 1);
-    QCOMPARE(args.at(2).toString(), QStringLiteral("C1S1"));
-    args = spy2.last();
-    QCOMPARE(args.at(0).toString(), pathC1);
-    QCOMPARE(args.at(1).toInt(), 2);
-    QCOMPARE(args.at(2).toString(), QStringLiteral("C1S2"));
-
-    p->goToSlide(pathC2, QStringLiteral("C2S1"));
-    checkPixel(m_viewer, Qt::red, mainPoint);
-    checkPixel(m_viewer, Qt::green, c1Point);
-    checkPixel(m_viewer, Qt::yellow, c2Point);
-    QCOMPARE(spy1.count(), 9);
-    QCOMPARE(spy2.count(), 4);
-
-    args = spy1.last();
-    QCOMPARE(args.at(0).toString(), pathC2);
-    QCOMPARE(args.at(1).toInt(), 1);
-    QCOMPARE(args.at(2).toString(), QStringLiteral("C2S1"));
-    args = spy2.last();
-    QCOMPARE(args.at(0).toString(), pathC2);
-    QCOMPARE(args.at(1).toInt(), 2);
-    QCOMPARE(args.at(2).toString(), QStringLiteral("C2S2"));
-
-    p->goToSlide(path, true, true);
-    checkPixel(m_viewer, Qt::blue, mainPoint);
-    checkPixel(m_viewer, Qt::blue, c1Point);
-    checkPixel(m_viewer, Qt::blue, c2Point);
-    QCOMPARE(spy1.count(), 10);
-    QCOMPARE(spy2.count(), 5);
-
-    args = spy1.last();
-    QCOMPARE(args.at(0).toString(), path);
-    QCOMPARE(args.at(1).toInt(), 2);
-    QCOMPARE(args.at(2).toString(), QStringLiteral("S2"));
-    args = spy2.last();
-    QCOMPARE(args.at(0).toString(), path);
-    QCOMPARE(args.at(1).toInt(), 1);
-    QCOMPARE(args.at(2).toString(), QStringLiteral("S1"));
-
-    p->goToSlide(path, false, true);
-    checkPixel(m_viewer, Qt::red, mainPoint);
-    checkPixel(m_viewer, Qt::green, c1Point);
-    checkPixel(m_viewer, Qt::yellow, c2Point);
-    QCOMPARE(spy1.count(), 13);
-    QCOMPARE(spy2.count(), 6);
-
-    // No wrap, should not change
-    p->goToSlide(path, false, false);
-    checkPixel(m_viewer, Qt::red, mainPoint);
-    checkPixel(m_viewer, Qt::green, c1Point);
-    checkPixel(m_viewer, Qt::yellow, c2Point);
-    QCOMPARE(spy1.count(), 13);
-    QCOMPARE(spy2.count(), 6);
-
-    // Should wrap
-    p->goToSlide(path, false, true);
-    checkPixel(m_viewer, Qt::green, mainPoint);
-    checkPixel(m_viewer, Qt::green, c1Point);
-    checkPixel(m_viewer, Qt::green, c2Point);
-    QCOMPARE(spy1.count(), 14);
-    QCOMPARE(spy2.count(), 7);
-
-    // No wrap, should not change
-    p->goToSlide(path, true, false);
-    checkPixel(m_viewer, Qt::green, mainPoint);
-    checkPixel(m_viewer, Qt::green, c1Point);
-    checkPixel(m_viewer, Qt::green, c2Point);
-    QCOMPARE(spy1.count(), 14);
-    QCOMPARE(spy2.count(), 7);
-
-    // Should wrap
-    p->goToSlide(path, true, true);
-    checkPixel(m_viewer, Qt::red, mainPoint);
-    checkPixel(m_viewer, Qt::green, c1Point);
-    checkPixel(m_viewer, Qt::yellow, c2Point);
-    QCOMPARE(spy1.count(), 17);
-    QCOMPARE(spy2.count(), 8);
-}
-
-void tst_Q3DSWidget::testPresentationActivation()
-{
-    createWindowAndViewer(m_viewer, ANIMATION);
-
-    m_viewer->settings()->setScaleMode(Q3DSViewerSettings::ScaleModeFill);
-
-    {
-        // Grab two images two seconds apart to verify animation is happening
-        QImage image1 = m_viewer->grabFramebuffer();
-        QTest::qWait(2000);
-        QImage image2 = m_viewer->grabFramebuffer();
-        QVERIFY(image1 != image2);
-    }
-
-    m_viewer->presentation()->setPresentationActive(QStringLiteral("animation"), false);
-
-    {
-        // Grab two images two seconds apart to verify animation has stopped
-        QImage image1 = m_viewer->grabFramebuffer();
-        QTest::qWait(2000);
-        QImage image2 = m_viewer->grabFramebuffer();
-        QVERIFY(image1 == image2);
-    }
-
-    m_viewer->presentation()->setPresentationActive(QStringLiteral("animation"), true);
-
-    {
-        // Grab two images two seconds apart to verify animation is happening
-        QImage image1 = m_viewer->grabFramebuffer();
-        QTest::qWait(2000);
-        QImage image2 = m_viewer->grabFramebuffer();
-        QVERIFY(image1 != image2);
-    }
-}
-
-void tst_Q3DSWidget::testScene()
-{
-    createWindowAndViewer(m_viewer, MULTISLIDE);
-
-    m_viewer->settings()->setScaleMode(Q3DSViewerSettings::ScaleModeFill);
-
-    QString path = QStringLiteral("Scene");
-    QString pathC1 = QStringLiteral("Scene.Layer.Component1");
-    QString pathC2 = QStringLiteral("Scene.Layer.Component2");
-
-    Q3DSPresentation *p = m_viewer->presentation();
-    Q3DSSceneElement *scene = new Q3DSSceneElement(path);
-    Q3DSSceneElement *sceneC1 = new Q3DSSceneElement(pathC1);
-    Q3DSSceneElement *sceneC2 = new Q3DSSceneElement(pathC2);
-    QSignalSpy spy1(scene, &Q3DSSceneElement::currentSlideIndexChanged);
-    QSignalSpy spy2(scene, &Q3DSSceneElement::previousSlideIndexChanged);
-    QSignalSpy spy3(scene, &Q3DSSceneElement::currentSlideNameChanged);
-    QSignalSpy spy4(scene, &Q3DSSceneElement::previousSlideNameChanged);
-    QSignalSpy spy5(scene, &Q3DSSceneElement::elementPathChanged);
-    QSignalSpy spy6(sceneC1, &Q3DSSceneElement::currentSlideIndexChanged);
-    QSignalSpy spy7(sceneC1, &Q3DSSceneElement::previousSlideIndexChanged);
-    QSignalSpy spy8(sceneC1, &Q3DSSceneElement::currentSlideNameChanged);
-    QSignalSpy spy9(sceneC1, &Q3DSSceneElement::previousSlideNameChanged);
-    QSignalSpy spy10(sceneC1, &Q3DSSceneElement::elementPathChanged);
-    QSignalSpy spy11(sceneC2, &Q3DSSceneElement::currentSlideIndexChanged);
-    QSignalSpy spy12(sceneC2, &Q3DSSceneElement::previousSlideIndexChanged);
-    QSignalSpy spy13(sceneC2, &Q3DSSceneElement::currentSlideNameChanged);
-    QSignalSpy spy14(sceneC2, &Q3DSSceneElement::previousSlideNameChanged);
-    QSignalSpy spy15(sceneC2, &Q3DSSceneElement::elementPathChanged);
-    QVERIFY(spy1.isValid());
-    QVERIFY(spy2.isValid());
-    QVERIFY(spy3.isValid());
-    QVERIFY(spy4.isValid());
-    QVERIFY(spy5.isValid());
-    QVERIFY(spy6.isValid());
-    QVERIFY(spy7.isValid());
-    QVERIFY(spy8.isValid());
-    QVERIFY(spy9.isValid());
-    QVERIFY(spy10.isValid());
-    QVERIFY(spy11.isValid());
-    QVERIFY(spy12.isValid());
-    QVERIFY(spy13.isValid());
-    QVERIFY(spy14.isValid());
-    QVERIFY(spy15.isValid());
-
-    // Defaults
-    QCOMPARE(scene->currentSlideIndex(), 0);
-    QCOMPARE(scene->previousSlideIndex(), 0);
-    QCOMPARE(scene->currentSlideName(), QStringLiteral(""));
-    QCOMPARE(scene->previousSlideName(), QStringLiteral(""));
-    QCOMPARE(scene->elementPath(), path);
-
-    checkPixel(m_viewer, Qt::red);
-
-    // Ensure the first slide enter events come before we register so they don't muddle the waters
-    QGuiApplication::processEvents();
-
-    p->registerElement(scene);
-    p->registerElement(sceneC1);
-    p->registerElement(sceneC2);
-
-    QCOMPARE(scene->currentSlideIndex(), 1);
-    QCOMPARE(scene->previousSlideIndex(), 0);
-    QCOMPARE(scene->currentSlideName(), QStringLiteral("S1"));
-    QCOMPARE(scene->previousSlideName(), QStringLiteral(""));
-    QCOMPARE(scene->elementPath(), path);
-
-    p->goToSlide(path, QStringLiteral("S2"));
-    checkPixel(m_viewer, Qt::blue);
-    QGuiApplication::processEvents();
-
-    QCOMPARE(spy1.count(), 1);
-    QCOMPARE(spy2.count(), 1);
-    QCOMPARE(spy3.count(), 1);
-    QCOMPARE(spy4.count(), 1);
-    QCOMPARE(spy5.count(), 0);
-    QCOMPARE(spy6.count(), 0);
-    QCOMPARE(spy7.count(), 0);
-    QCOMPARE(spy8.count(), 0);
-    QCOMPARE(spy9.count(), 0);
-    QCOMPARE(spy10.count(), 0);
-    QCOMPARE(spy11.count(), 0);
-    QCOMPARE(spy12.count(), 0);
-    QCOMPARE(spy13.count(), 0);
-    QCOMPARE(spy14.count(), 0);
-    QCOMPARE(spy15.count(), 0);
-
-    p->goToSlide(path, QStringLiteral("S1"));
-    checkPixel(m_viewer, Qt::red);
-    QGuiApplication::processEvents();
-
-    QCOMPARE(spy1.count(), 2);
-    QCOMPARE(spy2.count(), 2);
-    QCOMPARE(spy3.count(), 2);
-    QCOMPARE(spy4.count(), 2);
-    QCOMPARE(spy5.count(), 0);
-    QCOMPARE(spy6.count(), 0);
-    // Getting previous slide change without getting current slide change seems illogical here,
-    // but that's how the internal viewer logic for previous slide works. It makes sense when
-    // you consider the fact that we always get enter events for child slides when parent slide
-    // is entered.
-    QCOMPARE(spy7.count(), 1);
-    QCOMPARE(spy8.count(), 0);
-    QCOMPARE(spy9.count(), 1);
-    QCOMPARE(spy10.count(), 0);
-    QCOMPARE(spy11.count(), 0);
-    QCOMPARE(spy12.count(), 1);
-    QCOMPARE(spy13.count(), 0);
-    QCOMPARE(spy14.count(), 1);
-    QCOMPARE(spy15.count(), 0);
-
-    p->goToSlide(pathC1, QStringLiteral("C1S2"));
-    checkPixel(m_viewer, Qt::red);
-    QGuiApplication::processEvents();
-
-    QCOMPARE(spy1.count(), 2);
-    QCOMPARE(spy2.count(), 2);
-    QCOMPARE(spy3.count(), 2);
-    QCOMPARE(spy4.count(), 2);
-    QCOMPARE(spy5.count(), 0);
-    QCOMPARE(spy6.count(), 1);
-    QCOMPARE(spy7.count(), 1);
-    QCOMPARE(spy8.count(), 1);
-    QCOMPARE(spy9.count(), 1);
-    QCOMPARE(spy10.count(), 0);
-    QCOMPARE(spy11.count(), 0);
-    QCOMPARE(spy12.count(), 1);
-    QCOMPARE(spy13.count(), 0);
-    QCOMPARE(spy14.count(), 1);
-    QCOMPARE(spy15.count(), 0);
-
-    p->goToSlide(pathC2, QStringLiteral("C2S2"));
-    checkPixel(m_viewer, Qt::red);
-    QGuiApplication::processEvents();
-
-    QCOMPARE(spy1.count(), 2);
-    QCOMPARE(spy2.count(), 2);
-    QCOMPARE(spy3.count(), 2);
-    QCOMPARE(spy4.count(), 2);
-    QCOMPARE(spy5.count(), 0);
-    QCOMPARE(spy6.count(), 1);
-    QCOMPARE(spy7.count(), 1);
-    QCOMPARE(spy8.count(), 1);
-    QCOMPARE(spy9.count(), 1);
-    QCOMPARE(spy10.count(), 0);
-    QCOMPARE(spy11.count(), 1);
-    QCOMPARE(spy12.count(), 1);
-    QCOMPARE(spy13.count(), 1);
-    QCOMPARE(spy14.count(), 1);
-    QCOMPARE(spy15.count(), 0);
-
-    // Subscenes revert to original slides when parent is re-entered
-    p->goToSlide(path, QStringLiteral("S2"));
-    checkPixel(m_viewer, Qt::blue);
-    QGuiApplication::processEvents();
-
-    QCOMPARE(spy1.count(), 3);
-    QCOMPARE(spy2.count(), 3);
-    QCOMPARE(spy3.count(), 3);
-    QCOMPARE(spy4.count(), 3);
-    QCOMPARE(spy5.count(), 0);
-    QCOMPARE(spy6.count(), 1);
-    QCOMPARE(spy7.count(), 1);
-    QCOMPARE(spy8.count(), 1);
-    QCOMPARE(spy9.count(), 1);
-    QCOMPARE(spy10.count(), 0);
-    QCOMPARE(spy11.count(), 1);
-    QCOMPARE(spy12.count(), 1);
-    QCOMPARE(spy13.count(), 1);
-    QCOMPARE(spy14.count(), 1);
-    QCOMPARE(spy15.count(), 0);
-
-    p->goToSlide(path, QStringLiteral("S1"));
-    checkPixel(m_viewer, Qt::red);
-    QGuiApplication::processEvents();
-
-    QCOMPARE(spy1.count(), 4);
-    QCOMPARE(spy2.count(), 4);
-    QCOMPARE(spy3.count(), 4);
-    QCOMPARE(spy4.count(), 4);
-    QCOMPARE(spy5.count(), 0);
-    QCOMPARE(spy6.count(), 2);
-    QCOMPARE(spy7.count(), 2);
-    QCOMPARE(spy8.count(), 2);
-    QCOMPARE(spy9.count(), 2);
-    QCOMPARE(spy10.count(), 0);
-    QCOMPARE(spy11.count(), 2);
-    QCOMPARE(spy12.count(), 2);
-    QCOMPARE(spy13.count(), 2);
-    QCOMPARE(spy14.count(), 2);
-    QCOMPARE(spy15.count(), 0);
-
-    p->unregisterElement(scene);
-    p->unregisterElement(sceneC1);
-    p->unregisterElement(sceneC2);
-
-    // No more signals after unregistering
-    p->goToSlide(path, QStringLiteral("S2"));
-    checkPixel(m_viewer, Qt::blue);
-    QGuiApplication::processEvents();
-
-    QCOMPARE(spy1.count(), 4);
-    QCOMPARE(spy2.count(), 4);
-    QCOMPARE(spy3.count(), 4);
-    QCOMPARE(spy4.count(), 4);
-    QCOMPARE(spy5.count(), 0);
-    QCOMPARE(spy6.count(), 2);
-    QCOMPARE(spy7.count(), 2);
-    QCOMPARE(spy8.count(), 2);
-    QCOMPARE(spy9.count(), 2);
-    QCOMPARE(spy10.count(), 0);
-    QCOMPARE(spy11.count(), 2);
-    QCOMPARE(spy12.count(), 2);
-    QCOMPARE(spy13.count(), 2);
-    QCOMPARE(spy14.count(), 2);
-    QCOMPARE(spy15.count(), 0);
-
-    // Reregister
-    p->registerElement(scene);
-    p->goToSlide(path, QStringLiteral("S1"));
-    checkPixel(m_viewer, Qt::red);
-    QGuiApplication::processEvents();
-
-    QCOMPARE(spy1.count(), 5);
-    QCOMPARE(spy2.count(), 5);
-    QCOMPARE(spy3.count(), 5);
-    QCOMPARE(spy4.count(), 5);
-    QCOMPARE(spy5.count(), 0);
-
-    QCOMPARE(scene->currentSlideIndex(), 1);
-    QCOMPARE(scene->previousSlideIndex(), 2);
-    QCOMPARE(scene->currentSlideName(), QStringLiteral("S1"));
-    QCOMPARE(scene->previousSlideName(), QStringLiteral("S2"));
-    QCOMPARE(scene->elementPath(), path);
-
-    // Change elementpath
-    scene->setElementPath(pathC1);
-    checkPixel(m_viewer, Qt::red);
-    QGuiApplication::processEvents();
-
-    QCOMPARE(spy1.count(), 5);
-    QCOMPARE(spy2.count(), 5);
-    QCOMPARE(spy3.count(), 5);
-    QCOMPARE(spy4.count(), 5);
-    QCOMPARE(spy5.count(), 1);
-
-    QCOMPARE(scene->currentSlideIndex(), 1);
-    QCOMPARE(scene->previousSlideIndex(), 1);
-    // Having current and previous slides the same seems weird, but that's how the slide
-    // logic works internally.
-    QCOMPARE(scene->currentSlideName(), QStringLiteral("C1S1"));
-    QCOMPARE(scene->previousSlideName(), QStringLiteral("C1S1"));
-    QCOMPARE(scene->elementPath(), pathC1);
-
-    p->goToSlide(pathC1, QStringLiteral("C1S2"));
-    checkPixel(m_viewer, Qt::red);
-    QGuiApplication::processEvents();
-
-    QCOMPARE(spy1.count(), 6);
-    QCOMPARE(spy2.count(), 5);
-    QCOMPARE(spy3.count(), 6);
-    QCOMPARE(spy4.count(), 5);
-    QCOMPARE(spy5.count(), 1);
-
-    p->goToSlide(path, QStringLiteral("S2"));
-    checkPixel(m_viewer, Qt::blue);
-    QGuiApplication::processEvents();
-
-    QCOMPARE(spy1.count(), 6);
-    QCOMPARE(spy2.count(), 5);
-    QCOMPARE(spy3.count(), 6);
-    QCOMPARE(spy4.count(), 5);
-    QCOMPARE(spy5.count(), 1);
-}
-
-void tst_Q3DSWidget::testMouseInput()
-{
-    createWindowAndViewer(m_viewer, MOUSE);
-
-    m_viewer->settings()->setScaleMode(Q3DSViewerSettings::ScaleModeFill);
-
-    QPoint point1(m_viewer->size().width() * 1 / 4, m_viewer->size().height() / 2);
-    QPoint point2(m_viewer->size().width() * 3 / 4, m_viewer->size().height() / 2);
-
-    checkPixel(m_viewer, Qt::blue, point1);
-    checkPixel(m_viewer, Qt::red, point2);
-
-    QMouseEvent e1(QEvent::MouseButtonPress, point1, Qt::LeftButton, Qt::LeftButton,
-                   Qt::NoModifier);
-    m_viewer->presentation()->mousePressEvent(&e1);
-
-    checkPixel(m_viewer, Qt::green, point1);
-    checkPixel(m_viewer, Qt::red, point2);
-
-    QMouseEvent e2(QEvent::MouseButtonRelease, point1, Qt::LeftButton, Qt::LeftButton,
-                   Qt::NoModifier);
-    m_viewer->presentation()->mouseReleaseEvent(&e2);
-
-    checkPixel(m_viewer, Qt::blue, point1);
-    checkPixel(m_viewer, Qt::red, point2);
-
-    QMouseEvent e3(QEvent::MouseButtonPress, point2, Qt::LeftButton, Qt::LeftButton,
-                   Qt::NoModifier);
-    m_viewer->presentation()->mousePressEvent(&e3);
-
-    checkPixel(m_viewer, Qt::blue, point1);
-    checkPixel(m_viewer, Qt::blue, point2);
-
-    QMouseEvent e4(QEvent::MouseButtonRelease, point2, Qt::LeftButton, Qt::LeftButton,
-                   Qt::NoModifier);
-    m_viewer->presentation()->mouseReleaseEvent(&e4);
-
-    checkPixel(m_viewer, Qt::blue, point1);
-    checkPixel(m_viewer, Qt::red, point2);
-
-    // Note: No way yet to hook mouse move into anything in the presentation
-}
-
-QTEST_MAIN(tst_Q3DSWidget)
-
-#include "tst_q3dswidget.moc"
diff --git a/tests/auto/studio3d/studio3d.pro b/tests/auto/studio3d/studio3d.pro
index bc866821..e92019f0 100644
--- a/tests/auto/studio3d/studio3d.pro
+++ b/tests/auto/studio3d/studio3d.pro
@@ -1,5 +1,4 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    q3dssurfaceviewer \
-    q3dswidget
+    q3dssurfaceviewer
diff --git a/tests/auto/viewer/tst_qt3dsviewer.cpp b/tests/auto/viewer/tst_qt3dsviewer.cpp
index 97429039..9424612e 100644
--- a/tests/auto/viewer/tst_qt3dsviewer.cpp
+++ b/tests/auto/viewer/tst_qt3dsviewer.cpp
@@ -593,6 +593,36 @@ void tst_qt3dsviewer::testCreateMesh()
     QTest::qWait(200); // Extra wait to verify slide change visually
 }
 
+void tst_qt3dsviewer::testMouseEvents()
+{
+    m_viewer->show();
+    QTest::qWait(1000);
+
+    QSignalSpy spyEvents(m_studio3DItem,
+                         SIGNAL(ignoredEventsChanged()));
+    QSignalSpy spyExited(m_presentation,
+                         SIGNAL(slideExited(const QString &, unsigned int, const QString &)));
+
+    QCOMPARE(spyEvents.count(), 0);
+    QCOMPARE(spyExited.count(), 0);
+
+    // Ignore mouse, so slide doesn't change
+    m_studio3DItem->setProperty("ignoredEvents", 1);
+    QTest::mousePress(m_viewer, Qt::LeftButton);
+    QTest::qWait(1000);
+    QTest::mouseRelease(m_viewer, Qt::LeftButton);
+    QCOMPARE(spyEvents.count(), 1);
+    QCOMPARE(spyExited.count(), 0);
+
+    // Enable mouse, clicking switches slide
+    m_studio3DItem->setProperty("ignoredEvents", 0);
+    QTest::mousePress(m_viewer, Qt::LeftButton);
+    QTest::qWait(1000);
+    QTest::mouseRelease(m_viewer, Qt::LeftButton);
+    QCOMPARE(spyEvents.count(), 2);
+    QCOMPARE(spyExited.count(), 1);
+}
+
 void tst_qt3dsviewer::deleteCreated()
 {
     m_presentation->deleteElements(m_createdElements);
diff --git a/tests/auto/viewer/tst_qt3dsviewer.h b/tests/auto/viewer/tst_qt3dsviewer.h
index e6fae709..3d1f9473 100644
--- a/tests/auto/viewer/tst_qt3dsviewer.h
+++ b/tests/auto/viewer/tst_qt3dsviewer.h
@@ -58,6 +58,7 @@ private Q_SLOTS:
     void testCreateElement();
     void testCreateMaterial();
     void testCreateMesh();
+    void testMouseEvents();
 
 private:
     void deleteCreated();
diff --git a/tests/auto/viewer/viewer.pro b/tests/auto/viewer/viewer.pro
index ad832e02..9e06c2ca 100644
--- a/tests/auto/viewer/viewer.pro
+++ b/tests/auto/viewer/viewer.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 CONFIG += testcase
-include($$PWD/../../../src/Runtime/commoninclude.pri)
+include($$PWD/../../../src/Runtime/ogl-runtime/commoninclude.pri)
 
 TARGET = tst_qt3dsviewer
 QT += testlib gui quick studio3d
diff --git a/tests/scenes/simple_cube_animation/presentations/simple_cube_animation.uip b/tests/scenes/simple_cube_animation/presentations/simple_cube_animation.uip
index fc273121..f8fae907 100644
--- a/tests/scenes/simple_cube_animation/presentations/simple_cube_animation.uip
+++ b/tests/scenes/simple_cube_animation/presentations/simple_cube_animation.uip
@@ -32,7 +32,9 @@
 					<AnimationTrack property="position.z" type="EaseInOut" >0 0 100 100 5 0 100 100</AnimationTrack>
 				</Add>
 				<State id="Scene-Slide1" name="Slide1" playmode="Play Through To..." >
-					<Set ref="#Layer" endtime="5000" />
+					<Set ref="#Layer" endtime="5000" >
+						<Action id="Layer-Action" eyeball="True" triggerObject="#Scene" event="onPressureDown" targetObject="#Scene" handler="Next Slide" />
+					</Set>
 					<Set ref="#Camera" endtime="5000" />
 					<Set ref="#Light" endtime="5000" />
 					<Add ref="#Sphere" name="Sphere" endtime="5000" scale="0.1 0.1 0.1" sourcepath="#Sphere" />