Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1

Conflicts:
	.qmake.conf

Change-Id: Ic5484d9d51b7ff5f4fe17d3876daba2123045244

193 files changed, 126 insertions, 115 deletions

diff --git a/examples/canvas3d/canvas3d/3rdparty/ThreeJSLoader.js b/examples/canvas3d/3rdparty/ThreeJSLoader.js
index 42e1999..42e1999 100644
--- a/examples/canvas3d/canvas3d/3rdparty/ThreeJSLoader.js
+++ b/examples/canvas3d/3rdparty/ThreeJSLoader.js
diff --git a/examples/canvas3d/canvas3d/3rdparty/gl-matrix.js b/examples/canvas3d/3rdparty/gl-matrix.js
index eb16c6b..eb16c6b 100644
--- a/examples/canvas3d/canvas3d/3rdparty/gl-matrix.js
+++ b/examples/canvas3d/3rdparty/gl-matrix.js
diff --git a/examples/canvas3d/canvas3d/3rdparty/three.js b/examples/canvas3d/3rdparty/three.js
index fd129e0..fd129e0 100644
--- a/examples/canvas3d/canvas3d/3rdparty/three.js
+++ b/examples/canvas3d/3rdparty/three.js
diff --git a/examples/canvas3d/canvas3d/3rdparty/threex.planets.js b/examples/canvas3d/3rdparty/threex.planets.js
index f6651cb..f6651cb 100644
--- a/examples/canvas3d/canvas3d/3rdparty/threex.planets.js
+++ b/examples/canvas3d/3rdparty/threex.planets.js
diff --git a/examples/canvas3d/canvas3d.pro b/examples/canvas3d/canvas3d.pro
index f384c82..27ffaec 100644
--- a/examples/canvas3d/canvas3d.pro
+++ b/examples/canvas3d/canvas3d.pro
@@ -1,3 +1,11 @@
 TEMPLATE = subdirs
-SUBDIRS += canvas3d
+SUBDIRS += textureandlight \
+           framebuffer \
+           interaction \
+           jsonmodels \
+           quickitemtexture \
+           threejs
 
+OTHER_FILES += 3rdparty/*
+
+EXAMPLE_FILES = 3rdparty
diff --git a/examples/canvas3d/canvas3d/canvas3d.pro b/examples/canvas3d/canvas3d/canvas3d.pro
deleted file mode 100644
index 27ffaec..0000000
--- a/examples/canvas3d/canvas3d/canvas3d.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += textureandlight \
-           framebuffer \
-           interaction \
-           jsonmodels \
-           quickitemtexture \
-           threejs
-
-OTHER_FILES += 3rdparty/*
-
-EXAMPLE_FILES = 3rdparty
diff --git a/examples/canvas3d/canvas3d/framebuffer/doc/images/framebuffer-example.png b/examples/canvas3d/framebuffer/doc/images/framebuffer-example.png
index 055bf62..055bf62 100644
--- a/examples/canvas3d/canvas3d/framebuffer/doc/images/framebuffer-example.png
+++ b/examples/canvas3d/framebuffer/doc/images/framebuffer-example.png
diff --git a/examples/canvas3d/canvas3d/framebuffer/doc/src/framebuffer.qdoc b/examples/canvas3d/framebuffer/doc/src/framebuffer.qdoc
index 598096e..e42e9c1 100644
--- a/examples/canvas3d/canvas3d/framebuffer/doc/src/framebuffer.qdoc
+++ b/examples/canvas3d/framebuffer/doc/src/framebuffer.qdoc
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 /*!
-    \example canvas3d/framebuffer
+    \example framebuffer
     \since QtCanvas3D 1.0
     \title Framebuffer Example
     \ingroup qtcanvas3d-examples
@@ -70,22 +70,22 @@
     We first define the variables we need for the render-to-texture
     framebuffer:
 
-    \snippet canvas3d/framebuffer/qml/framebuffer/framebuffer.js 0
+    \snippet framebuffer/qml/framebuffer/framebuffer.js 0
 
     Then, in the \c initializeGL function, we create the framebuffer object:
 
-    \snippet canvas3d/framebuffer/qml/framebuffer/framebuffer.js 1
+    \snippet framebuffer/qml/framebuffer/framebuffer.js 1
 
     \section1 Creating the Texture
 
     After the creation of the framebuffer, we create the texture:
 
-    \snippet canvas3d/framebuffer/qml/framebuffer/framebuffer.js 2
+    \snippet framebuffer/qml/framebuffer/framebuffer.js 2
 
     Then we need to bind the texture as a color attachment, create and bind
     a render buffer, and bind the depth attachment:
 
-    \snippet canvas3d/framebuffer/qml/framebuffer/framebuffer.js 3
+    \snippet framebuffer/qml/framebuffer/framebuffer.js 3
 
     \section1 Rendering into the Framebuffer
 
@@ -93,30 +93,30 @@
     framebuffer. We start by binding the framebuffer object and setting a
     viewport:
 
-    \snippet canvas3d/framebuffer/qml/framebuffer/framebuffer.js 4
+    \snippet framebuffer/qml/framebuffer/framebuffer.js 4
 
     Then, we need to bind the loaded texture we want to use in rendering
     into the framebuffer object:
 
-    \snippet canvas3d/framebuffer/qml/framebuffer/framebuffer.js 5
+    \snippet framebuffer/qml/framebuffer/framebuffer.js 5
 
     And then we can draw the textured cube into the framebuffer:
 
-    \snippet canvas3d/framebuffer/qml/framebuffer/framebuffer.js 6
+    \snippet framebuffer/qml/framebuffer/framebuffer.js 6
 
     \section1 Using the Framebuffer as a Texture
 
     First, we bind the render-to-texture right after drawing, and generate
     mipmaps:
 
-    \snippet canvas3d/framebuffer/qml/framebuffer/framebuffer.js 7
+    \snippet framebuffer/qml/framebuffer/framebuffer.js 7
 
     Then we need to bind the default framebuffer (screen), and set up the
     viewport:
 
-    \snippet canvas3d/framebuffer/qml/framebuffer/framebuffer.js 8
+    \snippet framebuffer/qml/framebuffer/framebuffer.js 8
 
     And finally, we draw the on-screen view:
 
-    \snippet canvas3d/framebuffer/qml/framebuffer/framebuffer.js 9
+    \snippet framebuffer/qml/framebuffer/framebuffer.js 9
  */
diff --git a/examples/canvas3d/canvas3d/framebuffer/framebuffer.pro b/examples/canvas3d/framebuffer/framebuffer.pro
index 4bf4cb1..4bf4cb1 100644
--- a/examples/canvas3d/canvas3d/framebuffer/framebuffer.pro
+++ b/examples/canvas3d/framebuffer/framebuffer.pro
diff --git a/examples/canvas3d/canvas3d/framebuffer/framebuffer.qrc b/examples/canvas3d/framebuffer/framebuffer.qrc
index 646c76a..646c76a 100644
--- a/examples/canvas3d/canvas3d/framebuffer/framebuffer.qrc
+++ b/examples/canvas3d/framebuffer/framebuffer.qrc
diff --git a/examples/canvas3d/canvas3d/framebuffer/main.cpp b/examples/canvas3d/framebuffer/main.cpp
index 1de981a..1de981a 100644
--- a/examples/canvas3d/canvas3d/framebuffer/main.cpp
+++ b/examples/canvas3d/framebuffer/main.cpp
diff --git a/examples/canvas3d/canvas3d/framebuffer/qml/framebuffer/framebuffer.js b/examples/canvas3d/framebuffer/qml/framebuffer/framebuffer.js
index e7102fe..e7102fe 100644
--- a/examples/canvas3d/canvas3d/framebuffer/qml/framebuffer/framebuffer.js
+++ b/examples/canvas3d/framebuffer/qml/framebuffer/framebuffer.js
diff --git a/examples/canvas3d/canvas3d/framebuffer/qml/framebuffer/main.qml b/examples/canvas3d/framebuffer/qml/framebuffer/main.qml
index c1cd367..c1cd367 100644
--- a/examples/canvas3d/canvas3d/framebuffer/qml/framebuffer/main.qml
+++ b/examples/canvas3d/framebuffer/qml/framebuffer/main.qml
diff --git a/examples/canvas3d/canvas3d/framebuffer/qml/framebuffer/qtlogo.png b/examples/canvas3d/framebuffer/qml/framebuffer/qtlogo.png
index f7276e2..f7276e2 100644
--- a/examples/canvas3d/canvas3d/framebuffer/qml/framebuffer/qtlogo.png
+++ b/examples/canvas3d/framebuffer/qml/framebuffer/qtlogo.png
diff --git a/examples/canvas3d/canvas3d/interaction/3dmodels.txt b/examples/canvas3d/interaction/3dmodels.txt
index 3aea437..3aea437 100644
--- a/examples/canvas3d/canvas3d/interaction/3dmodels.txt
+++ b/examples/canvas3d/interaction/3dmodels.txt
diff --git a/examples/canvas3d/canvas3d/interaction/doc/images/interaction-example.png b/examples/canvas3d/interaction/doc/images/interaction-example.png
index 20f7434..20f7434 100644
--- a/examples/canvas3d/canvas3d/interaction/doc/images/interaction-example.png
+++ b/examples/canvas3d/interaction/doc/images/interaction-example.png
diff --git a/examples/canvas3d/canvas3d/interaction/doc/src/interaction.qdoc b/examples/canvas3d/interaction/doc/src/interaction.qdoc
index aa7b460..560cabe 100644
--- a/examples/canvas3d/canvas3d/interaction/doc/src/interaction.qdoc
+++ b/examples/canvas3d/interaction/doc/src/interaction.qdoc
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 /*!
-    \example canvas3d/interaction
+    \example interaction
     \since QtCanvas3D 1.0
     \title Interaction Example
     \ingroup qtcanvas3d-examples
@@ -65,35 +65,35 @@
 
     First, we need to import Qt Quick Controls and Layouts:
 
-    \snippet canvas3d/interaction/qml/interaction/main.qml 0
+    \snippet interaction/qml/interaction/main.qml 0
 
     Then, we add a RowLayout to the main component to easily add the
     controls side-by-side:
 
-    \snippet canvas3d/interaction/qml/interaction/main.qml 1
+    \snippet interaction/qml/interaction/main.qml 1
 
     And then we add three sliders to the layout. Here's the one for
     controlling x-axis rotation:
 
-    \snippet canvas3d/interaction/qml/interaction/main.qml 2
+    \snippet interaction/qml/interaction/main.qml 2
 
     \section1 Interaction
 
     First we need to define some properties in the Canvas3D for the
     rotations:
 
-    \snippet canvas3d/interaction/qml/interaction/main.qml 3
+    \snippet interaction/qml/interaction/main.qml 3
 
     The \c onValueChanged signal handlers of the \l[QML]{Slider} components
     are connected to the above properties. Here's the connection in x-rotation
     slider as an example:
 
-    \snippet canvas3d/interaction/qml/interaction/main.qml 4
+    \snippet interaction/qml/interaction/main.qml 4
 
     Then, on the JavaScript side, we just use the Canvas3D properties directly
     when setting the modelview matrix rotations:
 
-    \snippet canvas3d/interaction/qml/interaction/interaction.js 0
+    \snippet interaction/qml/interaction/interaction.js 0
 
     \section1 Three Ways of Drawing
 
@@ -101,9 +101,9 @@
     the same object is drawn multiple times. Only in this case we use a
     different drawing mode for each:
 
-    \snippet canvas3d/interaction/qml/interaction/interaction.js 1
+    \snippet interaction/qml/interaction/interaction.js 1
     \dots 0
-    \snippet canvas3d/interaction/qml/interaction/interaction.js 2
+    \snippet interaction/qml/interaction/interaction.js 2
     \dots 0
-    \snippet canvas3d/interaction/qml/interaction/interaction.js 3
+    \snippet interaction/qml/interaction/interaction.js 3
  */
diff --git a/examples/canvas3d/canvas3d/interaction/interaction.pro b/examples/canvas3d/interaction/interaction.pro
index 94dd9d0..224f611 100644
--- a/examples/canvas3d/canvas3d/interaction/interaction.pro
+++ b/examples/canvas3d/interaction/interaction.pro
@@ -12,3 +12,7 @@ OTHER_FILES += qml/interaction/* \
                doc/images/*
 
 RESOURCES += interaction.qrc
+
+EXAMPLE_FILES += \
+    3dmodels.txt \
+    readme.txt
diff --git a/examples/canvas3d/canvas3d/interaction/interaction.qrc b/examples/canvas3d/interaction/interaction.qrc
index 5bfd073..5bfd073 100644
--- a/examples/canvas3d/canvas3d/interaction/interaction.qrc
+++ b/examples/canvas3d/interaction/interaction.qrc
diff --git a/examples/canvas3d/canvas3d/interaction/main.cpp b/examples/canvas3d/interaction/main.cpp
index 7ba99a2..7ba99a2 100644
--- a/examples/canvas3d/canvas3d/interaction/main.cpp
+++ b/examples/canvas3d/interaction/main.cpp
diff --git a/examples/canvas3d/canvas3d/interaction/qml/interaction/barrel.jpg b/examples/canvas3d/interaction/qml/interaction/barrel.jpg
index cfc3bcb..cfc3bcb 100644
--- a/examples/canvas3d/canvas3d/interaction/qml/interaction/barrel.jpg
+++ b/examples/canvas3d/interaction/qml/interaction/barrel.jpg
diff --git a/examples/canvas3d/canvas3d/interaction/qml/interaction/barrel.json b/examples/canvas3d/interaction/qml/interaction/barrel.json
index 953b733..953b733 100644
--- a/examples/canvas3d/canvas3d/interaction/qml/interaction/barrel.json
+++ b/examples/canvas3d/interaction/qml/interaction/barrel.json
diff --git a/examples/canvas3d/canvas3d/interaction/qml/interaction/interaction.js b/examples/canvas3d/interaction/qml/interaction/interaction.js
index bfba866..bfba866 100644
--- a/examples/canvas3d/canvas3d/interaction/qml/interaction/interaction.js
+++ b/examples/canvas3d/interaction/qml/interaction/interaction.js
diff --git a/examples/canvas3d/canvas3d/interaction/qml/interaction/main.qml b/examples/canvas3d/interaction/qml/interaction/main.qml
index ab46260..ab46260 100644
--- a/examples/canvas3d/canvas3d/interaction/qml/interaction/main.qml
+++ b/examples/canvas3d/interaction/qml/interaction/main.qml
diff --git a/examples/canvas3d/canvas3d/interaction/readme.txt b/examples/canvas3d/interaction/readme.txt
index 0996800..0996800 100644
--- a/examples/canvas3d/canvas3d/interaction/readme.txt
+++ b/examples/canvas3d/interaction/readme.txt
diff --git a/examples/canvas3d/canvas3d/jsonmodels/3dmodels.txt b/examples/canvas3d/jsonmodels/3dmodels.txt
index 3aea437..3aea437 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/3dmodels.txt
+++ b/examples/canvas3d/jsonmodels/3dmodels.txt
diff --git a/examples/canvas3d/canvas3d/jsonmodels/doc/images/jsonmodels-example.png b/examples/canvas3d/jsonmodels/doc/images/jsonmodels-example.png
index 0bf0f3c..0bf0f3c 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/doc/images/jsonmodels-example.png
+++ b/examples/canvas3d/jsonmodels/doc/images/jsonmodels-example.png
diff --git a/examples/canvas3d/canvas3d/jsonmodels/doc/src/jsonmodels.qdoc b/examples/canvas3d/jsonmodels/doc/src/jsonmodels.qdoc
index 99da39e..b709c81 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/doc/src/jsonmodels.qdoc
+++ b/examples/canvas3d/jsonmodels/doc/src/jsonmodels.qdoc
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 /*!
-    \example canvas3d/jsonmodels
+    \example jsonmodels
     \since QtCanvas3D 1.0
     \title JSON Models Example
     \ingroup qtcanvas3d-examples
@@ -66,7 +66,7 @@
     First we include a JSON model parser, which handles parsing the JSON
     models into our internal models:
 
-    \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js 0
+    \snippet jsonmodels/qml/jsonmodels/jsonmodels.js 0
 
     The \c{ThreeJSLoader.js} includes a reimplementation of the JSON parser
     in \c{three.js}, but we will not go into its implementation details.
@@ -75,22 +75,22 @@
 
     First we need to initialize all array buffers for the models:
 
-    \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js 1
+    \snippet jsonmodels/qml/jsonmodels/jsonmodels.js 1
     \dots
 
     Then we request the models to be loaded:
 
-    \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js 2
+    \snippet jsonmodels/qml/jsonmodels/jsonmodels.js 2
     \dots
 
     Then, when the load requests return, we handle the models:
 
-    \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js 3
+    \snippet jsonmodels/qml/jsonmodels/jsonmodels.js 3
     \dots
 
     Each buffer is bound and filled with the data parsed from the json models:
 
-    \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js 4
+    \snippet jsonmodels/qml/jsonmodels/jsonmodels.js 4
 
     \section1 Loading the Textures
 
@@ -99,42 +99,42 @@
     \c imageLoadingFailed signals. In the \c imageLoaded signal
     handlers we create the OpenGL textures:
 
-    \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js 5
+    \snippet jsonmodels/qml/jsonmodels/jsonmodels.js 5
     \dots
 
     \section1 Input Handling
 
     First we add a MouseArea to fill the Canvas3D:
 
-    \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml 0
+    \snippet jsonmodels/qml/jsonmodels/jsonmodels.qml 0
     \dots
 
     Before adding some functionality on it, we need to add properties to the
     canvas with initial values set:
 
-    \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml 1
+    \snippet jsonmodels/qml/jsonmodels/jsonmodels.qml 1
 
     After that, we add rotation on mouse movement when the left mouse button
     is pressed:
 
-    \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml 2
+    \snippet jsonmodels/qml/jsonmodels/jsonmodels.qml 2
 
     We need to keep the previous x and y values to avoid rotation jumping
     when the mouse button is released and pressed again. We store them in
     these properties:
 
-    \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml 3
+    \snippet jsonmodels/qml/jsonmodels/jsonmodels.qml 3
 
     Then we add zooming by mouse wheel:
 
-    \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml 4
+    \snippet jsonmodels/qml/jsonmodels/jsonmodels.qml 4
 
     These properties are then used in the JavaScript side when calculating
     eye/camera movement:
 
-    \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js 7
+    \snippet jsonmodels/qml/jsonmodels/jsonmodels.js 7
 
     Converting the rotation values into movement is done as follows:
 
-    \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js 8
+    \snippet jsonmodels/qml/jsonmodels/jsonmodels.js 8
 */
diff --git a/examples/canvas3d/canvas3d/jsonmodels/jsonmodels.pro b/examples/canvas3d/jsonmodels/jsonmodels.pro
index f8f6b80..b2813c6 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/jsonmodels.pro
+++ b/examples/canvas3d/jsonmodels/jsonmodels.pro
@@ -11,3 +11,7 @@ RESOURCES += qml.qrc
 
 OTHER_FILES += doc/src/* \
                doc/images/*
+
+EXAMPLE_FILES += \
+    3dmodels.txt \
+    readme.txt
diff --git a/examples/canvas3d/canvas3d/jsonmodels/main.cpp b/examples/canvas3d/jsonmodels/main.cpp
index 0eee9db..0eee9db 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/main.cpp
+++ b/examples/canvas3d/jsonmodels/main.cpp
diff --git a/examples/canvas3d/canvas3d/jsonmodels/qml.qrc b/examples/canvas3d/jsonmodels/qml.qrc
index e8eeea7..e8eeea7 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/qml.qrc
+++ b/examples/canvas3d/jsonmodels/qml.qrc
diff --git a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/bush.json b/examples/canvas3d/jsonmodels/qml/jsonmodels/bush.json
index f05ed58..f05ed58 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/bush.json
+++ b/examples/canvas3d/jsonmodels/qml/jsonmodels/bush.json
diff --git a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/bush.png b/examples/canvas3d/jsonmodels/qml/jsonmodels/bush.png
index 9980cf0..9980cf0 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/bush.png
+++ b/examples/canvas3d/jsonmodels/qml/jsonmodels/bush.png
diff --git a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/gold.jpg b/examples/canvas3d/jsonmodels/qml/jsonmodels/gold.jpg
index ca316d5..ca316d5 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/gold.jpg
+++ b/examples/canvas3d/jsonmodels/qml/jsonmodels/gold.jpg
diff --git a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/gold.json b/examples/canvas3d/jsonmodels/qml/jsonmodels/gold.json
index 0e586be..0e586be 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/gold.json
+++ b/examples/canvas3d/jsonmodels/qml/jsonmodels/gold.json
diff --git a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js b/examples/canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js
index e92cc5d..e92cc5d 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js
+++ b/examples/canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js
diff --git a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml b/examples/canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml
index 814b93a..814b93a 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml
+++ b/examples/canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml
diff --git a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/pallet.jpg b/examples/canvas3d/jsonmodels/qml/jsonmodels/pallet.jpg
index ea0c01a..ea0c01a 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/pallet.jpg
+++ b/examples/canvas3d/jsonmodels/qml/jsonmodels/pallet.jpg
diff --git a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/pallet.json b/examples/canvas3d/jsonmodels/qml/jsonmodels/pallet.json
index 8bd7fef..8bd7fef 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/pallet.json
+++ b/examples/canvas3d/jsonmodels/qml/jsonmodels/pallet.json
diff --git a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/rock.jpg b/examples/canvas3d/jsonmodels/qml/jsonmodels/rock.jpg
index 023035d..023035d 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/rock.jpg
+++ b/examples/canvas3d/jsonmodels/qml/jsonmodels/rock.jpg
diff --git a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/rock.json b/examples/canvas3d/jsonmodels/qml/jsonmodels/rock.json
index 72127b6..72127b6 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/rock.json
+++ b/examples/canvas3d/jsonmodels/qml/jsonmodels/rock.json
diff --git a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/woodbox.jpg b/examples/canvas3d/jsonmodels/qml/jsonmodels/woodbox.jpg
index fd9c10d..fd9c10d 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/woodbox.jpg
+++ b/examples/canvas3d/jsonmodels/qml/jsonmodels/woodbox.jpg
diff --git a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/woodbox.json b/examples/canvas3d/jsonmodels/qml/jsonmodels/woodbox.json
index 141ad57..141ad57 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/woodbox.json
+++ b/examples/canvas3d/jsonmodels/qml/jsonmodels/woodbox.json
diff --git a/examples/canvas3d/canvas3d/jsonmodels/readme.txt b/examples/canvas3d/jsonmodels/readme.txt
index 0996800..0996800 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/readme.txt
+++ b/examples/canvas3d/jsonmodels/readme.txt
diff --git a/examples/canvas3d/canvas3d/quickitemtexture/doc/images/quickitemtexture-example.png b/examples/canvas3d/quickitemtexture/doc/images/quickitemtexture-example.png
index 8139267..8139267 100644
--- a/examples/canvas3d/canvas3d/quickitemtexture/doc/images/quickitemtexture-example.png
+++ b/examples/canvas3d/quickitemtexture/doc/images/quickitemtexture-example.png
diff --git a/examples/canvas3d/canvas3d/quickitemtexture/doc/src/quickitemtexture.qdoc b/examples/canvas3d/quickitemtexture/doc/src/quickitemtexture.qdoc
index 550ddcc..6a6342f 100644
--- a/examples/canvas3d/canvas3d/quickitemtexture/doc/src/quickitemtexture.qdoc
+++ b/examples/canvas3d/quickitemtexture/doc/src/quickitemtexture.qdoc
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 /*!
-    \example canvas3d/quickitemtexture
+    \example quickitemtexture
     \since QtCanvas3D 1.0
     \title Qt Quick Item as Texture Example
     \ingroup qtcanvas3d-examples
@@ -65,7 +65,7 @@
     First we create a \l Rectangle with a label that displays the current frame rate and rotation
     values of the cube:
 
-    \snippet canvas3d/quickitemtexture/qml/quickitemtexture/main.qml 0
+    \snippet quickitemtexture/qml/quickitemtexture/main.qml 0
 
     We want to use the above \l Rectangle as the texture on our 3D cube. As a \l Rectangle item
     doesn't implement QQuickItem::textureProvider() by itself, we make it layered by setting the
@@ -75,7 +75,7 @@
     \l{Canvas3DTextureProvider}{QTCANVAS3D_texture_provider} extension and the texture
     in the \c initializeGL() function in our JavaScript implementation:
 
-    \snippet canvas3d/quickitemtexture/qml/quickitemtexture/quickitemtexture.js 0
+    \snippet quickitemtexture/qml/quickitemtexture/quickitemtexture.js 0
 
     Once the \c cubeTexture item is created, it can be used like any other texture item in
     the JavaScript.
diff --git a/examples/canvas3d/canvas3d/quickitemtexture/main.cpp b/examples/canvas3d/quickitemtexture/main.cpp
index 7d0d686..7d0d686 100644
--- a/examples/canvas3d/canvas3d/quickitemtexture/main.cpp
+++ b/examples/canvas3d/quickitemtexture/main.cpp
diff --git a/examples/canvas3d/canvas3d/quickitemtexture/qml/quickitemtexture/main.qml b/examples/canvas3d/quickitemtexture/qml/quickitemtexture/main.qml
index 9231a48..9231a48 100644
--- a/examples/canvas3d/canvas3d/quickitemtexture/qml/quickitemtexture/main.qml
+++ b/examples/canvas3d/quickitemtexture/qml/quickitemtexture/main.qml
diff --git a/examples/canvas3d/canvas3d/quickitemtexture/qml/quickitemtexture/quickitemtexture.js b/examples/canvas3d/quickitemtexture/qml/quickitemtexture/quickitemtexture.js
index 8409608..8409608 100644
--- a/examples/canvas3d/canvas3d/quickitemtexture/qml/quickitemtexture/quickitemtexture.js
+++ b/examples/canvas3d/quickitemtexture/qml/quickitemtexture/quickitemtexture.js
diff --git a/examples/canvas3d/canvas3d/quickitemtexture/quickitemtexture.pro b/examples/canvas3d/quickitemtexture/quickitemtexture.pro
index f222aa4..f222aa4 100644
--- a/examples/canvas3d/canvas3d/quickitemtexture/quickitemtexture.pro
+++ b/examples/canvas3d/quickitemtexture/quickitemtexture.pro
diff --git a/examples/canvas3d/canvas3d/quickitemtexture/quickitemtexture.qrc b/examples/canvas3d/quickitemtexture/quickitemtexture.qrc
index b0e7ecb..b0e7ecb 100644
--- a/examples/canvas3d/canvas3d/quickitemtexture/quickitemtexture.qrc
+++ b/examples/canvas3d/quickitemtexture/quickitemtexture.qrc
diff --git a/examples/canvas3d/canvas3d/textureandlight/doc/images/textureandlight-example.png b/examples/canvas3d/textureandlight/doc/images/textureandlight-example.png
index d148aa0..d148aa0 100644
--- a/examples/canvas3d/canvas3d/textureandlight/doc/images/textureandlight-example.png
+++ b/examples/canvas3d/textureandlight/doc/images/textureandlight-example.png
diff --git a/examples/canvas3d/canvas3d/textureandlight/doc/src/textureandlight.qdoc b/examples/canvas3d/textureandlight/doc/src/textureandlight.qdoc
index a90dc9f..dc180fb 100644
--- a/examples/canvas3d/canvas3d/textureandlight/doc/src/textureandlight.qdoc
+++ b/examples/canvas3d/textureandlight/doc/src/textureandlight.qdoc
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 /*!
-    \example canvas3d/textureandlight
+    \example textureandlight
     \since QtCanvas3D 1.0
     \title Lit and Textured Cube Example
     \ingroup qtcanvas3d-examples
@@ -64,22 +64,22 @@
 
     \section2 Creating Canvas3D
 
-    In \l{canvas3d/textureandlight/qml/textureandlight/main.qml}{main.qml}, we add a
+    In \l{textureandlight/qml/textureandlight/main.qml}{main.qml}, we add a
     Canvas3D under the root \c Item:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/main.qml 0
+    \snippet textureandlight/qml/textureandlight/main.qml 0
     \dots
 
     Inside it, we catch the \c initializeGL and \c paintGL signals to forward the
     initialization and rendering calls to the js object:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/main.qml 1
+    \snippet textureandlight/qml/textureandlight/main.qml 1
 
     \section2 Importing the JavaScript File
 
     We import the JavaScript file in the QML:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/main.qml 4
+    \snippet textureandlight/qml/textureandlight/main.qml 4
 
     In the \c initializeGL function of the JavaScript, we initialize the OpenGL
     state. We also create the TextureImage and register handlers for image
@@ -90,12 +90,12 @@
 
     \section2 Matrix Library
 
-    In \l {canvas3d/textureandlight/qml/textureandlight/textureandlight.js}
+    In \l {textureandlight/qml/textureandlight/textureandlight.js}
     {textureandlight.js}, we first include a fast matrix library. Using this
     makes it a lot easier to handle 3D math operations such as matrix
     transformations:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/textureandlight.js 0
+    \snippet textureandlight/qml/textureandlight/textureandlight.js 0
 
     \section2 initializeGL Function
 
@@ -105,36 +105,36 @@
     First of all, we need to get a Context3D from our Canvas3D. We want
     a context that supports depth buffer and antialising:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/textureandlight.js 1
+    \snippet textureandlight/qml/textureandlight/textureandlight.js 1
 
     Then we initialize the OpenGL state for the context:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/textureandlight.js 2
+    \snippet textureandlight/qml/textureandlight/textureandlight.js 2
 
     Next, let's take a look into shader initialization in the
     \c initShaders function, which we call in \c{initializeGL}. First we define
     the vertex shader:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/textureandlight.js 3
+    \snippet textureandlight/qml/textureandlight/textureandlight.js 3
 
     We follow that up by defining a fragment shader:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/textureandlight.js 4
+    \snippet textureandlight/qml/textureandlight/textureandlight.js 4
 
     Then we need to create the shader program (Canvas3DProgram), attach the shaders
     to it, and then link and use the program:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/textureandlight.js 5
+    \snippet textureandlight/qml/textureandlight/textureandlight.js 5
 
     And finally, look up and store the vertex attributes and uniform locations:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/textureandlight.js 6
+    \snippet textureandlight/qml/textureandlight/textureandlight.js 6
 
     After initializing the shader program, we set up the vertex buffer in
     \c initBuffers function. Let's look at the vertex index buffer creation
     as an example:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/textureandlight.js 7
+    \snippet textureandlight/qml/textureandlight/textureandlight.js 7
 
     Above, first we create the buffer, then bind it and finally insert the
     data into it. Other buffers are all handled in a similar fashion.
@@ -144,7 +144,7 @@
     \c imageLoadingFailed signals. Once the texture image is successfully
     loaded, we create the actual texture:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/textureandlight.js 8
+    \snippet textureandlight/qml/textureandlight/textureandlight.js 8
 
     \section2 paintGL Function
 
@@ -154,24 +154,24 @@
     First we check if canvas has been resized or if pixel ratio has changed,
     and update the projection matrix if necessary:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/textureandlight.js 9
+    \snippet textureandlight/qml/textureandlight/textureandlight.js 9
 
     Then we clear the render area using the clear color set in \c{initializeGL}:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/textureandlight.js 10
+    \snippet textureandlight/qml/textureandlight/textureandlight.js 10
 
     Next we reset the model view matrix and apply translation and rotations:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/textureandlight.js 11
+    \snippet textureandlight/qml/textureandlight/textureandlight.js 11
 
     As we have a lit cube, we invert and transpose the model view matrix to
     be used for lighting calculations:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/textureandlight.js 12
+    \snippet textureandlight/qml/textureandlight/textureandlight.js 12
 
     And finally we draw the cube:
 
-    \snippet canvas3d/textureandlight/qml/textureandlight/textureandlight.js 13
+    \snippet textureandlight/qml/textureandlight/textureandlight.js 13
 
     \section1 Logging
 
@@ -179,5 +179,5 @@
     all Qt Canvas 3D log output with the code shown below. For more on
     Canvas3D's logging features refer to \l {Qt Canvas 3D Logging}.
 
-    \snippet canvas3d/textureandlight/main.cpp 0
+    \snippet textureandlight/main.cpp 0
 */
diff --git a/examples/canvas3d/canvas3d/textureandlight/main.cpp b/examples/canvas3d/textureandlight/main.cpp
index daf980f..daf980f 100644
--- a/examples/canvas3d/canvas3d/textureandlight/main.cpp
+++ b/examples/canvas3d/textureandlight/main.cpp
diff --git a/examples/canvas3d/canvas3d/textureandlight/qml/textureandlight/main.qml b/examples/canvas3d/textureandlight/qml/textureandlight/main.qml
index f62ad88..f62ad88 100644
--- a/examples/canvas3d/canvas3d/textureandlight/qml/textureandlight/main.qml
+++ b/examples/canvas3d/textureandlight/qml/textureandlight/main.qml
diff --git a/examples/canvas3d/canvas3d/textureandlight/qml/textureandlight/qtlogo.png b/examples/canvas3d/textureandlight/qml/textureandlight/qtlogo.png
index f7276e2..f7276e2 100644
--- a/examples/canvas3d/canvas3d/textureandlight/qml/textureandlight/qtlogo.png
+++ b/examples/canvas3d/textureandlight/qml/textureandlight/qtlogo.png
diff --git a/examples/canvas3d/canvas3d/textureandlight/qml/textureandlight/textureandlight.js b/examples/canvas3d/textureandlight/qml/textureandlight/textureandlight.js
index 59b77a9..59b77a9 100644
--- a/examples/canvas3d/canvas3d/textureandlight/qml/textureandlight/textureandlight.js
+++ b/examples/canvas3d/textureandlight/qml/textureandlight/textureandlight.js
diff --git a/examples/canvas3d/canvas3d/textureandlight/textureandlight.pro b/examples/canvas3d/textureandlight/textureandlight.pro
index 74452d1..74452d1 100644
--- a/examples/canvas3d/canvas3d/textureandlight/textureandlight.pro
+++ b/examples/canvas3d/textureandlight/textureandlight.pro
diff --git a/examples/canvas3d/canvas3d/textureandlight/textureandlight.qrc b/examples/canvas3d/textureandlight/textureandlight.qrc
index bd485d1..bd485d1 100644
--- a/examples/canvas3d/canvas3d/textureandlight/textureandlight.qrc
+++ b/examples/canvas3d/textureandlight/textureandlight.qrc
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/cellphone.pro b/examples/canvas3d/threejs/cellphone/cellphone.pro
index df1b2a9..9e27f7b 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/cellphone.pro
+++ b/examples/canvas3d/threejs/cellphone/cellphone.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 
 QT += qml quick
 
-target.path = $$[QT_INSTALL_EXAMPLES]/canvas3d/$$TARGET
+target.path = $$[QT_INSTALL_EXAMPLES]/canvas3d/threejs/$$TARGET
 INSTALLS += target
 
 SOURCES += main.cpp
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/cellphone.qrc b/examples/canvas3d/threejs/cellphone/cellphone.qrc
index 8f28b38..8f28b38 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/cellphone.qrc
+++ b/examples/canvas3d/threejs/cellphone/cellphone.qrc
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/doc/images/cellphone-example.png b/examples/canvas3d/threejs/cellphone/doc/images/cellphone-example.png
index a3008bf..a3008bf 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/doc/images/cellphone-example.png
+++ b/examples/canvas3d/threejs/cellphone/doc/images/cellphone-example.png
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/doc/src/cellphone.qdoc b/examples/canvas3d/threejs/cellphone/doc/src/cellphone.qdoc
index cda50ef..165101b 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/doc/src/cellphone.qdoc
+++ b/examples/canvas3d/threejs/cellphone/doc/src/cellphone.qdoc
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 /*!
-    \example canvas3d/threejs/cellphone
+    \example threejs/cellphone
     \since QtCanvas3D 1.1
     \title Interactive Mobile Phone Example
     \ingroup qtcanvas3d-examples
@@ -63,13 +63,13 @@
 
     \section1 Qt Quick Implementation
 
-    The Qt Quick Implementation \l{canvas3d/threejs/cellphone/qml/cellphone/main.qml}{main.qml}
+    The Qt Quick Implementation \l{threejs/cellphone/qml/cellphone/main.qml}{main.qml}
     of the example renders the 3D model of the mobile phone using Canvas3D type.
     The phone UI is composed of the \c textureSource Qt Quick item and its children.
     To make it possible to use the item as a texture source for Canvas3D,
     we must enable the layer of the item:
 
-    \snippet canvas3d/threejs/cellphone/qml/cellphone/main.qml 0
+    \snippet threejs/cellphone/qml/cellphone/main.qml 0
     \dots
 
     The texture mirroring is disabled so that the OpenGL texture generated from the item
@@ -78,7 +78,7 @@
     The \c textureSource item is passed as a parameter to the JavaScript function handling the
     OpenGL initialization in Canvas3D:
 
-    \snippet canvas3d/threejs/cellphone/qml/cellphone/cellphonecanvas.qml 1
+    \snippet threejs/cellphone/qml/cellphone/cellphonecanvas.qml 1
 
     The texture generated from the \c textureSource is not interactable by itself, as it is just a
     regular texture. To make it appear interactable, we make it so that the phone UI is interactable
@@ -88,7 +88,7 @@
     scaling of the \c textureSource item using its \l{Item::transform}{transform} property.
     The \c textureSource item is set fully transparent so that there are no visual artifacts:
 
-    \snippet canvas3d/threejs/cellphone/qml/cellphone/main.qml 2
+    \snippet threejs/cellphone/qml/cellphone/main.qml 2
 
     To ensure user cannot interact with the UI when the phone is rotating, we hide the
     \c textureSource item behind the Canvas3D by adjusting its \l{Item::z}{z} property when the
@@ -97,7 +97,7 @@
     \section1 The JavaScript Code
 
     The JavaScript side of the implementation,
-    \l{canvas3d/threejs/cellphone/qml/cellphone/cellphone.js}{cellphone.js},
+    \l{threejs/cellphone/qml/cellphone/cellphone.js}{cellphone.js},
     is done using a version of \c{three.js} that is ported for \l{Qt Canvas 3D}:
     \l{https://github.com/tronlec/three.js}{three.js}.
 
@@ -107,11 +107,11 @@
     from a Qt Quick texture source: simply create a new \c{THREE.QtQuickItemTexture} with the
     \c textureSource as a parameter and you are done:
 
-    \snippet canvas3d/threejs/cellphone/qml/cellphone/cellphone.js 0
+    \snippet threejs/cellphone/qml/cellphone/cellphone.js 0
 
     The texture created this way can be used as a map to a material just like a regular texture:
 
-    \snippet canvas3d/threejs/cellphone/qml/cellphone/cellphone.js 1
+    \snippet threejs/cellphone/qml/cellphone/cellphone.js 1
 
     The scene is rendered in \c{paintGL()} method, which simply adjusts the rotations of the
     phone meshes, repositions the camera and light, and renders the scene.
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/images/calendar.png b/examples/canvas3d/threejs/cellphone/images/calendar.png
index 80952e6..80952e6 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/images/calendar.png
+++ b/examples/canvas3d/threejs/cellphone/images/calendar.png
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/images/camera.png b/examples/canvas3d/threejs/cellphone/images/camera.png
index 8528e44..8528e44 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/images/camera.png
+++ b/examples/canvas3d/threejs/cellphone/images/camera.png
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/images/clock.png b/examples/canvas3d/threejs/cellphone/images/clock.png
index 11cb76d..11cb76d 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/images/clock.png
+++ b/examples/canvas3d/threejs/cellphone/images/clock.png
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/images/contacts.png b/examples/canvas3d/threejs/cellphone/images/contacts.png
index a82d92f..a82d92f 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/images/contacts.png
+++ b/examples/canvas3d/threejs/cellphone/images/contacts.png
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/images/gallery.png b/examples/canvas3d/threejs/cellphone/images/gallery.png
index 059b02d..059b02d 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/images/gallery.png
+++ b/examples/canvas3d/threejs/cellphone/images/gallery.png
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/images/games.png b/examples/canvas3d/threejs/cellphone/images/games.png
index d96c3fa..d96c3fa 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/images/games.png
+++ b/examples/canvas3d/threejs/cellphone/images/games.png
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/images/lock.png b/examples/canvas3d/threejs/cellphone/images/lock.png
index 9a25b69..9a25b69 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/images/lock.png
+++ b/examples/canvas3d/threejs/cellphone/images/lock.png
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/images/mail.png b/examples/canvas3d/threejs/cellphone/images/mail.png
index 1fd155a..1fd155a 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/images/mail.png
+++ b/examples/canvas3d/threejs/cellphone/images/mail.png
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/images/maps.png b/examples/canvas3d/threejs/cellphone/images/maps.png
index b29f394..b29f394 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/images/maps.png
+++ b/examples/canvas3d/threejs/cellphone/images/maps.png
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/images/menu_background.jpg b/examples/canvas3d/threejs/cellphone/images/menu_background.jpg
index 69c6938..69c6938 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/images/menu_background.jpg
+++ b/examples/canvas3d/threejs/cellphone/images/menu_background.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/images/music.png b/examples/canvas3d/threejs/cellphone/images/music.png
index 603f643..603f643 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/images/music.png
+++ b/examples/canvas3d/threejs/cellphone/images/music.png
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/images/plutomap1k.jpg b/examples/canvas3d/threejs/cellphone/images/plutomap1k.jpg
index d18bf9f..d18bf9f 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/images/plutomap1k.jpg
+++ b/examples/canvas3d/threejs/cellphone/images/plutomap1k.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/images/qtlogo_with_alpha.png b/examples/canvas3d/threejs/cellphone/images/qtlogo_with_alpha.png
index b2f48ee..b2f48ee 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/images/qtlogo_with_alpha.png
+++ b/examples/canvas3d/threejs/cellphone/images/qtlogo_with_alpha.png
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/images/settings.png b/examples/canvas3d/threejs/cellphone/images/settings.png
index c79fac2..c79fac2 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/images/settings.png
+++ b/examples/canvas3d/threejs/cellphone/images/settings.png
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/images/todo.png b/examples/canvas3d/threejs/cellphone/images/todo.png
index 217c59e..217c59e 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/images/todo.png
+++ b/examples/canvas3d/threejs/cellphone/images/todo.png
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/images/videos.png b/examples/canvas3d/threejs/cellphone/images/videos.png
index ee438ed..ee438ed 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/images/videos.png
+++ b/examples/canvas3d/threejs/cellphone/images/videos.png
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/main.cpp b/examples/canvas3d/threejs/cellphone/main.cpp
index a52538f..a52538f 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/main.cpp
+++ b/examples/canvas3d/threejs/cellphone/main.cpp
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphone.js b/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphone.js
index 79b8050..79b8050 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphone.js
+++ b/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphone.js
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphone_case.json b/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphone_case.json
index f360722..f360722 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphone_case.json
+++ b/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphone_case.json
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphone_front.json b/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphone_front.json
index 0094b26..0094b26 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphone_front.json
+++ b/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphone_front.json
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphone_icon.json b/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphone_icon.json
index 4ab9d53..4ab9d53 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphone_icon.json
+++ b/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphone_icon.json
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml b/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml
index 9ab674d..9ab674d 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml
+++ b/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphonecanvas.qml b/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphonecanvas.qml
index 9b48511..9b48511 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphonecanvas.qml
+++ b/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphonecanvas.qml
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/colorselector.qml b/examples/canvas3d/threejs/cellphone/qml/cellphone/colorselector.qml
index a872982..a872982 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/colorselector.qml
+++ b/examples/canvas3d/threejs/cellphone/qml/cellphone/colorselector.qml
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/fpsdisplay.qml b/examples/canvas3d/threejs/cellphone/qml/cellphone/fpsdisplay.qml
index 7130c6a..7130c6a 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/fpsdisplay.qml
+++ b/examples/canvas3d/threejs/cellphone/qml/cellphone/fpsdisplay.qml
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/main.qml b/examples/canvas3d/threejs/cellphone/qml/cellphone/main.qml
index 24b61b2..24b61b2 100644
--- a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/main.qml
+++ b/examples/canvas3d/threejs/cellphone/qml/cellphone/main.qml
diff --git a/examples/canvas3d/canvas3d/threejs/controls/ControlEventSource.qml b/examples/canvas3d/threejs/controls/ControlEventSource.qml
index 5dae5a9..5dae5a9 100644
--- a/examples/canvas3d/canvas3d/threejs/controls/ControlEventSource.qml
+++ b/examples/canvas3d/threejs/controls/ControlEventSource.qml
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ImageCube.qml b/examples/canvas3d/threejs/oneqt/ImageCube.qml
index 43b3e5b..43b3e5b 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ImageCube.qml
+++ b/examples/canvas3d/threejs/oneqt/ImageCube.qml
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/InfoSheet.qml b/examples/canvas3d/threejs/oneqt/InfoSheet.qml
index 66a8f3f..66a8f3f 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/InfoSheet.qml
+++ b/examples/canvas3d/threejs/oneqt/InfoSheet.qml
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/Navibutton.qml b/examples/canvas3d/threejs/oneqt/Navibutton.qml
index 87a264a..87a264a 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/Navibutton.qml
+++ b/examples/canvas3d/threejs/oneqt/Navibutton.qml
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/SwipeArea.qml b/examples/canvas3d/threejs/oneqt/SwipeArea.qml
index c6afaa7..c6afaa7 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/SwipeArea.qml
+++ b/examples/canvas3d/threejs/oneqt/SwipeArea.qml
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/doc/images/oneqt-example.png b/examples/canvas3d/threejs/oneqt/doc/images/oneqt-example.png
index 726cc2e..726cc2e 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/doc/images/oneqt-example.png
+++ b/examples/canvas3d/threejs/oneqt/doc/images/oneqt-example.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/doc/src/oneqt.qdoc b/examples/canvas3d/threejs/oneqt/doc/src/oneqt.qdoc
index 75b2458..c281834 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/doc/src/oneqt.qdoc
+++ b/examples/canvas3d/threejs/oneqt/doc/src/oneqt.qdoc
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 /*!
-    \example canvas3d/threejs/oneqt
+    \example threejs/oneqt
     \since QtCanvas3D 1.0
     \title One Qt Example
     \ingroup qtcanvas3d-examples
@@ -68,12 +68,12 @@
 
     \section1 Main QML File
 
-    In \l{canvas3d/threejs/oneqt/oneqt.qml}{oneqt.qml}, we build the 2D content as normal in QML.
+    In \l{threejs/oneqt/oneqt.qml}{oneqt.qml}, we build the 2D content as normal in QML.
     Then we add a custom \c {ImageCube} type into the scene behind the text elements.
     This custom type, implemented using \c{three.js} library, handles the painting of the 3D
     cube.
 
-    \snippet canvas3d/threejs/oneqt/oneqt.qml 0
+    \snippet threejs/oneqt/oneqt.qml 0
     \dots
 
     \note The \c {ImageCube} 3D UI component can be created and anchored just like any other
@@ -81,7 +81,7 @@
 
     \section1 The Custom 3D QML Control
 
-    The \l{canvas3d/threejs/oneqt/ImageCube.qml}{ImageCube.qml} takes six images that it loads
+    The \l{threejs/oneqt/ImageCube.qml}{ImageCube.qml} takes six images that it loads
     and places to the sides of the cube. In addition, the type has a state that defines which of
     these images are visible and a \c {backgroundColor} property that is used when painting the 3D
     cube. The \c {angleOffset} property can be used to adjust the cube's direction when displaying
@@ -90,71 +90,71 @@
     This angle is also used by the 3D light so that the light always illuminates the selected face
     of the cube.
 
-    \snippet canvas3d/threejs/oneqt/ImageCube.qml 0
+    \snippet threejs/oneqt/ImageCube.qml 0
     \dots
 
     The custom type defines six states, one for each side of the cube along with the x-, y-, and
     z-rotations, that must be set to show the face of the cube corresponding to the state.
 
-    \snippet canvas3d/threejs/oneqt/ImageCube.qml 1
+    \snippet threejs/oneqt/ImageCube.qml 1
     \dots
 
     We use \c {RotationAnimation} to animate the transition between angles. It enables us to get
     smooth transitions between different cube orientations and to always rotate the cube along the
     shortest possible angle distance.
 
-    \snippet canvas3d/threejs/oneqt/ImageCube.qml 2
+    \snippet threejs/oneqt/ImageCube.qml 2
     \dots
 
     We call the JavaScript code that uses \c{three.js} to do the rendering of the cube, calling
     it on the \c{initializeGL}, \c{paintGL}, and \c{resizeGL} signals.
 
-    \snippet canvas3d/threejs/oneqt/ImageCube.qml 3
+    \snippet threejs/oneqt/ImageCube.qml 3
 
     \section1 The JavaScript Code
 
     The JavaScript side of the implementation,
-    \l{canvas3d/threejs/oneqt/imagecube.js}{imagecube.js},
+    \l{threejs/oneqt/imagecube.js}{imagecube.js},
     is done using a version of \c{three.js} that is ported for \l{Qt Canvas 3D}:
     \l{https://github.com/tronlec/three.js}{three.js}.
 
-    In \l{canvas3d/threejs/oneqt/imagecube.js}{imagecube.js}, we start by creating the camera and
+    In \l{threejs/oneqt/imagecube.js}{imagecube.js}, we start by creating the camera and
     the scene that contains all the rest of the \c{three.js} objects.
 
-    \snippet canvas3d/threejs/oneqt/imagecube.js 0
+    \snippet threejs/oneqt/imagecube.js 0
     \dots
 
     Then we start the asynchronous loading of the textures and create a material array for the sides
     of the cube (note that the cube needs 12 materials as each side consists of two triangles).
 
-    \snippet canvas3d/threejs/oneqt/imagecube.js 1
+    \snippet threejs/oneqt/imagecube.js 1
     \dots
 
     We then create the needed geometry as \c {BoxGeometry} binding the created materials to the
     faces of the cube. We then create a \c {MeshFaceMaterial} from the array of materials.
 
-    \snippet canvas3d/threejs/oneqt/imagecube.js 2
+    \snippet threejs/oneqt/imagecube.js 2
 
     Finally we create the cube mesh from the geometry and material, position it, and add it
     to the 3D scene.
 
-    \snippet canvas3d/threejs/oneqt/imagecube.js 3
+    \snippet threejs/oneqt/imagecube.js 3
 
     Next we create and add some lights to the scene. \c{AmbientLight} defines the surrounding light
     amount and the directional light is positioned so that it highlights the face of the cube that
     is currently selected.
 
-    \snippet canvas3d/threejs/oneqt/imagecube.js 6
+    \snippet threejs/oneqt/imagecube.js 6
 
     Final step in the initialization phase is to create the \c {Canvas3D} renderer and set the
     initial size and clear color (color of the background) to the renderer.
 
-    \snippet canvas3d/threejs/oneqt/imagecube.js 4
+    \snippet threejs/oneqt/imagecube.js 4
 
     When we need to render the scene in response to the \c{paintGL} signal from Canvas3D, we just
     copy the current rotation values from the QML side to the cube mesh in the \c{paintGL()} method.
 
-    \snippet canvas3d/threejs/oneqt/imagecube.js 5
+    \snippet threejs/oneqt/imagecube.js 5
 
     For more information on how to use \c {three.js} the documentation is available here:
     \l{http://threejs.org/docs/}{three.js/docs}
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/imagecube.js b/examples/canvas3d/threejs/oneqt/imagecube.js
index 3119668..3119668 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/imagecube.js
+++ b/examples/canvas3d/threejs/oneqt/imagecube.js
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/Info.plist b/examples/canvas3d/threejs/oneqt/ios/Info.plist
index 192ea0d..192ea0d 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/Info.plist
+++ b/examples/canvas3d/threejs/oneqt/ios/Info.plist
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29.png b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon29x29.png
index 3679329..3679329 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29.png
+++ b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon29x29.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29@2x.png b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon29x29@2x.png
index 6beb7ef..6beb7ef 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29@2x.png
+++ b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon29x29@2x.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29@2x~ipad.png b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon29x29@2x~ipad.png
index 6beb7ef..6beb7ef 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29@2x~ipad.png
+++ b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon29x29@2x~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29~ipad.png b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon29x29~ipad.png
index 3679329..3679329 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon29x29~ipad.png
+++ b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon29x29~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon40x40@2x.png b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon40x40@2x.png
index e764582..e764582 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon40x40@2x.png
+++ b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon40x40@2x.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon40x40@2x~ipad.png b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon40x40@2x~ipad.png
index e764582..e764582 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon40x40@2x~ipad.png
+++ b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon40x40@2x~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon40x40~ipad.png b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon40x40~ipad.png
index b3eaba6..b3eaba6 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon40x40~ipad.png
+++ b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon40x40~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon50x50@2x~ipad.png b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon50x50@2x~ipad.png
index 8bf885b..8bf885b 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon50x50@2x~ipad.png
+++ b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon50x50@2x~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon50x50~ipad.png b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon50x50~ipad.png
index 126359d..126359d 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon50x50~ipad.png
+++ b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon50x50~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon57x57.png b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon57x57.png
index d0f396f..d0f396f 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon57x57.png
+++ b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon57x57.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon57x57@2x.png b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon57x57@2x.png
index 7fab49b..7fab49b 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon57x57@2x.png
+++ b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon57x57@2x.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon60x60@2x.png b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon60x60@2x.png
index d594419..d594419 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon60x60@2x.png
+++ b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon60x60@2x.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon72x72@2x~ipad.png b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon72x72@2x~ipad.png
index f68d8ea..f68d8ea 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon72x72@2x~ipad.png
+++ b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon72x72@2x~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon72x72~ipad.png b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon72x72~ipad.png
index 0450da8..0450da8 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon72x72~ipad.png
+++ b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon72x72~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon76x76@2x~ipad.png b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon76x76@2x~ipad.png
index 9d9c2dc..9d9c2dc 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon76x76@2x~ipad.png
+++ b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon76x76@2x~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon76x76~ipad.png b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon76x76~ipad.png
index d86c9b2..d86c9b2 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/ios/OneQtIcon76x76~ipad.png
+++ b/examples/canvas3d/threejs/oneqt/ios/OneQtIcon76x76~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/main.cpp b/examples/canvas3d/threejs/oneqt/main.cpp
index 0483af1..0483af1 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/main.cpp
+++ b/examples/canvas3d/threejs/oneqt/main.cpp
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.pro b/examples/canvas3d/threejs/oneqt/oneqt.pro
index d3efb1b..0885735 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.pro
+++ b/examples/canvas3d/threejs/oneqt/oneqt.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 
 QT += qml quick
 
-target.path = $$[QT_INSTALL_EXAMPLES]/canvas3d/$$TARGET
+target.path = $$[QT_INSTALL_EXAMPLES]/canvas3d/threejs/$$TARGET
 INSTALLS += target
 
 SOURCES += main.cpp
@@ -20,3 +20,6 @@ ios {
     QMAKE_BUNDLE_DATA += ios_icon
     QMAKE_INFO_PLIST = ios/Info.plist
 }
+
+EXAMPLE_FILES += \
+    ios
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.qml b/examples/canvas3d/threejs/oneqt/oneqt.qml
index 0d51e2b..0d51e2b 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.qml
+++ b/examples/canvas3d/threejs/oneqt/oneqt.qml
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.qrc b/examples/canvas3d/threejs/oneqt/oneqt.qrc
index bb641b2..bb641b2 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.qrc
+++ b/examples/canvas3d/threejs/oneqt/oneqt.qrc
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/textures/dataviz.jpg b/examples/canvas3d/threejs/oneqt/textures/dataviz.jpg
index b680b85..b680b85 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/textures/dataviz.jpg
+++ b/examples/canvas3d/threejs/oneqt/textures/dataviz.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/textures/devices.png b/examples/canvas3d/threejs/oneqt/textures/devices.png
index 6e537a9..6e537a9 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/textures/devices.png
+++ b/examples/canvas3d/threejs/oneqt/textures/devices.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/textures/embedded.png b/examples/canvas3d/threejs/oneqt/textures/embedded.png
index cd77ead..cd77ead 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/textures/embedded.png
+++ b/examples/canvas3d/threejs/oneqt/textures/embedded.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/textures/iot.png b/examples/canvas3d/threejs/oneqt/textures/iot.png
index cab216c..cab216c 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/textures/iot.png
+++ b/examples/canvas3d/threejs/oneqt/textures/iot.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/textures/multiscreen.png b/examples/canvas3d/threejs/oneqt/textures/multiscreen.png
index 668d65d..668d65d 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/textures/multiscreen.png
+++ b/examples/canvas3d/threejs/oneqt/textures/multiscreen.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/textures/puzzle-pieces.png b/examples/canvas3d/threejs/oneqt/textures/puzzle-pieces.png
index 9526256..9526256 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/textures/puzzle-pieces.png
+++ b/examples/canvas3d/threejs/oneqt/textures/puzzle-pieces.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/textures/qtlogo.png b/examples/canvas3d/threejs/oneqt/textures/qtlogo.png
index f7276e2..f7276e2 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/textures/qtlogo.png
+++ b/examples/canvas3d/threejs/oneqt/textures/qtlogo.png
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/textures/qtlogosmall.png b/examples/canvas3d/threejs/oneqt/textures/qtlogosmall.png
index 7d6772d..7d6772d 100644
--- a/examples/canvas3d/canvas3d/threejs/oneqt/textures/qtlogosmall.png
+++ b/examples/canvas3d/threejs/oneqt/textures/qtlogosmall.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/FpsDisplay.qml b/examples/canvas3d/threejs/planets/FpsDisplay.qml
index c4e2cf7..c4e2cf7 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/FpsDisplay.qml
+++ b/examples/canvas3d/threejs/planets/FpsDisplay.qml
diff --git a/examples/canvas3d/canvas3d/threejs/planets/InfoSheet.qml b/examples/canvas3d/threejs/planets/InfoSheet.qml
index 1ac340b..1ac340b 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/InfoSheet.qml
+++ b/examples/canvas3d/threejs/planets/InfoSheet.qml
diff --git a/examples/canvas3d/canvas3d/threejs/planets/PlanetButton.qml b/examples/canvas3d/threejs/planets/PlanetButton.qml
index 9587adb..9587adb 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/PlanetButton.qml
+++ b/examples/canvas3d/threejs/planets/PlanetButton.qml
diff --git a/examples/canvas3d/canvas3d/threejs/planets/StyledSlider.qml b/examples/canvas3d/threejs/planets/StyledSlider.qml
index cc0dd94..cc0dd94 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/StyledSlider.qml
+++ b/examples/canvas3d/threejs/planets/StyledSlider.qml
diff --git a/examples/canvas3d/canvas3d/threejs/planets/doc/images/planets-example.jpg b/examples/canvas3d/threejs/planets/doc/images/planets-example.jpg
index 7177c27..7177c27 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/doc/images/planets-example.jpg
+++ b/examples/canvas3d/threejs/planets/doc/images/planets-example.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/doc/src/planets.qdoc b/examples/canvas3d/threejs/planets/doc/src/planets.qdoc
index f03f5df..423de09 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/doc/src/planets.qdoc
+++ b/examples/canvas3d/threejs/planets/doc/src/planets.qdoc
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 /*!
-    \example canvas3d/threejs/planets
+    \example threejs/planets
     \since QtCanvas3D 1.0
     \title Planets Example
     \ingroup qtcanvas3d-examples
@@ -68,11 +68,11 @@
 
     \section1 Qt Quick Implementation
 
-    The Qt Quick Implementation \l{canvas3d/threejs/planets/planets.qml}{planets.qml} of the example
+    The Qt Quick Implementation \l{threejs/planets/planets.qml}{planets.qml} of the example
     renders the 3D content using Canvas3D type. The type calls JavaScript code that uses
     \c{three.js} to initialize, paint, and resize the 3D view.
 
-    \snippet canvas3d/threejs/planets/planets.qml 0
+    \snippet threejs/planets/planets.qml 0
 
     The planet related information is stored into \c{ListModel}. The selection buttons for the
     planets and the information sheet are created based on the model. The 2D elements, selection
@@ -83,18 +83,18 @@
     camera position and the camera look at point are updated based on values that are animated on
     QML side.
 
-    \snippet canvas3d/threejs/planets/planets.qml 1
+    \snippet threejs/planets/planets.qml 1
 
     The sliders are used to adjust the rotation speed, the planet size, and the viewing distance.
     When the slider value changes, JavaScript code is called to adjust the given property. For
     example, changing the value of the "Viewing Distance" slider calls the \c{setCameraDistence()}
     method.
 
-    \snippet canvas3d/threejs/planets/planets.qml 2
+    \snippet threejs/planets/planets.qml 2
 
     \section1 The JavaScript Code
 
-    The JavaScript side of the implementation, \l{canvas3d/threejs/planets/planets.js}{planets.js},
+    The JavaScript side of the implementation, \l{threejs/planets/planets.js}{planets.js},
     is done using a version of \c{three.js} that is ported for \l{Qt Canvas 3D}:
     \l{https://github.com/tronlec/three.js}{three.js}.
 
@@ -121,17 +121,17 @@
     In order to handle the mouse event in JavaScript code the Canvas3D type has to include the
     \c{ControlEventSource} type.
 
-    \snippet canvas3d/threejs/planets/planets.qml 3
+    \snippet threejs/planets/planets.qml 3
 
     This type is then passed to the JavaScript code on initialization.
 
-    \snippet canvas3d/threejs/planets/planets.qml 4
+    \snippet threejs/planets/planets.qml 4
 
     On JavaScript code in the \c{initializeGL()} method the \c{eventSource} object is saved to a
     global variable. In this example \c{mouseDown} event is connected to the
     \c{onDocumentMouseDown()} method.
 
-    \snippet canvas3d/threejs/planets/planets.js 5
+    \snippet threejs/planets/planets.js 5
 
     Based on the mouse position variables passed to \c{onDocumentMouseDown()} method, it's checked
     if the event takes place on top of a planet or not. The focused planet is changed according to
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/earth.png b/examples/canvas3d/threejs/planets/images/earth.png
index 7bfef7c..7bfef7c 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/earth.png
+++ b/examples/canvas3d/threejs/planets/images/earth.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/earthbump1k.jpg b/examples/canvas3d/threejs/planets/images/earthbump1k.jpg
index 11690de..11690de 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/earthbump1k.jpg
+++ b/examples/canvas3d/threejs/planets/images/earthbump1k.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/earthcloudmapcolortrans.png b/examples/canvas3d/threejs/planets/images/earthcloudmapcolortrans.png
index ee2a897..ee2a897 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/earthcloudmapcolortrans.png
+++ b/examples/canvas3d/threejs/planets/images/earthcloudmapcolortrans.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/earthmap1k.jpg b/examples/canvas3d/threejs/planets/images/earthmap1k.jpg
index e1de9d3..e1de9d3 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/earthmap1k.jpg
+++ b/examples/canvas3d/threejs/planets/images/earthmap1k.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/earthspec1k.jpg b/examples/canvas3d/threejs/planets/images/earthspec1k.jpg
index 3de6fe7..3de6fe7 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/earthspec1k.jpg
+++ b/examples/canvas3d/threejs/planets/images/earthspec1k.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/galaxy_starfield.png b/examples/canvas3d/threejs/planets/images/galaxy_starfield.png
index 36a762e..36a762e 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/galaxy_starfield.png
+++ b/examples/canvas3d/threejs/planets/images/galaxy_starfield.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/jupiter.png b/examples/canvas3d/threejs/planets/images/jupiter.png
index b0cc4cf..b0cc4cf 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/jupiter.png
+++ b/examples/canvas3d/threejs/planets/images/jupiter.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/jupitermap.jpg b/examples/canvas3d/threejs/planets/images/jupitermap.jpg
index 69107df..69107df 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/jupitermap.jpg
+++ b/examples/canvas3d/threejs/planets/images/jupitermap.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/mars.png b/examples/canvas3d/threejs/planets/images/mars.png
index 187560b..187560b 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/mars.png
+++ b/examples/canvas3d/threejs/planets/images/mars.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/marsbump1k.jpg b/examples/canvas3d/threejs/planets/images/marsbump1k.jpg
index 1e13120..1e13120 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/marsbump1k.jpg
+++ b/examples/canvas3d/threejs/planets/images/marsbump1k.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/marsmap1k.jpg b/examples/canvas3d/threejs/planets/images/marsmap1k.jpg
index 64ebc53..64ebc53 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/marsmap1k.jpg
+++ b/examples/canvas3d/threejs/planets/images/marsmap1k.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/mercury.png b/examples/canvas3d/threejs/planets/images/mercury.png
index 418d49f..418d49f 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/mercury.png
+++ b/examples/canvas3d/threejs/planets/images/mercury.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/mercurybump.jpg b/examples/canvas3d/threejs/planets/images/mercurybump.jpg
index c23dd31..c23dd31 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/mercurybump.jpg
+++ b/examples/canvas3d/threejs/planets/images/mercurybump.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/mercurymap.jpg b/examples/canvas3d/threejs/planets/images/mercurymap.jpg
index 9bb2c0b..9bb2c0b 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/mercurymap.jpg
+++ b/examples/canvas3d/threejs/planets/images/mercurymap.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/moonbump1k.jpg b/examples/canvas3d/threejs/planets/images/moonbump1k.jpg
index f5368ba..f5368ba 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/moonbump1k.jpg
+++ b/examples/canvas3d/threejs/planets/images/moonbump1k.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/moonmap1k.jpg b/examples/canvas3d/threejs/planets/images/moonmap1k.jpg
index 509d3f5..509d3f5 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/moonmap1k.jpg
+++ b/examples/canvas3d/threejs/planets/images/moonmap1k.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/neptune.png b/examples/canvas3d/threejs/planets/images/neptune.png
index 07794c6..07794c6 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/neptune.png
+++ b/examples/canvas3d/threejs/planets/images/neptune.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/neptunemap.jpg b/examples/canvas3d/threejs/planets/images/neptunemap.jpg
index 0d0d3f0..0d0d3f0 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/neptunemap.jpg
+++ b/examples/canvas3d/threejs/planets/images/neptunemap.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/plutobump1k.jpg b/examples/canvas3d/threejs/planets/images/plutobump1k.jpg
index 8128029..8128029 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/plutobump1k.jpg
+++ b/examples/canvas3d/threejs/planets/images/plutobump1k.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/plutomap1k.jpg b/examples/canvas3d/threejs/planets/images/plutomap1k.jpg
index d18bf9f..d18bf9f 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/plutomap1k.jpg
+++ b/examples/canvas3d/threejs/planets/images/plutomap1k.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/saturn.png b/examples/canvas3d/threejs/planets/images/saturn.png
index 003363c..003363c 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/saturn.png
+++ b/examples/canvas3d/threejs/planets/images/saturn.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/saturnmap.jpg b/examples/canvas3d/threejs/planets/images/saturnmap.jpg
index 767be39..767be39 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/saturnmap.jpg
+++ b/examples/canvas3d/threejs/planets/images/saturnmap.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/saturnringcolortrans.png b/examples/canvas3d/threejs/planets/images/saturnringcolortrans.png
index 6a5e457..6a5e457 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/saturnringcolortrans.png
+++ b/examples/canvas3d/threejs/planets/images/saturnringcolortrans.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/sun.png b/examples/canvas3d/threejs/planets/images/sun.png
index 9a62c5f..9a62c5f 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/sun.png
+++ b/examples/canvas3d/threejs/planets/images/sun.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/sunmap.jpg b/examples/canvas3d/threejs/planets/images/sunmap.jpg
index 3e0b520..3e0b520 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/sunmap.jpg
+++ b/examples/canvas3d/threejs/planets/images/sunmap.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/uranus.png b/examples/canvas3d/threejs/planets/images/uranus.png
index 8678b9a..8678b9a 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/uranus.png
+++ b/examples/canvas3d/threejs/planets/images/uranus.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/uranusmap.jpg b/examples/canvas3d/threejs/planets/images/uranusmap.jpg
index aad43fb..aad43fb 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/uranusmap.jpg
+++ b/examples/canvas3d/threejs/planets/images/uranusmap.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/uranusringcolortrans.png b/examples/canvas3d/threejs/planets/images/uranusringcolortrans.png
index 28ef9ba..28ef9ba 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/uranusringcolortrans.png
+++ b/examples/canvas3d/threejs/planets/images/uranusringcolortrans.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/venus.png b/examples/canvas3d/threejs/planets/images/venus.png
index fdbb45d..fdbb45d 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/venus.png
+++ b/examples/canvas3d/threejs/planets/images/venus.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/venusbump.jpg b/examples/canvas3d/threejs/planets/images/venusbump.jpg
index 551bbd3..551bbd3 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/venusbump.jpg
+++ b/examples/canvas3d/threejs/planets/images/venusbump.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/venusmap.jpg b/examples/canvas3d/threejs/planets/images/venusmap.jpg
index 699f280..699f280 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/images/venusmap.jpg
+++ b/examples/canvas3d/threejs/planets/images/venusmap.jpg
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon29x29.png b/examples/canvas3d/threejs/planets/ios/AppIcon29x29.png
index e8d6079..e8d6079 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon29x29.png
+++ b/examples/canvas3d/threejs/planets/ios/AppIcon29x29.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon29x29@2x.png b/examples/canvas3d/threejs/planets/ios/AppIcon29x29@2x.png
index 983953f..983953f 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon29x29@2x.png
+++ b/examples/canvas3d/threejs/planets/ios/AppIcon29x29@2x.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon29x29@2x~ipad.png b/examples/canvas3d/threejs/planets/ios/AppIcon29x29@2x~ipad.png
index 983953f..983953f 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon29x29@2x~ipad.png
+++ b/examples/canvas3d/threejs/planets/ios/AppIcon29x29@2x~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon29x29~ipad.png b/examples/canvas3d/threejs/planets/ios/AppIcon29x29~ipad.png
index e8d6079..e8d6079 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon29x29~ipad.png
+++ b/examples/canvas3d/threejs/planets/ios/AppIcon29x29~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon40x40@2x.png b/examples/canvas3d/threejs/planets/ios/AppIcon40x40@2x.png
index bd5c063..bd5c063 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon40x40@2x.png
+++ b/examples/canvas3d/threejs/planets/ios/AppIcon40x40@2x.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon40x40@2x~ipad.png b/examples/canvas3d/threejs/planets/ios/AppIcon40x40@2x~ipad.png
index bd5c063..bd5c063 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon40x40@2x~ipad.png
+++ b/examples/canvas3d/threejs/planets/ios/AppIcon40x40@2x~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon40x40~ipad.png b/examples/canvas3d/threejs/planets/ios/AppIcon40x40~ipad.png
index 0d43485..0d43485 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon40x40~ipad.png
+++ b/examples/canvas3d/threejs/planets/ios/AppIcon40x40~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon50x50@2x~ipad.png b/examples/canvas3d/threejs/planets/ios/AppIcon50x50@2x~ipad.png
index 32db873..32db873 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon50x50@2x~ipad.png
+++ b/examples/canvas3d/threejs/planets/ios/AppIcon50x50@2x~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon50x50~ipad.png b/examples/canvas3d/threejs/planets/ios/AppIcon50x50~ipad.png
index e9c48ed..e9c48ed 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon50x50~ipad.png
+++ b/examples/canvas3d/threejs/planets/ios/AppIcon50x50~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon57x57.png b/examples/canvas3d/threejs/planets/ios/AppIcon57x57.png
index 45fd395..45fd395 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon57x57.png
+++ b/examples/canvas3d/threejs/planets/ios/AppIcon57x57.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon57x57@2x.png b/examples/canvas3d/threejs/planets/ios/AppIcon57x57@2x.png
index bd0ae80..bd0ae80 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon57x57@2x.png
+++ b/examples/canvas3d/threejs/planets/ios/AppIcon57x57@2x.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon60x60@2x.png b/examples/canvas3d/threejs/planets/ios/AppIcon60x60@2x.png
index 1d78367..1d78367 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon60x60@2x.png
+++ b/examples/canvas3d/threejs/planets/ios/AppIcon60x60@2x.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon72x72@2x~ipad.png b/examples/canvas3d/threejs/planets/ios/AppIcon72x72@2x~ipad.png
index c8077e2..c8077e2 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon72x72@2x~ipad.png
+++ b/examples/canvas3d/threejs/planets/ios/AppIcon72x72@2x~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon72x72~ipad.png b/examples/canvas3d/threejs/planets/ios/AppIcon72x72~ipad.png
index ded0f9f..ded0f9f 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon72x72~ipad.png
+++ b/examples/canvas3d/threejs/planets/ios/AppIcon72x72~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon76x76@2x~ipad.png b/examples/canvas3d/threejs/planets/ios/AppIcon76x76@2x~ipad.png
index 5028d87..5028d87 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon76x76@2x~ipad.png
+++ b/examples/canvas3d/threejs/planets/ios/AppIcon76x76@2x~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon76x76~ipad.png b/examples/canvas3d/threejs/planets/ios/AppIcon76x76~ipad.png
index 2cecbed..2cecbed 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/AppIcon76x76~ipad.png
+++ b/examples/canvas3d/threejs/planets/ios/AppIcon76x76~ipad.png
diff --git a/examples/canvas3d/canvas3d/threejs/planets/ios/Info.plist b/examples/canvas3d/threejs/planets/ios/Info.plist
index 89cbd6f..89cbd6f 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/ios/Info.plist
+++ b/examples/canvas3d/threejs/planets/ios/Info.plist
diff --git a/examples/canvas3d/canvas3d/threejs/planets/main.cpp b/examples/canvas3d/threejs/planets/main.cpp
index 53b3937..53b3937 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/main.cpp
+++ b/examples/canvas3d/threejs/planets/main.cpp
diff --git a/examples/canvas3d/canvas3d/threejs/planets/planets.js b/examples/canvas3d/threejs/planets/planets.js
index 63686bb..63686bb 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/planets.js
+++ b/examples/canvas3d/threejs/planets/planets.js
diff --git a/examples/canvas3d/canvas3d/threejs/planets/planets.pro b/examples/canvas3d/threejs/planets/planets.pro
index 559da48..3f5e3a0 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/planets.pro
+++ b/examples/canvas3d/threejs/planets/planets.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 
 QT += qml quick
 
-target.path = $$[QT_INSTALL_EXAMPLES]/canvas3d/$$TARGET
+target.path = $$[QT_INSTALL_EXAMPLES]/canvas3d/threejs/$$TARGET
 INSTALLS += target
 
 SOURCES += main.cpp
@@ -19,3 +19,6 @@ ios {
     QMAKE_BUNDLE_DATA += ios_icon
     QMAKE_INFO_PLIST = ios/Info.plist
 }
+
+EXAMPLE_FILES += \
+    ios
diff --git a/examples/canvas3d/canvas3d/threejs/planets/planets.qml b/examples/canvas3d/threejs/planets/planets.qml
index 05f668b..05f668b 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/planets.qml
+++ b/examples/canvas3d/threejs/planets/planets.qml
diff --git a/examples/canvas3d/canvas3d/threejs/planets/planets.qrc b/examples/canvas3d/threejs/planets/planets.qrc
index 63f5afd..63f5afd 100644
--- a/examples/canvas3d/canvas3d/threejs/planets/planets.qrc
+++ b/examples/canvas3d/threejs/planets/planets.qrc
diff --git a/examples/canvas3d/canvas3d/threejs/threejs.pro b/examples/canvas3d/threejs/threejs.pro
index 2c25e84..2c25e84 100644
--- a/examples/canvas3d/canvas3d/threejs/threejs.pro
+++ b/examples/canvas3d/threejs/threejs.pro
diff --git a/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf b/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf
index c0a7ae4..7a9cdf3 100644
--- a/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf
+++ b/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf
@@ -11,7 +11,7 @@ imagedirs  += images
 headerdirs += ..
 sourcedirs += ..
 
-examplesinstallpath = qtcanvas3d/canvas3d
+examplesinstallpath = canvas3d
 
 depends     = qtcore qtgui qtqml qtquick qtquickcontrols qtquicklayouts qtdoc qtmultimedia
 
diff --git a/tests/auto/qmltest/canvas3d/tst_quick_item_as_texture.js b/tests/auto/qmltest/canvas3d/tst_quick_item_as_texture.js
index 0de0b09..7cdebb1 100644
--- a/tests/auto/qmltest/canvas3d/tst_quick_item_as_texture.js
+++ b/tests/auto/qmltest/canvas3d/tst_quick_item_as_texture.js
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-Qt.include("../../../../examples/canvas3d/canvas3d/3rdparty/gl-matrix.js")
+Qt.include("../../../../examples/canvas3d/3rdparty/gl-matrix.js")
 
 var gl;
 
diff --git a/tests/auto/qmltest/canvas3d/tst_render_checkresult.js b/tests/auto/qmltest/canvas3d/tst_render_checkresult.js
index 9ba2063..f271af2 100644
--- a/tests/auto/qmltest/canvas3d/tst_render_checkresult.js
+++ b/tests/auto/qmltest/canvas3d/tst_render_checkresult.js
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-Qt.include("../../../../examples/canvas3d/canvas3d/3rdparty/gl-matrix.js")
+Qt.include("../../../../examples/canvas3d/3rdparty/gl-matrix.js")
 
 var gl;
 
diff --git a/tests/auto/qmltest/canvas3d/tst_render_ondemand.js b/tests/auto/qmltest/canvas3d/tst_render_ondemand.js
index fa02d39..ff69f35 100644
--- a/tests/auto/qmltest/canvas3d/tst_render_ondemand.js
+++ b/tests/auto/qmltest/canvas3d/tst_render_ondemand.js
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-Qt.include("../../../../examples/canvas3d/canvas3d/3rdparty/gl-matrix.js")
+Qt.include("../../../../examples/canvas3d/3rdparty/gl-matrix.js")
 
 var gl;
 
diff --git a/tests/auto/qmltest/canvas3d/tst_render_target.js b/tests/auto/qmltest/canvas3d/tst_render_target.js
index fb203f7..afbdc82 100644
--- a/tests/auto/qmltest/canvas3d/tst_render_target.js
+++ b/tests/auto/qmltest/canvas3d/tst_render_target.js
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-Qt.include("../../../../examples/canvas3d/canvas3d/3rdparty/gl-matrix.js")
+Qt.include("../../../../examples/canvas3d/3rdparty/gl-matrix.js")
 
 var gl;
 
diff --git a/tests/manual/commandthroughput/commandthroughput.qrc b/tests/manual/commandthroughput/commandthroughput.qrc
index 38a179f..0e13094 100644
--- a/tests/manual/commandthroughput/commandthroughput.qrc
+++ b/tests/manual/commandthroughput/commandthroughput.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/">
-        <file>../../../examples/canvas3d/canvas3d/3rdparty/gl-matrix.js</file>
+        <file>../../../examples/canvas3d/3rdparty/gl-matrix.js</file>
         <file>qml/commandthroughput/commandthroughput.js</file>
         <file>qml/commandthroughput/main.qml</file>
     </qresource>
diff --git a/tests/manual/multiwindowtest/multiwindowtest.qrc b/tests/manual/multiwindowtest/multiwindowtest.qrc
index cb387e1..710d30f 100644
--- a/tests/manual/multiwindowtest/multiwindowtest.qrc
+++ b/tests/manual/multiwindowtest/multiwindowtest.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/">
-        <file alias="gl-matrix.js">../../../examples/canvas3d/canvas3d/3rdparty/gl-matrix.js</file>
+        <file alias="gl-matrix.js">../../../examples/canvas3d/3rdparty/gl-matrix.js</file>
         <file alias="main.qml">qml/multiwindowtest/main.qml</file>
         <file alias="framebuffer.js">qml/multiwindowtest/framebuffer.js</file>
         <file alias="framebuffer.qml">qml/multiwindowtest/framebuffer.qml</file>