Some models not loading from QRC files while others worked.

Also modified robo_bounce to be qrc-ed.

Change-Id: I3bb6c19b487aba35f3ff55fb948ed2fb0b901be5

3 files changed, 39 insertions, 28 deletions

diff --git a/demos/quick3d/robo_bounce/main.cpp b/demos/quick3d/robo_bounce/main.cpp
index a71e8e9d6..530382542 100644
--- a/demos/quick3d/robo_bounce/main.cpp
+++ b/demos/quick3d/robo_bounce/main.cpp
@@ -42,15 +42,12 @@
 #include <QtGui/QApplication>
 #include <QtDeclarative/qdeclarativeview.h>
 
-#include "../qmlres.h"
-
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
     QDeclarativeView view;
-    QString qml = q_get_qmldir(QLatin1String("qml/robobounce.qml"));
-    view.setSource(QUrl::fromLocalFile(qml));
+    view.setSource(QUrl(QLatin1String("qrc:///qml/robobounce.qml")));
 
     if (QApplication::arguments().contains(QLatin1String("-maximize")))
         view.showMaximized();
diff --git a/demos/quick3d/robo_bounce/robo_bounce.pro b/demos/quick3d/robo_bounce/robo_bounce.pro
index 07ed447f9..61a3c23db 100644
--- a/demos/quick3d/robo_bounce/robo_bounce.pro
+++ b/demos/quick3d/robo_bounce/robo_bounce.pro
@@ -14,30 +14,6 @@ win32 {
     QMAKE_DEL_DIR = rmdir /s /q
 }
 
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/demos/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/demos/$$TARGET
-INSTALLS += distInstalls
-
 package {
     maemo {
         applnk.files = robo_bounce.desktop
@@ -56,3 +32,7 @@ OTHER_FILES += \
     robo_bounce.rc
 
 RC_FILE = robo_bounce.rc
+
+RESOURCES += \
+    robo_bounce.qrc
+
diff --git a/demos/quick3d/robo_bounce/robo_bounce.qrc b/demos/quick3d/robo_bounce/robo_bounce.qrc
new file mode 100644
index 000000000..69a837850
--- /dev/null
+++ b/demos/quick3d/robo_bounce/robo_bounce.qrc
@@ -0,0 +1,34 @@
+<RCC>
+    <qresource prefix="/">
+        <file>qml/robobounce.qml</file>
+        <file>qml/Assets/button.png</file>
+        <file>qml/Assets/calculatorSign.png</file>
+        <file>qml/Assets/cubeButton.png</file>
+        <file>qml/Assets/hazard.png</file>
+        <file>qml/Assets/infobutton.png</file>
+        <file>qml/Assets/QML3DSign.png</file>
+        <file>qml/Assets/qtlogo.png</file>
+        <file>qml/Assets/roboInfo.png</file>
+        <file>qml/Assets/roboticArms.3ds</file>
+        <file>qml/Assets/roboticBody.3ds</file>
+        <file>qml/Assets/roboticHead.3ds</file>
+        <file>qml/Assets/rotateButton2.png</file>
+        <file>qml/Assets/sQt3D_logo.png</file>
+        <file>qml/Assets/tronscape.png</file>
+        <file>qml/Calculator/Calculator.qml</file>
+        <file>qml/Calculator/CalculatorCore/Button.qml</file>
+        <file>qml/Calculator/CalculatorCore/calculator.js</file>
+        <file>qml/Calculator/CalculatorCore/Display.qml</file>
+        <file>qml/Calculator/CalculatorCore/qmldir</file>
+        <file>qml/Calculator/CalculatorCore/images/button-.png</file>
+        <file>qml/Calculator/CalculatorCore/images/button-blue.png</file>
+        <file>qml/Calculator/CalculatorCore/images/button-green.png</file>
+        <file>qml/Calculator/CalculatorCore/images/button-purple.png</file>
+        <file>qml/Calculator/CalculatorCore/images/button-red.png</file>
+        <file>qml/Calculator/CalculatorCore/images/display.png</file>
+        <file>qml/RobotCore/PushButton.qml</file>
+        <file>qml/RobotCore/QMLPanels.qml</file>
+        <file>qml/RobotCore/Robot.qml</file>
+        <file>qml/RobotCore/TronCube.qml</file>
+    </qresource>
+</RCC>