Mangle robo_bounce to build into bin.

Collapse directories down into subset supported by pkg.pri
Moved images into meshes in anticipation of directory rename
to resources
Update pro file, qrc, imports etc to refer to new file structure.

Change-Id: I79aec59eb186d92ec68fc7cf7be03ab8aa6e6c75
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

33 files changed, 96 insertions, 54 deletions

diff --git a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Button.qml b/demos/quick3d/robo_bounce/qml/Button.qml
index 08ff477c2..13f7ee23d 100644
--- a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Button.qml
+++ b/demos/quick3d/robo_bounce/qml/Button.qml
@@ -49,7 +49,7 @@ BorderImage {
 
     signal clicked
 
-    source: "images/button-" + color + ".png"; clip: true
+    source: "meshes/button-" + color + ".png"; clip: true
     border { left: 10; top: 10; right: 10; bottom: 10 }
 
     Rectangle {
diff --git a/demos/quick3d/robo_bounce/qml/Calculator/Calculator.qml b/demos/quick3d/robo_bounce/qml/Calculator.qml
index f72474fe1..187fc69cc 100644
--- a/demos/quick3d/robo_bounce/qml/Calculator/Calculator.qml
+++ b/demos/quick3d/robo_bounce/qml/Calculator.qml
@@ -40,8 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "CalculatorCore"
-import "CalculatorCore/calculator.js" as CalcEngine
+import "calculator.js" as CalcEngine
 
 Rectangle {
     id: window
diff --git a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/qmldir b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/qmldir
deleted file mode 100644
index a926b93fa..000000000
--- a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-Button Button.qml
-Display Display.qml
diff --git a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Display.qml b/demos/quick3d/robo_bounce/qml/Display.qml
index 466f55eef..9ad9b713d 100644
--- a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Display.qml
+++ b/demos/quick3d/robo_bounce/qml/Display.qml
@@ -47,7 +47,7 @@ BorderImage {
     property alias text : displayText.text
     property alias currentOperation : operationText
 
-    source: "images/display.png"
+    source: "meshes/display.png"
     border { left: 10; top: 10; right: 10; bottom: 10 }
 
     Text {
diff --git a/demos/quick3d/robo_bounce/qml/RobotCore/PushButton.qml b/demos/quick3d/robo_bounce/qml/PushButton.qml
index 19f96a974..5f70888eb 100644
--- a/demos/quick3d/robo_bounce/qml/RobotCore/PushButton.qml
+++ b/demos/quick3d/robo_bounce/qml/PushButton.qml
@@ -45,7 +45,7 @@ import Qt3D 1.0
 Image {
     id: theButton
     property bool bounce: false
-    source: "../Assets/button.png"
+    source: "meshes/button.png"
     width: 40
     height: 40
 
diff --git a/demos/quick3d/robo_bounce/qml/RobotCore/QMLPanels.qml b/demos/quick3d/robo_bounce/qml/QMLPanels.qml
index f71c6cca9..f71c6cca9 100644
--- a/demos/quick3d/robo_bounce/qml/RobotCore/QMLPanels.qml
+++ b/demos/quick3d/robo_bounce/qml/QMLPanels.qml
diff --git a/demos/quick3d/robo_bounce/qml/RoboBounce.qml b/demos/quick3d/robo_bounce/qml/RoboBounce.qml
index cad805f58..336259626 100644
--- a/demos/quick3d/robo_bounce/qml/RoboBounce.qml
+++ b/demos/quick3d/robo_bounce/qml/RoboBounce.qml
@@ -42,8 +42,6 @@
 import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
-import "Calculator"
-import "RobotCore"
 
 Image {
     objectName: "tronscape image"
@@ -53,7 +51,7 @@ Image {
     id: theBackground
     width: parent.width
     height: parent.height
-    source: "Assets/tronscape.png"
+    source: "meshes/tronscape.png"
 
     focus: true
     Keys.onSpacePressed: {
@@ -219,7 +217,7 @@ Image {
                     radius: 5
                 }
                 PushButton {
-                    source: "Assets/rotateButton2.png"
+                    source: "meshes/rotateButton2.png"
                     x: buttonBox1.x+10
                     y: buttonBox1.y+10
                     onPressed: {
@@ -229,7 +227,7 @@ Image {
                     }
                 }
                 PushButton {
-                    source: "Assets/cubeButton.png"
+                    source: "meshes/cubeButton.png"
                     x: buttonBox1.x+60
                     y: buttonBox1.y+10
                     onPressed: {
@@ -239,7 +237,7 @@ Image {
                     }
                 }
                 PushButton {
-                    source: "Assets/infobutton.png"
+                    source: "meshes/infobutton.png"
                     x: buttonBox1.x+110
                     y: buttonBox1.y+10
                     onPressed: {
@@ -263,7 +261,7 @@ Image {
                 border.width: 2
                 radius: 5
                 Image {
-                    source: "Assets/roboInfo.png"
+                    source: "meshes/roboInfo.png"
                 }
 
                 SequentialAnimation {
@@ -281,7 +279,7 @@ Image {
 
             Image {
                 id: qt3dButton
-                source: "Assets/sQt3D_logo.png"
+                source: "meshes/sQt3D_logo.png"
                 property bool bounce: false
 
                 x: 10
@@ -551,14 +549,14 @@ Image {
                         Effect {
                             id: signEffect
                             color: "#aaca00"
-                            texture: "Assets/QML3DSign.png"
+                            texture: "meshes/QML3DSign.png"
                             decal: true
                         }
 
                         Effect {
                             id: calcEffect
                             color: "#aaca00"
-                            texture: "Assets/calculatorSign.png"
+                            texture: "meshes/calculatorSign.png"
                             decal: true
                         }
                     }
@@ -582,7 +580,7 @@ Image {
 
                         Item3D {
                             id: robotArms
-                            mesh: Mesh { source: "Assets/roboticArms.3ds"}
+                            mesh: Mesh { source: "meshes/roboticArms.3ds"}
                             transform: Rotation3D{id: armBend; angle: -90;axis: Qt.vector3d(0,1,0)}
                             position: Qt.vector3d(.18, 0,-5.4)
 
@@ -597,7 +595,7 @@ Image {
 
                         Item3D {
                             id: robotHead
-                            mesh: Mesh { source: "Assets/roboticHead.3ds" }
+                            mesh: Mesh { source: "meshes/roboticHead.3ds" }
                             position: Qt.vector3d(0,0,-9.1)
                             transform: [
                                 Rotation3D {id: headyaw; angle: 0; axis: Qt.vector3d(0,0,1)},
diff --git a/demos/quick3d/robo_bounce/qml/RobotCore/Robot.qml b/demos/quick3d/robo_bounce/qml/Robot.qml
index 181a81b0f..72587e3d6 100644
--- a/demos/quick3d/robo_bounce/qml/RobotCore/Robot.qml
+++ b/demos/quick3d/robo_bounce/qml/Robot.qml
@@ -45,7 +45,7 @@ import Qt3D 1.0
 Item3D {
     id: robot1
     scale: 0.3
-    mesh: Mesh { id: roboMesh; source: "../Assets/roboticBody.3ds"; }
+    mesh: Mesh { id: roboMesh; source: "meshes/roboticBody.3ds"; }
     effect: Effect {}
 }
 
diff --git a/demos/quick3d/robo_bounce/qml/RobotCore/TronCube.qml b/demos/quick3d/robo_bounce/qml/TronCube.qml
index 6b21f2edc..13405d498 100644
--- a/demos/quick3d/robo_bounce/qml/RobotCore/TronCube.qml
+++ b/demos/quick3d/robo_bounce/qml/TronCube.qml
@@ -44,7 +44,7 @@ import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
 Cube {
-    effect: Effect {color: "#aaaaaa"; texture: "../Assets/qtlogo.png"; decal: true}
+    effect: Effect {color: "#aaaaaa"; texture: "meshes/qtlogo.png"; decal: true}
     position: Qt.vector3d(0,-5.01, 0)
 }
 
diff --git a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/calculator.js b/demos/quick3d/robo_bounce/qml/calculator.js
index 7c363c7f3..7c363c7f3 100644
--- a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/calculator.js
+++ b/demos/quick3d/robo_bounce/qml/calculator.js
diff --git a/demos/quick3d/robo_bounce/qml/Assets/QML3DSign.png b/demos/quick3d/robo_bounce/qml/meshes/QML3DSign.png
index b4bfb88b2..b4bfb88b2 100644
--- a/demos/quick3d/robo_bounce/qml/Assets/QML3DSign.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/QML3DSign.png
diff --git a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-.png b/demos/quick3d/robo_bounce/qml/meshes/button-.png
index 544e51453..544e51453 100644
--- a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/button-.png
diff --git a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-blue.png b/demos/quick3d/robo_bounce/qml/meshes/button-blue.png
index 5f92de32d..5f92de32d 100644
--- a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-blue.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/button-blue.png
diff --git a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-green.png b/demos/quick3d/robo_bounce/qml/meshes/button-green.png
index 36c93914c..36c93914c 100644
--- a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-green.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/button-green.png
diff --git a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-purple.png b/demos/quick3d/robo_bounce/qml/meshes/button-purple.png
index 347cbbea9..347cbbea9 100644
--- a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-purple.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/button-purple.png
diff --git a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-red.png b/demos/quick3d/robo_bounce/qml/meshes/button-red.png
index 3b335891a..3b335891a 100644
--- a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-red.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/button-red.png
diff --git a/demos/quick3d/robo_bounce/qml/Assets/button.png b/demos/quick3d/robo_bounce/qml/meshes/button.png
index 2943e2403..2943e2403 100644
--- a/demos/quick3d/robo_bounce/qml/Assets/button.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/button.png
diff --git a/demos/quick3d/robo_bounce/qml/Assets/calculatorSign.png b/demos/quick3d/robo_bounce/qml/meshes/calculatorSign.png
index 3a8fca728..3a8fca728 100644
--- a/demos/quick3d/robo_bounce/qml/Assets/calculatorSign.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/calculatorSign.png
diff --git a/demos/quick3d/robo_bounce/qml/Assets/cubeButton.png b/demos/quick3d/robo_bounce/qml/meshes/cubeButton.png
index 2ea32a8b2..2ea32a8b2 100644
--- a/demos/quick3d/robo_bounce/qml/Assets/cubeButton.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/cubeButton.png
diff --git a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/display.png b/demos/quick3d/robo_bounce/qml/meshes/display.png
index 9507f4382..9507f4382 100644
--- a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/display.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/display.png
diff --git a/demos/quick3d/robo_bounce/qml/Assets/hazard.png b/demos/quick3d/robo_bounce/qml/meshes/hazard.png
index a7c0b7fea..a7c0b7fea 100644
--- a/demos/quick3d/robo_bounce/qml/Assets/hazard.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/hazard.png
diff --git a/demos/quick3d/robo_bounce/qml/Assets/infobutton.png b/demos/quick3d/robo_bounce/qml/meshes/infobutton.png
index e7379f2d2..e7379f2d2 100644
--- a/demos/quick3d/robo_bounce/qml/Assets/infobutton.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/infobutton.png
diff --git a/demos/quick3d/robo_bounce/qml/Assets/qtlogo.png b/demos/quick3d/robo_bounce/qml/meshes/qtlogo.png
index 3bf1a77d0..3bf1a77d0 100644
--- a/demos/quick3d/robo_bounce/qml/Assets/qtlogo.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/qtlogo.png
diff --git a/demos/quick3d/robo_bounce/qml/Assets/roboInfo.png b/demos/quick3d/robo_bounce/qml/meshes/roboInfo.png
index b7bdda199..b7bdda199 100644
--- a/demos/quick3d/robo_bounce/qml/Assets/roboInfo.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/roboInfo.png
diff --git a/demos/quick3d/robo_bounce/qml/Assets/roboticArms.3ds b/demos/quick3d/robo_bounce/qml/meshes/roboticArms.3ds
index 478d27bfc..478d27bfc 100644
--- a/demos/quick3d/robo_bounce/qml/Assets/roboticArms.3ds
+++ b/demos/quick3d/robo_bounce/qml/meshes/roboticArms.3ds
diff --git a/demos/quick3d/robo_bounce/qml/Assets/roboticBody.3ds b/demos/quick3d/robo_bounce/qml/meshes/roboticBody.3ds
index ed872c82a..ed872c82a 100644
--- a/demos/quick3d/robo_bounce/qml/Assets/roboticBody.3ds
+++ b/demos/quick3d/robo_bounce/qml/meshes/roboticBody.3ds
diff --git a/demos/quick3d/robo_bounce/qml/Assets/roboticHead.3ds b/demos/quick3d/robo_bounce/qml/meshes/roboticHead.3ds
index 7a517c2b3..7a517c2b3 100644
--- a/demos/quick3d/robo_bounce/qml/Assets/roboticHead.3ds
+++ b/demos/quick3d/robo_bounce/qml/meshes/roboticHead.3ds
diff --git a/demos/quick3d/robo_bounce/qml/Assets/rotateButton2.png b/demos/quick3d/robo_bounce/qml/meshes/rotateButton2.png
index 80a2d82a3..80a2d82a3 100644
--- a/demos/quick3d/robo_bounce/qml/Assets/rotateButton2.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/rotateButton2.png
diff --git a/demos/quick3d/robo_bounce/qml/Assets/sQt3D_logo.png b/demos/quick3d/robo_bounce/qml/meshes/sQt3D_logo.png
index 92a071d36..92a071d36 100644
--- a/demos/quick3d/robo_bounce/qml/Assets/sQt3D_logo.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/sQt3D_logo.png
diff --git a/demos/quick3d/robo_bounce/qml/Assets/tronscape.png b/demos/quick3d/robo_bounce/qml/meshes/tronscape.png
index 325f60e38..325f60e38 100644
--- a/demos/quick3d/robo_bounce/qml/Assets/tronscape.png
+++ b/demos/quick3d/robo_bounce/qml/meshes/tronscape.png
diff --git a/demos/quick3d/robo_bounce/qml/qmldir b/demos/quick3d/robo_bounce/qml/qmldir
new file mode 100644
index 000000000..49437d816
--- /dev/null
+++ b/demos/quick3d/robo_bounce/qml/qmldir
@@ -0,0 +1,3 @@
+RoboBounce RoboBounce.qml
+Calculator Calculator.qml
+CalculatorCore CalculatorCore.qml
diff --git a/demos/quick3d/robo_bounce/robo_bounce.pro b/demos/quick3d/robo_bounce/robo_bounce.pro
index 34e219ef6..bcc1d487a 100644
--- a/demos/quick3d/robo_bounce/robo_bounce.pro
+++ b/demos/quick3d/robo_bounce/robo_bounce.pro
@@ -3,15 +3,59 @@ TARGET = robo_bounce
 QT += declarative quick
 
 SOURCES += main.cpp
+ICON_FILE = ../icon.png
+
+QML_FILES = \
+    qml/Button.qml \
+    qml/Calculator.qml \
+    qml/desktop.qml \
+    qml/Display.qml \
+    qml/PushButton.qml \
+    qml/QMLPanels.qml \
+    qml/RoboBounce.qml \
+    qml/Robot.qml \
+    qml/TronCube.qml \
+
+QML_INFRA_FILES = \
+    $$QML_FILES \
+    qml/calculator.js \
+    qml/qmldir
+
+QML_MESHES_FILES = \
+    qml/meshes/roboticHead.3ds \
+    qml/meshes/button-red.png \
+    qml/meshes/hazard.png \
+    qml/meshes/infobutton.png \
+    qml/meshes/roboticBody.3ds \
+    qml/meshes/cubeButton.png \
+    qml/meshes/roboticArms.3ds \
+    qml/meshes/button-.png \
+    qml/meshes/button-green.png \
+    qml/meshes/roboInfo.png \
+    qml/meshes/tronscape.png \
+    qml/meshes/rotateButton2.png \
+    qml/meshes/sQt3D_logo.png \
+    qml/meshes/QML3DSign.png \
+    qml/meshes/button-purple.png \
+    qml/meshes/button.png \
+    qml/meshes/display.png \
+    qml/meshes/calculatorSign.png \
+    qml/meshes/qtlogo.png \
+    qml/meshes/button-blue.png
+
+CATEGORY = demos
+include(../../../pkg.pri)
 
 INSTALL_DIRS = qml
 mt: INSTALL_FILES = mt.qml
 
-OTHER_FILES += \
-    robo_bounce.rc
-
 RC_FILE = robo_bounce.rc
 
+OTHER_FILES += \
+    robo_bounce.rc \
+    $$QML_INFRA_FILES \
+    $$RC_FILE
+
 RESOURCES += \
     robo_bounce.qrc
 
diff --git a/demos/quick3d/robo_bounce/robo_bounce.qrc b/demos/quick3d/robo_bounce/robo_bounce.qrc
index 9abffa658..4c0b9a2c9 100644
--- a/demos/quick3d/robo_bounce/robo_bounce.qrc
+++ b/demos/quick3d/robo_bounce/robo_bounce.qrc
@@ -1,35 +1,35 @@
 <RCC>
     <qresource prefix="/">
-        <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>
-        <file>qml/RoboBounce.qml</file>
+        <file>qml/Button.qml</file>
+        <file>qml/calculator.js</file>
+        <file>qml/Calculator.qml</file>
         <file>qml/desktop.qml</file>
+        <file>qml/Display.qml</file>
+        <file>qml/PushButton.qml</file>
+        <file>qml/qmldir</file>
+        <file>qml/QMLPanels.qml</file>
+        <file>qml/RoboBounce.qml</file>
+        <file>qml/Robot.qml</file>
+        <file>qml/TronCube.qml</file>
+        <file>qml/meshes/button-.png</file>
+        <file>qml/meshes/button-blue.png</file>
+        <file>qml/meshes/button-green.png</file>
+        <file>qml/meshes/button-purple.png</file>
+        <file>qml/meshes/button-red.png</file>
+        <file>qml/meshes/button.png</file>
+        <file>qml/meshes/calculatorSign.png</file>
+        <file>qml/meshes/cubeButton.png</file>
+        <file>qml/meshes/display.png</file>
+        <file>qml/meshes/hazard.png</file>
+        <file>qml/meshes/infobutton.png</file>
+        <file>qml/meshes/QML3DSign.png</file>
+        <file>qml/meshes/qtlogo.png</file>
+        <file>qml/meshes/roboInfo.png</file>
+        <file>qml/meshes/roboticArms.3ds</file>
+        <file>qml/meshes/roboticBody.3ds</file>
+        <file>qml/meshes/roboticHead.3ds</file>
+        <file>qml/meshes/rotateButton2.png</file>
+        <file>qml/meshes/sQt3D_logo.png</file>
+        <file>qml/meshes/tronscape.png</file>
     </qresource>
 </RCC>