Modify flickr to install into qt3d/bin directory

Reviewed-by: Danny Pope <daniel.pope@nokia.com>

Change-Id: I567cf7c66956203bbc7fe5f6dc69dfb27d689205
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

9 files changed, 21 insertions, 2 deletions

diff --git a/demos/quick3d/flickr3d/flickr3d.pro b/demos/quick3d/flickr3d/flickr3d.pro
index e37c7456d..5c929167f 100644
--- a/demos/quick3d/flickr3d/flickr3d.pro
+++ b/demos/quick3d/flickr3d/flickr3d.pro
@@ -4,12 +4,31 @@ QT += declarative quick
 CONFIG += qt warn_on
 
 SOURCES += main.cpp
+ICON_FILE = ../icon.png
+
+QML_FILES = \
+    qml/Flickr3d.qml \
+    qml/desktop.qml
+
+QML_INFRA_FILES = \
+    $$QML_FILES \
+    qml/qtlogo.png \
+    qml/default_sky_down.png \
+    qml/default_sky_north.png \
+    qml/default_sky_up.png \
+    qml/default_sky_east.png \
+    qml/default_sky_south.png \
+    qml/default_sky_west.png
+
+CATEGORY = demos
+include(../../../pkg.pri)
 
 INSTALL_DIRS = qml
 mt: INSTALL_FILES = mt.qml
 
 OTHER_FILES += \
-    flickr3d.rc
+    flickr3d.rc \
+    $$QML_INFRA_FILES
 
 RC_FILE = flickr3d.rc
 
diff --git a/demos/quick3d/flickr3d/qml/Flickr3d.qml b/demos/quick3d/flickr3d/qml/Flickr3d.qml
index 3eb0c3dc9..cfd4bdfef 100644
--- a/demos/quick3d/flickr3d/qml/Flickr3d.qml
+++ b/demos/quick3d/flickr3d/qml/Flickr3d.qml
@@ -62,7 +62,7 @@ Viewport {
     }
 
     Skybox {
-        source: "skybox"
+        source: "./"
     }
 
     Cube {
diff --git a/demos/quick3d/flickr3d/qml/skybox/default_sky_down.png b/demos/quick3d/flickr3d/qml/default_sky_down.png
index 685c28c4f..685c28c4f 100644
--- a/demos/quick3d/flickr3d/qml/skybox/default_sky_down.png
+++ b/demos/quick3d/flickr3d/qml/default_sky_down.png
diff --git a/demos/quick3d/flickr3d/qml/skybox/default_sky_east.png b/demos/quick3d/flickr3d/qml/default_sky_east.png
index f6463abf8..f6463abf8 100644
--- a/demos/quick3d/flickr3d/qml/skybox/default_sky_east.png
+++ b/demos/quick3d/flickr3d/qml/default_sky_east.png
diff --git a/demos/quick3d/flickr3d/qml/skybox/default_sky_north.png b/demos/quick3d/flickr3d/qml/default_sky_north.png
index 153b833cb..153b833cb 100644
--- a/demos/quick3d/flickr3d/qml/skybox/default_sky_north.png
+++ b/demos/quick3d/flickr3d/qml/default_sky_north.png
diff --git a/demos/quick3d/flickr3d/qml/skybox/default_sky_south.png b/demos/quick3d/flickr3d/qml/default_sky_south.png
index b3b013211..b3b013211 100644
--- a/demos/quick3d/flickr3d/qml/skybox/default_sky_south.png
+++ b/demos/quick3d/flickr3d/qml/default_sky_south.png
diff --git a/demos/quick3d/flickr3d/qml/skybox/default_sky_up.png b/demos/quick3d/flickr3d/qml/default_sky_up.png
index 3d4d6233c..3d4d6233c 100644
--- a/demos/quick3d/flickr3d/qml/skybox/default_sky_up.png
+++ b/demos/quick3d/flickr3d/qml/default_sky_up.png
diff --git a/demos/quick3d/flickr3d/qml/skybox/default_sky_west.png b/demos/quick3d/flickr3d/qml/default_sky_west.png
index 14325371b..14325371b 100644
--- a/demos/quick3d/flickr3d/qml/skybox/default_sky_west.png
+++ b/demos/quick3d/flickr3d/qml/default_sky_west.png
diff --git a/demos/quick3d/flickr3d/qml/qtlogo.png b/demos/quick3d/flickr3d/qml/qtlogo.png
new file mode 100644
index 000000000..7d3e97eb3
--- /dev/null
+++ b/demos/quick3d/flickr3d/qml/qtlogo.png