Fix resource aliasing in examples

Now examples compile with Qt Quick compiler.

Change-Id: I389c163fb25cdb0afc3f62fc39a670e206f78b63
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>

24 files changed, 39 insertions, 37 deletions

diff --git a/examples/canvas3d/canvas3d/framebuffer/framebuffer.qrc b/examples/canvas3d/canvas3d/framebuffer/framebuffer.qrc
index 5724824..646c76a 100644
--- a/examples/canvas3d/canvas3d/framebuffer/framebuffer.qrc
+++ b/examples/canvas3d/canvas3d/framebuffer/framebuffer.qrc
@@ -1,8 +1,8 @@
 <RCC>
     <qresource prefix="/">
-        <file>../3rdparty/gl-matrix.js</file>
-        <file>qml/framebuffer/main.qml</file>
-        <file>qml/framebuffer/qtlogo.png</file>
-        <file>qml/framebuffer/framebuffer.js</file>
+        <file alias="gl-matrix.js">../3rdparty/gl-matrix.js</file>
+        <file alias="main.qml">qml/framebuffer/main.qml</file>
+        <file alias="qtlogo.png">qml/framebuffer/qtlogo.png</file>
+        <file alias="framebuffer.js">qml/framebuffer/framebuffer.js</file>
     </qresource>
 </RCC>
diff --git a/examples/canvas3d/canvas3d/framebuffer/main.cpp b/examples/canvas3d/canvas3d/framebuffer/main.cpp
index f6aff12..dc9ef5c 100644
--- a/examples/canvas3d/canvas3d/framebuffer/main.cpp
+++ b/examples/canvas3d/canvas3d/framebuffer/main.cpp
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
     viewer.engine()->addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(),
                                                        QString::fromLatin1("qml")));
 
-    viewer.setSource(QUrl(QStringLiteral("qrc:///qml/framebuffer/main.qml")));
+    viewer.setSource(QUrl(QStringLiteral("qrc:/main.qml")));
 
     viewer.setTitle(QStringLiteral("Render into FrameBuffer"));
     viewer.setResizeMode(QQuickView::SizeRootObjectToView);
diff --git a/examples/canvas3d/canvas3d/framebuffer/qml/framebuffer/framebuffer.js b/examples/canvas3d/canvas3d/framebuffer/qml/framebuffer/framebuffer.js
index a8ad597..f268682 100644
--- a/examples/canvas3d/canvas3d/framebuffer/qml/framebuffer/framebuffer.js
+++ b/examples/canvas3d/canvas3d/framebuffer/qml/framebuffer/framebuffer.js
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-Qt.include("../../3rdparty/gl-matrix.js")
+Qt.include("gl-matrix.js")
 
 //
 // Draws a cube that has the Qt logo as decal texture on each face in to a texture.
@@ -109,7 +109,7 @@ function initializeGL(canvas, textureLoader) {
         qtLogoImage.imageLoadingFailed.connect(function() {
             console.log("Texture load FAILED, "+qtLogoImage.errorString);
         });
-        qtLogoImage.src = "qrc:/qml/framebuffer/qtlogo.png";
+        qtLogoImage.src = "qrc:/qtlogo.png";
 
         //! [1]
         // Create the framebuffer object
diff --git a/examples/canvas3d/canvas3d/interaction/interaction.qrc b/examples/canvas3d/canvas3d/interaction/interaction.qrc
index a486c87..5bfd073 100644
--- a/examples/canvas3d/canvas3d/interaction/interaction.qrc
+++ b/examples/canvas3d/canvas3d/interaction/interaction.qrc
@@ -1,10 +1,10 @@
 <RCC>
     <qresource prefix="/">
-        <file>../3rdparty/gl-matrix.js</file>
-        <file>../3rdparty/ThreeJSLoader.js</file>
+        <file alias="gl-matrix.js">../3rdparty/gl-matrix.js</file>
+        <file alias="ThreeJSLoader.js">../3rdparty/ThreeJSLoader.js</file>
         <file>qml/interaction/barrel.jpg</file>
         <file>qml/interaction/barrel.json</file>
-        <file>qml/interaction/interaction.js</file>
-        <file>qml/interaction/main.qml</file>
+        <file alias="main.qml">qml/interaction/main.qml</file>
+        <file alias="interaction.js">qml/interaction/interaction.js</file>
     </qresource>
 </RCC>
diff --git a/examples/canvas3d/canvas3d/interaction/main.cpp b/examples/canvas3d/canvas3d/interaction/main.cpp
index bb070e5..05e00a0 100644
--- a/examples/canvas3d/canvas3d/interaction/main.cpp
+++ b/examples/canvas3d/canvas3d/interaction/main.cpp
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
     viewer.engine()->addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(),
                                                        QString::fromLatin1("qml")));
 
-    viewer.setSource(QUrl("qrc:/qml/interaction/main.qml"));
+    viewer.setSource(QUrl("qrc:/main.qml"));
 
     viewer.setTitle(QStringLiteral("Interaction"));
     viewer.setResizeMode(QQuickView::SizeRootObjectToView);
diff --git a/examples/canvas3d/canvas3d/interaction/qml/interaction/interaction.js b/examples/canvas3d/canvas3d/interaction/qml/interaction/interaction.js
index edd35be..e8ca513 100644
--- a/examples/canvas3d/canvas3d/interaction/qml/interaction/interaction.js
+++ b/examples/canvas3d/canvas3d/interaction/qml/interaction/interaction.js
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-Qt.include("../../3rdparty/gl-matrix.js")
-Qt.include("../../3rdparty/ThreeJSLoader.js")
+Qt.include("gl-matrix.js")
+Qt.include("ThreeJSLoader.js")
 
 var gl;
 
@@ -150,16 +150,18 @@ function initializeGL(canvas) {
         barrelImage.imageLoadingFailed.connect(function() {
             console.log("Texture load FAILED, "+barrelImage.errorString);
         });
+        // Aliasing doesn't work correctly with QtQuick compiler for some reason,
+        // so use full names for barrel.jpg and barrel.json
         barrelImage.src = "qrc:/qml/interaction/barrel.jpg";
 
         // Load the model
         log("    Create XMLHttpRequest")
         var request = new XMLHttpRequest();
         log("    XMLHttpRequest.open")
-        request.open("GET", "barrel.json");
+        request.open("GET", "qrc:/qml/interaction/barrel.json");
         log("    XMLHttpRequest.onreadystatechange")
         request.onreadystatechange = function () {
-            if (request.readyState == XMLHttpRequest.DONE) {
+            if (request.readyState === XMLHttpRequest.DONE) {
                 handleLoadedModel(JSON.parse(request.responseText));
             }
         }
diff --git a/examples/canvas3d/canvas3d/jsonmodels/main.cpp b/examples/canvas3d/canvas3d/jsonmodels/main.cpp
index 06ab9cc..ee3caa9 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/main.cpp
+++ b/examples/canvas3d/canvas3d/jsonmodels/main.cpp
@@ -45,9 +45,9 @@ int main(int argc, char *argv[])
 
     QQmlApplicationEngine engine;
 #ifdef NO_ENTERPRISE
-    engine.load(QUrl(QStringLiteral("qrc:///jsonmodelsbasic.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:/jsonmodelsbasic.qml")));
 #else
-    engine.load(QUrl(QStringLiteral("qrc:///jsonmodels.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:/jsonmodels.qml")));
 #endif
 
     return app.exec();
diff --git a/examples/canvas3d/canvas3d/jsonmodels/qml.qrc b/examples/canvas3d/canvas3d/jsonmodels/qml.qrc
index c0dc630..ec83f78 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/qml.qrc
+++ b/examples/canvas3d/canvas3d/jsonmodels/qml.qrc
@@ -2,18 +2,18 @@
     <qresource prefix="/">
         <file alias="gl-matrix.js">../3rdparty/gl-matrix.js</file>
         <file alias="ThreeJSLoader.js">../3rdparty/ThreeJSLoader.js</file>
-        <file>gold.json</file>
-        <file>woodbox.json</file>
-        <file>bush.json</file>
-        <file>pallet.json</file>
-        <file>rock.json</file>
-        <file>pallet.jpg</file>
-        <file>rock.jpg</file>
-        <file>gold.jpg</file>
-        <file>woodbox.jpg</file>
-        <file>bush.png</file>
-        <file>jsonmodels.js</file>
-        <file>jsonmodels.qml</file>
-        <file>jsonmodelsbasic.qml</file>
+        <file alias="bush.json">qml/jsonmodels/bush.json</file>
+        <file alias="bush.png">qml/jsonmodels/bush.png</file>
+        <file alias="gold.jpg">qml/jsonmodels/gold.jpg</file>
+        <file alias="gold.json">qml/jsonmodels/gold.json</file>
+        <file alias="jsonmodels.js">qml/jsonmodels/jsonmodels.js</file>
+        <file alias="jsonmodels.qml">qml/jsonmodels/jsonmodels.qml</file>
+        <file alias="jsonmodelsbasic.qml">qml/jsonmodels/jsonmodelsbasic.qml</file>
+        <file alias="pallet.jpg">qml/jsonmodels/pallet.jpg</file>
+        <file alias="pallet.json">qml/jsonmodels/pallet.json</file>
+        <file alias="rock.jpg">qml/jsonmodels/rock.jpg</file>
+        <file alias="rock.json">qml/jsonmodels/rock.json</file>
+        <file alias="woodbox.jpg">qml/jsonmodels/woodbox.jpg</file>
+        <file alias="woodbox.json">qml/jsonmodels/woodbox.json</file>
     </qresource>
 </RCC>
diff --git a/examples/canvas3d/canvas3d/jsonmodels/bush.json b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/bush.json
index f05ed58..f05ed58 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/bush.json
+++ b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/bush.json
diff --git a/examples/canvas3d/canvas3d/jsonmodels/bush.png b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/bush.png
index 9980cf0..9980cf0 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/bush.png
+++ b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/bush.png
diff --git a/examples/canvas3d/canvas3d/jsonmodels/gold.jpg b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/gold.jpg
index ca316d5..ca316d5 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/gold.jpg
+++ b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/gold.jpg
diff --git a/examples/canvas3d/canvas3d/jsonmodels/gold.json b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/gold.json
index 0e586be..0e586be 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/gold.json
+++ b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/gold.json
diff --git a/examples/canvas3d/canvas3d/jsonmodels/jsonmodels.js b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js
index e48abd5..e48abd5 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/jsonmodels.js
+++ b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js
diff --git a/examples/canvas3d/canvas3d/jsonmodels/jsonmodels.qml b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml
index 2cdeeb9..2cdeeb9 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/jsonmodels.qml
+++ b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml
diff --git a/examples/canvas3d/canvas3d/jsonmodels/jsonmodelsbasic.qml b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/jsonmodelsbasic.qml
index bbc93fa..bbc93fa 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/jsonmodelsbasic.qml
+++ b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/jsonmodelsbasic.qml
diff --git a/examples/canvas3d/canvas3d/jsonmodels/pallet.jpg b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/pallet.jpg
index ea0c01a..ea0c01a 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/pallet.jpg
+++ b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/pallet.jpg
diff --git a/examples/canvas3d/canvas3d/jsonmodels/pallet.json b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/pallet.json
index 8bd7fef..8bd7fef 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/pallet.json
+++ b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/pallet.json
diff --git a/examples/canvas3d/canvas3d/jsonmodels/rock.jpg b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/rock.jpg
index 023035d..023035d 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/rock.jpg
+++ b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/rock.jpg
diff --git a/examples/canvas3d/canvas3d/jsonmodels/rock.json b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/rock.json
index 72127b6..72127b6 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/rock.json
+++ b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/rock.json
diff --git a/examples/canvas3d/canvas3d/jsonmodels/woodbox.jpg b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/woodbox.jpg
index fd9c10d..fd9c10d 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/woodbox.jpg
+++ b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/woodbox.jpg
diff --git a/examples/canvas3d/canvas3d/jsonmodels/woodbox.json b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/woodbox.json
index 141ad57..141ad57 100644
--- a/examples/canvas3d/canvas3d/jsonmodels/woodbox.json
+++ b/examples/canvas3d/canvas3d/jsonmodels/qml/jsonmodels/woodbox.json
diff --git a/examples/canvas3d/canvas3d/textureandlight/main.cpp b/examples/canvas3d/canvas3d/textureandlight/main.cpp
index 53262ac..d2472a2 100644
--- a/examples/canvas3d/canvas3d/textureandlight/main.cpp
+++ b/examples/canvas3d/canvas3d/textureandlight/main.cpp
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
     viewer.engine()->addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(),
                                                        QString::fromLatin1("qml")));
 
-    viewer.setSource(QUrl("qrc:/qml/textureandlight/main.qml"));
+    viewer.setSource(QUrl("qrc:/main.qml"));
 
     viewer.setTitle(QStringLiteral("Textured and Lit Cube"));
     viewer.setResizeMode(QQuickView::SizeRootObjectToView);
diff --git a/examples/canvas3d/canvas3d/textureandlight/qml/textureandlight/textureandlight.js b/examples/canvas3d/canvas3d/textureandlight/qml/textureandlight/textureandlight.js
index 9372896..d80cb8f 100644
--- a/examples/canvas3d/canvas3d/textureandlight/qml/textureandlight/textureandlight.js
+++ b/examples/canvas3d/canvas3d/textureandlight/qml/textureandlight/textureandlight.js
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 //! [0]
-Qt.include("/gl-matrix.js")
+Qt.include("gl-matrix.js")
 //! [0]
 
 //
@@ -112,7 +112,7 @@ function initializeGL(canvas) {
     qtLogoImage.imageLoadingFailed.connect(function() {
         console.log("Texture load FAILED, "+qtLogoImage.errorString);
     });
-    qtLogoImage.src = "qrc:/qml/textureandlight/qtlogo.png";
+    qtLogoImage.src = "qrc:/qtlogo.png";
 }
 
 function resizeGL(canvas)
diff --git a/examples/canvas3d/canvas3d/textureandlight/textureandlight.qrc b/examples/canvas3d/canvas3d/textureandlight/textureandlight.qrc
index 7782188..bd485d1 100644
--- a/examples/canvas3d/canvas3d/textureandlight/textureandlight.qrc
+++ b/examples/canvas3d/canvas3d/textureandlight/textureandlight.qrc
@@ -1,8 +1,8 @@
 <RCC>
     <qresource prefix="/">
-        <file>qml/textureandlight/main.qml</file>
-        <file>qml/textureandlight/textureandlight.js</file>
-        <file>qml/textureandlight/qtlogo.png</file>
+        <file alias="main.qml">qml/textureandlight/main.qml</file>
+        <file alias="textureandlight.js">qml/textureandlight/textureandlight.js</file>
+        <file alias="qtlogo.png">qml/textureandlight/qtlogo.png</file>
         <file alias="gl-matrix.js">../3rdparty/gl-matrix.js</file>
     </qresource>
 </RCC>