Quick3d demo packaging.

Change-Id: If02477a8bba02e58bcf407640e53b7b1d9f88402
Reviewed-on: http://codereview.qt.nokia.com/4024
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>

23 files changed, 47 insertions, 46 deletions

diff --git a/demos/quick3d/flickr3d/info.json b/demos/quick3d/flickr3d/info.json
index 7c374ff9e..8c67dbd9c 100644
--- a/demos/quick3d/flickr3d/info.json
+++ b/demos/quick3d/flickr3d/info.json
@@ -3,16 +3,16 @@
     "dict": {
         "Category": "application",
         "Runtime": "qml",
-        "DisplayName": "Thing",
+        "DisplayName": "Flickr3d",
         "Subcategory": "utility",
         "MainQML": "mt.qml",
         "Version": "1.0",
-        "Identifier": "com.nokia.qtquick3d.thing",
+        "Identifier": "com.nokia.qtquick3d.flickr3d",
         "Depends": {
             "com.nokia.components": "1.0",
             "com.nokia.sphone.components": "1.0",
             "com.nokia.sphone.JsonDB": "1.0"
         },
-        "Summary": "Thing QML Demo"
+        "Summary": "Flickr3d QML Demo"
     }
 }
diff --git a/demos/quick3d/flickr3d/main.cpp b/demos/quick3d/flickr3d/main.cpp
index 02ffb939b..51e9e2900 100644
--- a/demos/quick3d/flickr3d/main.cpp
+++ b/demos/quick3d/flickr3d/main.cpp
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
     QGLFormat f = QGLFormat::defaultFormat();
     f.setSampleBuffers(true);
     QSGView view(f);
-    QString qml = q_get_qmldir(QLatin1String("qml/flickr3d.qml"));
+    QString qml = q_get_qmldir(QLatin1String("qml/desktop.qml"));
     view.setSource(QUrl::fromLocalFile(qml));
 
     if (QApplication::arguments().contains(QLatin1String("-maximize")))
diff --git a/demos/quick3d/flickr3d/mt.qml b/demos/quick3d/flickr3d/mt.qml
index 95732fe36..a2d3cb538 100644
--- a/demos/quick3d/flickr3d/mt.qml
+++ b/demos/quick3d/flickr3d/mt.qml
@@ -47,6 +47,6 @@ Item {
     width: 320
     height: 480
 
-    Thing {
+    Flickr3d {
     }
 }
diff --git a/demos/quick3d/flickr3d/qml/flickr3d.qml b/demos/quick3d/flickr3d/qml/Flickr3d.qml
index d8d47d620..ef55e9b43 100644
--- a/demos/quick3d/flickr3d/qml/flickr3d.qml
+++ b/demos/quick3d/flickr3d/qml/Flickr3d.qml
@@ -43,8 +43,8 @@ import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
 Viewport {
-    width: 1024
-    height: 768
+    width: parent.width
+    height: parent.height
 
     camera: Camera {
         id: cam
diff --git a/demos/quick3d/flickr3d/qml/desktop.qml b/demos/quick3d/flickr3d/qml/desktop.qml
index ddc8f23a9..08fbb8240 100644
--- a/demos/quick3d/flickr3d/qml/desktop.qml
+++ b/demos/quick3d/flickr3d/qml/desktop.qml
@@ -44,9 +44,9 @@ import Qt3D.Shapes 1.0
 import "."
 
 Item {
-    width: 640
-    height: 480
+    width: 1024
+    height: 768
 
-    Thing {
+    Flickr3d {
     }
 }
diff --git a/demos/quick3d/model_viewer/info.json b/demos/quick3d/model_viewer/info.json
index 7c374ff9e..f4cec3996 100644
--- a/demos/quick3d/model_viewer/info.json
+++ b/demos/quick3d/model_viewer/info.json
@@ -3,16 +3,16 @@
     "dict": {
         "Category": "application",
         "Runtime": "qml",
-        "DisplayName": "Thing",
+        "DisplayName": "Model Viewer",
         "Subcategory": "utility",
         "MainQML": "mt.qml",
         "Version": "1.0",
-        "Identifier": "com.nokia.qtquick3d.thing",
+        "Identifier": "com.nokia.qtquick3d.modelviewer",
         "Depends": {
             "com.nokia.components": "1.0",
             "com.nokia.sphone.components": "1.0",
             "com.nokia.sphone.JsonDB": "1.0"
         },
-        "Summary": "Thing QML Demo"
+        "Summary": "Model Viewer QML Demo"
     }
 }
diff --git a/demos/quick3d/model_viewer/main.cpp b/demos/quick3d/model_viewer/main.cpp
index 4cf39d058..37433bfff 100644
--- a/demos/quick3d/model_viewer/main.cpp
+++ b/demos/quick3d/model_viewer/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     QGLFormat f = QGLFormat::defaultFormat();
     f.setSampleBuffers(true);
     QSGView view(f);
-    QString qml = q_get_qmldir(QLatin1String("qml/model_viewer.qml"));
+    QString qml = q_get_qmldir(QLatin1String("qml/desktop.qml"));
     view.setSource(QUrl::fromLocalFile(qml));
 
     if (QApplication::arguments().contains(QLatin1String("-maximize")))
diff --git a/demos/quick3d/model_viewer/mt.qml b/demos/quick3d/model_viewer/mt.qml
index 95732fe36..a1264c6a1 100644
--- a/demos/quick3d/model_viewer/mt.qml
+++ b/demos/quick3d/model_viewer/mt.qml
@@ -47,6 +47,6 @@ Item {
     width: 320
     height: 480
 
-    Thing {
+    ModelViewer {
     }
 }
diff --git a/demos/quick3d/model_viewer/qml/model_viewer.qml b/demos/quick3d/model_viewer/qml/ModelViewer.qml
index c6cacc198..66322a209 100644
--- a/demos/quick3d/model_viewer/qml/model_viewer.qml
+++ b/demos/quick3d/model_viewer/qml/ModelViewer.qml
@@ -43,8 +43,8 @@ import Qt3D 1.0
 
 Rectangle {
     id: mainwindow
-    width: 640
-    height: 360
+    width: parent.width
+    height: parent.height
 
     gradient: Gradient {
          GradientStop { position: 0.0; color: "#300000" }
diff --git a/demos/quick3d/model_viewer/qml/desktop.qml b/demos/quick3d/model_viewer/qml/desktop.qml
index ddc8f23a9..d2781d9e0 100644
--- a/demos/quick3d/model_viewer/qml/desktop.qml
+++ b/demos/quick3d/model_viewer/qml/desktop.qml
@@ -45,8 +45,8 @@ import "."
 
 Item {
     width: 640
-    height: 480
+    height: 360
 
-    Thing {
+    ModelViewer {
     }
 }
diff --git a/demos/quick3d/qmlres.h b/demos/quick3d/qmlres.h
index a0789d4bf..cae7d29ab 100644
--- a/demos/quick3d/qmlres.h
+++ b/demos/quick3d/qmlres.h
@@ -65,10 +65,10 @@ static QString q_get_qmldir(const QString &name)
 #ifdef QT3D_USE_OPT
     QDir pkgdir(QLatin1String("/opt/mt/applications/" internal_xstr(QT3D_USE_OPT)));
 #else
-    QDir pkgdir(QLatin1String("/usr/share/qt5/quick3d/demos"));
+    QDir pkgdir(QLatin1String("/usr/share/qt5/quick3d/examples"));
 #endif
 #else
-    QDir pkgdir(QLatin1String("/usr/share/qt4/quick3d/demos"));
+    QDir pkgdir(QLatin1String("/usr/share/qt4/quick3d/examples"));
 #endif
     QString app = QCoreApplication::applicationFilePath();
     app = app.section(QDir::separator(), -1);
@@ -109,13 +109,13 @@ static QString q_get_qmldir(const QString &name)
                 //Grab just the app name itself.
                 app = app.section(QDir::separator(), -1);
 
-                if (dir.cd(QLatin1String("demos")) && dir.cd(app) && dir.exists())
+                if (dir.cd(QLatin1String("examples")) && dir.cd(app) && dir.exists())
                 {
                     qml = dir.filePath(qml);
                 }
                 else
                 {
-                    QString msg = QLatin1String("demos");
+                    QString msg = QLatin1String("examples");
                     msg += QDir::separator();
                     msg += app;
                     qWarning("Expected %s directry with qml resources!", qPrintable(msg));
diff --git a/demos/quick3d/robo_bounce/info.json b/demos/quick3d/robo_bounce/info.json
index 7c374ff9e..93292f8f1 100644
--- a/demos/quick3d/robo_bounce/info.json
+++ b/demos/quick3d/robo_bounce/info.json
@@ -3,16 +3,16 @@
     "dict": {
         "Category": "application",
         "Runtime": "qml",
-        "DisplayName": "Thing",
+        "DisplayName": "Robo Bounce",
         "Subcategory": "utility",
         "MainQML": "mt.qml",
         "Version": "1.0",
-        "Identifier": "com.nokia.qtquick3d.thing",
+        "Identifier": "com.nokia.qtquick3d.robobounce",
         "Depends": {
             "com.nokia.components": "1.0",
             "com.nokia.sphone.components": "1.0",
             "com.nokia.sphone.JsonDB": "1.0"
         },
-        "Summary": "Thing QML Demo"
+        "Summary": "Robo Bounce QML Demo"
     }
 }
diff --git a/demos/quick3d/robo_bounce/main.cpp b/demos/quick3d/robo_bounce/main.cpp
index 7ae66726c..b570f565c 100644
--- a/demos/quick3d/robo_bounce/main.cpp
+++ b/demos/quick3d/robo_bounce/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
     QGLFormat f = QGLFormat::defaultFormat();
     f.setSampleBuffers(true);
     QSGView view(f);
-    view.setSource(QUrl(QLatin1String("qrc:///qml/robobounce.qml")));
+    view.setSource(QUrl(QLatin1String("qrc:///qml/desktop.qml")));
 
     if (QApplication::arguments().contains(QLatin1String("-maximize")))
         view.showMaximized();
diff --git a/demos/quick3d/robo_bounce/mt.qml b/demos/quick3d/robo_bounce/mt.qml
index 95732fe36..488e49ead 100644
--- a/demos/quick3d/robo_bounce/mt.qml
+++ b/demos/quick3d/robo_bounce/mt.qml
@@ -47,6 +47,6 @@ Item {
     width: 320
     height: 480
 
-    Thing {
+    RoboBounce {
     }
 }
diff --git a/demos/quick3d/robo_bounce/qml/robobounce.qml b/demos/quick3d/robo_bounce/qml/RoboBounce.qml
index 60c8f3080..c2678a1e0 100644
--- a/demos/quick3d/robo_bounce/qml/robobounce.qml
+++ b/demos/quick3d/robo_bounce/qml/RoboBounce.qml
@@ -50,8 +50,8 @@ Image {
     property real repeatAnimationTimer: 30;  //Auto click the 'start' button this often
 
     id: theBackground
-    width: 640
-    height: 480
+    width: parent.width
+    height: parent.height
     source: "Assets/tronscape.png"
 
     focus: true
@@ -161,8 +161,8 @@ Image {
         Viewport {
             objectName: "Viewport 3D"
             id: viewport
-            width: 640
-            height: 480
+            width: parent.width
+            height: parent.height
             navigation: true
             picking: true
             //showPicking: true
diff --git a/demos/quick3d/robo_bounce/qml/desktop.qml b/demos/quick3d/robo_bounce/qml/desktop.qml
index ddc8f23a9..d59fd3d91 100644
--- a/demos/quick3d/robo_bounce/qml/desktop.qml
+++ b/demos/quick3d/robo_bounce/qml/desktop.qml
@@ -47,6 +47,6 @@ Item {
     width: 640
     height: 480
 
-    Thing {
+    RoboBounce {
     }
 }
diff --git a/demos/quick3d/robo_bounce/robo_bounce.qrc b/demos/quick3d/robo_bounce/robo_bounce.qrc
index 69a837850..9abffa658 100644
--- a/demos/quick3d/robo_bounce/robo_bounce.qrc
+++ b/demos/quick3d/robo_bounce/robo_bounce.qrc
@@ -1,6 +1,5 @@
 <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>
@@ -30,5 +29,7 @@
         <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/desktop.qml</file>
     </qresource>
 </RCC>
diff --git a/demos/quick3d/tea_service/info.json b/demos/quick3d/tea_service/info.json
index 7c374ff9e..ab0c53f44 100644
--- a/demos/quick3d/tea_service/info.json
+++ b/demos/quick3d/tea_service/info.json
@@ -3,16 +3,16 @@
     "dict": {
         "Category": "application",
         "Runtime": "qml",
-        "DisplayName": "Thing",
+        "DisplayName": "Tea Service QML",
         "Subcategory": "utility",
         "MainQML": "mt.qml",
         "Version": "1.0",
-        "Identifier": "com.nokia.qtquick3d.thing",
+        "Identifier": "com.nokia.qtquick3d.teaserviceqml",
         "Depends": {
             "com.nokia.components": "1.0",
             "com.nokia.sphone.components": "1.0",
             "com.nokia.sphone.JsonDB": "1.0"
         },
-        "Summary": "Thing QML Demo"
+        "Summary": "Tea Service QML Demo"
     }
 }
diff --git a/demos/quick3d/tea_service/main.cpp b/demos/quick3d/tea_service/main.cpp
index c89a11728..3e4595ca9 100644
--- a/demos/quick3d/tea_service/main.cpp
+++ b/demos/quick3d/tea_service/main.cpp
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
     QGLFormat f = QGLFormat::defaultFormat();
     f.setSampleBuffers(true);
     QSGView view(f);
-    QString qml = q_get_qmldir(QLatin1String("qml/teaservice.qml"));
+    QString qml = q_get_qmldir(QLatin1String("qml/desktop.qml"));
     view.setSource(QUrl::fromLocalFile(qml));
 
     if (QApplication::arguments().contains(QLatin1String("-maximize")))
diff --git a/demos/quick3d/tea_service/mt.qml b/demos/quick3d/tea_service/mt.qml
index 95732fe36..b81abef56 100644
--- a/demos/quick3d/tea_service/mt.qml
+++ b/demos/quick3d/tea_service/mt.qml
@@ -47,6 +47,6 @@ Item {
     width: 320
     height: 480
 
-    Thing {
+    TeaService {
     }
 }
diff --git a/demos/quick3d/tea_service/qml/teaservice.qml b/demos/quick3d/tea_service/qml/TeaService.qml
index e0af9eaea..229e6b8de 100644
--- a/demos/quick3d/tea_service/qml/teaservice.qml
+++ b/demos/quick3d/tea_service/qml/TeaService.qml
@@ -42,8 +42,8 @@ import QtQuick 2.0
 import Qt3D 1.0
 
 Viewport {
-    width: 850
-    height: 480
+    width: parent.width
+    height: parent.height
     picking: true
     //showPicking: true
 
diff --git a/demos/quick3d/tea_service/qml/desktop.qml b/demos/quick3d/tea_service/qml/desktop.qml
index ddc8f23a9..6fe6f1a54 100644
--- a/demos/quick3d/tea_service/qml/desktop.qml
+++ b/demos/quick3d/tea_service/qml/desktop.qml
@@ -44,9 +44,9 @@ import Qt3D.Shapes 1.0
 import "."
 
 Item {
-    width: 640
+    width: 850
     height: 480
 
-    Thing {
+    TeaService {
     }
 }
diff --git a/pkg.pri b/pkg.pri
index a40aa30be..c82266cbf 100644
--- a/pkg.pri
+++ b/pkg.pri
@@ -85,7 +85,7 @@ contains(TEMPLATE, app) {
             icons.path = /usr/share/themes/base/meegotouch/icons
             INSTALLS += icons applnk
 
-            app_target.path += $$QT3D_INSTALL_BINS
+            app_target.path = $$QT3D_INSTALL_BINS
             INSTALLS += app_target
         } else {
             mt {
@@ -95,12 +95,12 @@ contains(TEMPLATE, app) {
                 # icons.files is set by qt3dquick_pkg_dep.pri or qt3d_pkg_dep.pri
                 icons.path = /opt/mt/applications/$${TARGET}
                 INSTALLS += icons applnk
-                app_target.path += /opt/mt/applications/$${TARGET}
+                app_target.path = /opt/mt/applications/$${TARGET}
                 INSTALLS += app_target
 
                 DEFINES += QT3D_USE_OPT=$${TARGET}
             } else {
-                app_target.path += $$QT3D_INSTALL_BINS
+                app_target.path = $$QT3D_INSTALL_BINS
                 INSTALLS += app_target
             }
         }