Device packaging. QTBUG-17434.

Few fixups required for header location, and plugins not linked to
requisite libs.  The rest of it is adding .desktop files and icons.
Many of the icons are duplicates but at some point some apps will likely
get their own icons, so don't share a common icon.

Many apps run just fine, a few have bogus names, bad icons and other
niggles.  Apps that don't run are subject of other bug reports.

121 files changed, 593 insertions, 69 deletions

diff --git a/debian/changelog b/debian/changelog
index 87530aaf5..f8b602bda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-libqt4-3d (1.0) unstable; urgency=low
+libqt4-3d (tp1) unstable; urgency=low
 
-  * Initial Release.
+  * Technology Preview 1 Release.
 
- -- Sarah Smith <sarah.j.smith@nokia.com>  Wed, 09 Feb 2011 20:59:27 +1000
+ -- Sarah Smith <sarah.j.smith@nokia.com>  Wed, 06 Apr 2011 16:30:00 +1000
diff --git a/debian/libqt4-3d-examples.install b/debian/libqt4-3d-examples.install
index 130f8c80f..9bc01a58c 100644
--- a/debian/libqt4-3d-examples.install
+++ b/debian/libqt4-3d-examples.install
@@ -1,2 +1,4 @@
 usr/bin/*
 usr/share/qt4/quick3d
+usr/share/themes/base/meegotouch/icons
+usr/share/applications
diff --git a/debian/rules b/debian/rules
index 2ed9da76f..570588643 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,8 +36,8 @@ ifneq (,$(filter parallel=%,$(TMP_BUILD_OPTS)))
 endif
 
 ifeq (arm,$(findstring arm,$(shell g++ -v 2>&1 | sed -n '/Target: arm/p')))
-	QMAKE_CONF_MKSPEC = "-spec linux-g++-maemo"
-	QMAKE_CONF_OPTS = "CONFIG+=maemo"
+        QMAKE_CONF_MKSPEC = -spec linux-g++-maemo
+        QMAKE_CONF_OPTS = CONFIG+=maemo
 endif
 
 DEB_MAKE_INVOKE := $(MAKE) $(PARALLEL_MAKEFLAGS)
diff --git a/demos/qt3d/cubehouse/cubehouse.desktop b/demos/qt3d/cubehouse/cubehouse.desktop
new file mode 100644
index 000000000..1a530fa21
--- /dev/null
+++ b/demos/qt3d/cubehouse/cubehouse.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=CubeHouse
+Icon=icon-l-qt3d
+Exec=/usr/bin/cubehouse -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_cubehouse
+X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro
index 93da6e01c..0781c4016 100644
--- a/demos/qt3d/cubehouse/cubehouse.pro
+++ b/demos/qt3d/cubehouse/cubehouse.pro
@@ -13,6 +13,14 @@ OTHER_FILES += \
     shaders/objectlineartexgen.vert
 
 package {
+    maemo {
+        applnk.files = cubehouse.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qt3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
     LIBS += -L../../../src/threed -lQt3D
     INCLUDEPATH += ../../../include
     target.path += $$[QT_INSTALL_BINS]
diff --git a/demos/qt3d/cubehouse/icon-l-qt3d.png b/demos/qt3d/cubehouse/icon-l-qt3d.png
new file mode 100644
index 000000000..07cc4092d
--- /dev/null
+++ b/demos/qt3d/cubehouse/icon-l-qt3d.png
diff --git a/demos/qt3d/dirs b/demos/qt3d/dirs
new file mode 100644
index 000000000..7b7a72f28
--- /dev/null
+++ b/demos/qt3d/dirs
@@ -0,0 +1,4 @@
+pageflip
+photobrowser3d
+shapes
+teaservice
diff --git a/demos/qt3d/pageflip/icon-l-qt3d.png b/demos/qt3d/pageflip/icon-l-qt3d.png
new file mode 100644
index 000000000..07cc4092d
--- /dev/null
+++ b/demos/qt3d/pageflip/icon-l-qt3d.png
diff --git a/demos/qt3d/pageflip/pageflip.desktop b/demos/qt3d/pageflip/pageflip.desktop
new file mode 100644
index 000000000..5b75c596f
--- /dev/null
+++ b/demos/qt3d/pageflip/pageflip.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Pageflip
+Icon=icon-l-qt3d
+Exec=/usr/bin/pageflip -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_pageflip
+X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro
index e676d27cc..a1073d464 100644
--- a/demos/qt3d/pageflip/pageflip.pro
+++ b/demos/qt3d/pageflip/pageflip.pro
@@ -8,6 +8,15 @@ HEADERS = pageflipmath_p.h
 RESOURCES = pageflip.qrc
 
 package {
+    maemo {
+        applnk.files = pageflip.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qt3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     LIBS += -L../../../src/threed -lQt3D
     INCLUDEPATH += ../../../include
     target.path += $$[QT_INSTALL_BINS]
diff --git a/demos/qt3d/photobrowser3d/icon-l-qt3d.png b/demos/qt3d/photobrowser3d/icon-l-qt3d.png
new file mode 100644
index 000000000..07cc4092d
--- /dev/null
+++ b/demos/qt3d/photobrowser3d/icon-l-qt3d.png
diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.desktop b/demos/qt3d/photobrowser3d/photobrowser3d.desktop
new file mode 100644
index 000000000..747c80973
--- /dev/null
+++ b/demos/qt3d/photobrowser3d/photobrowser3d.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Photobrowser 3D
+Icon=icon-l-qt3d
+Exec=/usr/bin/photobrowser3d -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_photobrowser3d
+X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro
index 549d09f5a..93718720a 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3d.pro
+++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro
@@ -55,6 +55,14 @@ OTHER_FILES += \
     shaders/replace_texture.vsh
 
 package {
+    maemo {
+        applnk.files = photobrowser3d.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qt3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
     LIBS += -L../../../src/threed -lQt3D
     INCLUDEPATH += ../../../include
     target.path += $$[QT_INSTALL_BINS]
diff --git a/demos/qt3d/photobrowser3d/photobrowser3dview.cpp b/demos/qt3d/photobrowser3d/photobrowser3dview.cpp
index f73f9a19c..d81a77b68 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3dview.cpp
+++ b/demos/qt3d/photobrowser3d/photobrowser3dview.cpp
@@ -241,7 +241,6 @@ void PhotoBrowser3DView::nonThreadedFileLoad(const QUrl &url)
         m_display->addThumbnailNode(url);
     }
     pickableDirty();
-    qDumpScene(m_display);
 #else
     FileScanner *scanner = new FileScanner(this);
     scanner->setBaseUrl(url);
diff --git a/demos/qt3d/shapes/icon-l-qt3d.png b/demos/qt3d/shapes/icon-l-qt3d.png
new file mode 100644
index 000000000..07cc4092d
--- /dev/null
+++ b/demos/qt3d/shapes/icon-l-qt3d.png
diff --git a/demos/qt3d/shapes/shapes.desktop b/demos/qt3d/shapes/shapes.desktop
new file mode 100644
index 000000000..7a841e128
--- /dev/null
+++ b/demos/qt3d/shapes/shapes.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=shapes
+Icon=icon-l-qt3d
+Exec=/usr/bin/shapes -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_shapes
+X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro
index 5e656eaa6..592ac1e32 100644
--- a/demos/qt3d/shapes/shapes.pro
+++ b/demos/qt3d/shapes/shapes.pro
@@ -6,6 +6,14 @@ CONFIG += qt warn_on
 SOURCES = shapes.cpp
 
 package {
+    maemo {
+        applnk.files = shapes.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qt3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
     LIBS += -L../../../src/threed -lQt3D
     INCLUDEPATH += ../../../include
     target.path += $$[QT_INSTALL_BINS]
diff --git a/demos/qt3d/teaservice/icon-l-qt3d.png b/demos/qt3d/teaservice/icon-l-qt3d.png
new file mode 100644
index 000000000..07cc4092d
--- /dev/null
+++ b/demos/qt3d/teaservice/icon-l-qt3d.png
diff --git a/demos/qt3d/teaservice/teaservice.desktop b/demos/qt3d/teaservice/teaservice.desktop
new file mode 100644
index 000000000..2d49ae2f6
--- /dev/null
+++ b/demos/qt3d/teaservice/teaservice.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Tea Service
+Icon=icon-l-qt3d
+Exec=/usr/bin/teaservice -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_teaservice
+X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro
index c4c306cf5..63da4de25 100644
--- a/demos/qt3d/teaservice/teaservice.pro
+++ b/demos/qt3d/teaservice/teaservice.pro
@@ -8,6 +8,14 @@ HEADERS = meshobject.h sceneobject.h perpixeleffect.h
 RESOURCES = teaservice.qrc
 
 package {
+    maemo {
+        applnk.files = teaservice.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qt3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
     LIBS += -L../../../src/threed -lQt3D
     INCLUDEPATH += ../../../include
     target.path += $$[QT_INSTALL_BINS]
diff --git a/demos/quick3d/dirs b/demos/quick3d/dirs
new file mode 100644
index 000000000..576bd293e
--- /dev/null
+++ b/demos/quick3d/dirs
@@ -0,0 +1,3 @@
+robo_bounce
+tea_service
+model_viewer
diff --git a/demos/quick3d/lander/icon-l-qtquick3d.png b/demos/quick3d/lander/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/demos/quick3d/lander/icon-l-qtquick3d.png
diff --git a/demos/quick3d/lander/lander.desktop b/demos/quick3d/lander/lander.desktop
new file mode 100644
index 000000000..09241e0ec
--- /dev/null
+++ b/demos/quick3d/lander/lander.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Lunar Lander
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/lander -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_lander
+X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/quick3d/model_viewer/icon-l-qtquick3d.png b/demos/quick3d/model_viewer/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/demos/quick3d/model_viewer/icon-l-qtquick3d.png
diff --git a/demos/quick3d/model_viewer/model_viewer.desktop b/demos/quick3d/model_viewer/model_viewer.desktop
new file mode 100644
index 000000000..a89b4f09e
--- /dev/null
+++ b/demos/quick3d/model_viewer/model_viewer.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Model Viewer
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/model_viewer -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_model_viewer
+X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/quick3d/model_viewer/model_viewer.pro b/demos/quick3d/model_viewer/model_viewer.pro
index 605ff448d..17597ad38 100644
--- a/demos/quick3d/model_viewer/model_viewer.pro
+++ b/demos/quick3d/model_viewer/model_viewer.pro
@@ -34,6 +34,15 @@ distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/demos/$$TARGET
 INSTALLS += distInstalls
 
 package {
+    maemo {
+        applnk.files = model_viewer.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qtquick3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
diff --git a/demos/quick3d/qmlres.h b/demos/quick3d/qmlres.h
index 8c04e00ff..7c287379b 100644
--- a/demos/quick3d/qmlres.h
+++ b/demos/quick3d/qmlres.h
@@ -60,8 +60,9 @@ static QString q_get_qmldir(const QString &name)
     QString qml = name;
     // try for a Linux package install first
     QDir pkgdir(QLatin1String("/usr/share/qt4/quick3d/demos"));
-    if (pkgdir.cd(QCoreApplication::applicationName())
-            && pkgdir.exists())
+    QString app = QCoreApplication::applicationFilePath();
+    app = app.section(QDir::separator(), -1);
+    if (pkgdir.cd(app) && pkgdir.exists())
     {
         qml = pkgdir.filePath(qml);
     }
@@ -97,7 +98,7 @@ static QString q_get_qmldir(const QString &name)
                 {
                     QString msg = QLatin1String("demos");
                     msg += QDir::separator();
-                    msg += QCoreApplication::applicationName();
+                    msg += app;
                     qWarning("Expected %s directry with qml resources!", qPrintable(msg));
                 }
             }
diff --git a/demos/quick3d/robo_bounce/icon-l-qtquick3d.png b/demos/quick3d/robo_bounce/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/demos/quick3d/robo_bounce/icon-l-qtquick3d.png
diff --git a/demos/quick3d/robo_bounce/robo_bounce.desktop b/demos/quick3d/robo_bounce/robo_bounce.desktop
new file mode 100644
index 000000000..a143dccff
--- /dev/null
+++ b/demos/quick3d/robo_bounce/robo_bounce.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=RoboBounce
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/robo_bounce -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_robo_bounce
+X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/quick3d/robo_bounce/robo_bounce.pro b/demos/quick3d/robo_bounce/robo_bounce.pro
index ab1929a0b..6a65bc3ae 100644
--- a/demos/quick3d/robo_bounce/robo_bounce.pro
+++ b/demos/quick3d/robo_bounce/robo_bounce.pro
@@ -34,6 +34,15 @@ distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/demos/$$TARGET
 INSTALLS += distInstalls
 
 package {
+    maemo {
+        applnk.files = robo_bounce.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qtquick3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
diff --git a/demos/quick3d/tea_service/icon-l-qtquick3d.png b/demos/quick3d/tea_service/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/demos/quick3d/tea_service/icon-l-qtquick3d.png
diff --git a/demos/quick3d/tea_service/tea_service.desktop b/demos/quick3d/tea_service/tea_service.desktop
new file mode 100644
index 000000000..de9814edb
--- /dev/null
+++ b/demos/quick3d/tea_service/tea_service.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Tea Service
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/tea_service -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_tea_service
+X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/quick3d/tea_service/tea_service.pro b/demos/quick3d/tea_service/tea_service.pro
index 8d2f332df..e1c4461f2 100644
--- a/demos/quick3d/tea_service/tea_service.pro
+++ b/demos/quick3d/tea_service/tea_service.pro
@@ -34,6 +34,15 @@ distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/demos/$$TARGET
 INSTALLS += distInstalls
 
 package {
+    maemo {
+        applnk.files = tea_service.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qtquick3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
diff --git a/examples/qt3d/basket/basket.desktop b/examples/qt3d/basket/basket.desktop
new file mode 100644
index 000000000..c64ec3dc9
--- /dev/null
+++ b/examples/qt3d/basket/basket.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Basket
+Icon=icon-l-qt3d
+Exec=/usr/bin/basket -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_basket
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/qt3d/basket/basket.pro b/examples/qt3d/basket/basket.pro
index c56301271..a17b53641 100644
--- a/examples/qt3d/basket/basket.pro
+++ b/examples/qt3d/basket/basket.pro
@@ -8,6 +8,15 @@ HEADERS = basketview.h basket_data.h
 RESOURCES = basket.qrc
 
 package {
+    maemo {
+        applnk.files = basket.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qt3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     LIBS += -L../../../src/threed -lQt3D
     INCLUDEPATH += ../../../include
     target.path += $$[QT_INSTALL_BINS]
diff --git a/examples/qt3d/basket/icon-l-qt3d.png b/examples/qt3d/basket/icon-l-qt3d.png
new file mode 100644
index 000000000..07cc4092d
--- /dev/null
+++ b/examples/qt3d/basket/icon-l-qt3d.png
diff --git a/examples/qt3d/basket/teapot-logo.png b/examples/qt3d/basket/teapot-logo.png
new file mode 100644
index 000000000..3532b5203
--- /dev/null
+++ b/examples/qt3d/basket/teapot-logo.png
diff --git a/examples/qt3d/builder/builder.desktop b/examples/qt3d/builder/builder.desktop
new file mode 100644
index 000000000..3cae4d977
--- /dev/null
+++ b/examples/qt3d/builder/builder.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Builder
+Icon=icon-l-qt3d
+Exec=/usr/bin/builder -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_builder
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/qt3d/builder/builder.pro b/examples/qt3d/builder/builder.pro
index f56e0ab0e..a1bb8e16d 100644
--- a/examples/qt3d/builder/builder.pro
+++ b/examples/qt3d/builder/builder.pro
@@ -9,6 +9,14 @@ HEADERS = builder.h
 RESOURCES += builder.qrc
 
 package {
+    maemo {
+        applnk.files = builder.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qt3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
     LIBS += -L../../../src/threed -lQt3D
     INCLUDEPATH += ../../../include
     target.path += $$[QT_INSTALL_BINS]
diff --git a/examples/qt3d/builder/icon-l-qt3d.png b/examples/qt3d/builder/icon-l-qt3d.png
new file mode 100644
index 000000000..07cc4092d
--- /dev/null
+++ b/examples/qt3d/builder/icon-l-qt3d.png
diff --git a/examples/qt3d/cube/cube.desktop b/examples/qt3d/cube/cube.desktop
new file mode 100644
index 000000000..8f26f5d6f
--- /dev/null
+++ b/examples/qt3d/cube/cube.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=cube Qt3D
+Icon=icon-l-qt3d
+Exec=/usr/bin/cube -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_cube
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/qt3d/cube/cube.pro b/examples/qt3d/cube/cube.pro
index 09f049182..94ad3de36 100644
--- a/examples/qt3d/cube/cube.pro
+++ b/examples/qt3d/cube/cube.pro
@@ -9,6 +9,14 @@ HEADERS = cubeview.h
 RESOURCES = cube.qrc
 
 package {
+    maemo {
+        applnk.files = cube.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qt3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
     LIBS += -L../../../src/threed -lQt3D
     INCLUDEPATH += ../../../include
     target.path += $$[QT_INSTALL_BINS]
diff --git a/examples/qt3d/cube/icon-l-qt3d.png b/examples/qt3d/cube/icon-l-qt3d.png
new file mode 100644
index 000000000..07cc4092d
--- /dev/null
+++ b/examples/qt3d/cube/icon-l-qt3d.png
diff --git a/examples/qt3d/cylinder/cylinder.desktop b/examples/qt3d/cylinder/cylinder.desktop
new file mode 100644
index 000000000..49f7198a6
--- /dev/null
+++ b/examples/qt3d/cylinder/cylinder.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Cappucino
+Icon=icon-l-qt3d
+Exec=/usr/bin/cylinder -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_cylinder
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/qt3d/cylinder/cylinder.pro b/examples/qt3d/cylinder/cylinder.pro
index 7916959bf..dc928d689 100644
--- a/examples/qt3d/cylinder/cylinder.pro
+++ b/examples/qt3d/cylinder/cylinder.pro
@@ -8,6 +8,14 @@ HEADERS = cylinderview.h
 RESOURCES = cylinder.qrc
 
 package {
+    maemo {
+        applnk.files = cylinder.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qt3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
     LIBS += -L../../../src/threed -lQt3D
     INCLUDEPATH += ../../../include
     target.path += $$[QT_INSTALL_BINS]
diff --git a/examples/qt3d/cylinder/icon-l-qt3d.png b/examples/qt3d/cylinder/icon-l-qt3d.png
new file mode 100644
index 000000000..07cc4092d
--- /dev/null
+++ b/examples/qt3d/cylinder/icon-l-qt3d.png
diff --git a/examples/qt3d/dirs b/examples/qt3d/dirs
new file mode 100644
index 000000000..8691f086b
--- /dev/null
+++ b/examples/qt3d/dirs
@@ -0,0 +1,9 @@
+nesting
+builder
+tutorials
+graphicsview
+tank
+cube
+teapot
+cylinder
+geometry
diff --git a/examples/qt3d/geometry/geometry.desktop b/examples/qt3d/geometry/geometry.desktop
new file mode 100644
index 000000000..12fb440b3
--- /dev/null
+++ b/examples/qt3d/geometry/geometry.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=D20 Qt3D
+Icon=icon-l-qt3d
+Exec=/usr/bin/geometry -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_geometry
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/qt3d/geometry/geometry.pro b/examples/qt3d/geometry/geometry.pro
index 85cbb63db..29a1f4c2e 100644
--- a/examples/qt3d/geometry/geometry.pro
+++ b/examples/qt3d/geometry/geometry.pro
@@ -14,6 +14,14 @@ HEADERS = geometryview.h \
 RESOURCES = geometry.qrc
 
 package {
+    maemo {
+        applnk.files = geometry.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qt3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
     LIBS += -L../../../src/threed -lQt3D
     INCLUDEPATH += ../../../include
     target.path += $$[QT_INSTALL_BINS]
diff --git a/examples/qt3d/geometry/icon-l-qt3d.png b/examples/qt3d/geometry/icon-l-qt3d.png
new file mode 100644
index 000000000..07cc4092d
--- /dev/null
+++ b/examples/qt3d/geometry/icon-l-qt3d.png
diff --git a/examples/qt3d/graphicsview/graphicsview.desktop b/examples/qt3d/graphicsview/graphicsview.desktop
new file mode 100644
index 000000000..8c460a67b
--- /dev/null
+++ b/examples/qt3d/graphicsview/graphicsview.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=GraphicsView
+Icon=icon-l-qt3d
+Exec=/usr/bin/graphicsview -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_graphicsview
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/qt3d/graphicsview/graphicsview.pro b/examples/qt3d/graphicsview/graphicsview.pro
index 8d5664fe7..b6554bf62 100644
--- a/examples/qt3d/graphicsview/graphicsview.pro
+++ b/examples/qt3d/graphicsview/graphicsview.pro
@@ -27,6 +27,14 @@ RESOURCES = \
     graphicsview.qrc
 
 package {
+    maemo {
+        applnk.files = graphicsview.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qt3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
     LIBS += -L../../../src/threed -lQt3D
     INCLUDEPATH += ../../../include
     target.path += $$[QT_INSTALL_BINS]
diff --git a/examples/qt3d/graphicsview/icon-l-qt3d.png b/examples/qt3d/graphicsview/icon-l-qt3d.png
new file mode 100644
index 000000000..07cc4092d
--- /dev/null
+++ b/examples/qt3d/graphicsview/icon-l-qt3d.png
diff --git a/examples/qt3d/nesting/icon-l-qt3d.png b/examples/qt3d/nesting/icon-l-qt3d.png
new file mode 100644
index 000000000..07cc4092d
--- /dev/null
+++ b/examples/qt3d/nesting/icon-l-qt3d.png
diff --git a/examples/qt3d/nesting/nesting.desktop b/examples/qt3d/nesting/nesting.desktop
new file mode 100644
index 000000000..59eff4577
--- /dev/null
+++ b/examples/qt3d/nesting/nesting.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Nesting
+Icon=icon-l-qt3d
+Exec=/usr/bin/nesting -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_nesting
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/qt3d/nesting/nesting.pro b/examples/qt3d/nesting/nesting.pro
index 47b2a925d..abc6d07b2 100644
--- a/examples/qt3d/nesting/nesting.pro
+++ b/examples/qt3d/nesting/nesting.pro
@@ -8,6 +8,14 @@ HEADERS = cubeview.h
 RESOURCES = nesting.qrc
 
 package {
+    maemo {
+        applnk.files = nesting.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qt3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
     LIBS += -L../../../src/threed -lQt3D
     INCLUDEPATH += ../../../include
     target.path += $$[QT_INSTALL_BINS]
diff --git a/examples/qt3d/tank/icon-l-qt3d.png b/examples/qt3d/tank/icon-l-qt3d.png
new file mode 100644
index 000000000..07cc4092d
--- /dev/null
+++ b/examples/qt3d/tank/icon-l-qt3d.png
diff --git a/examples/qt3d/tank/main.cpp b/examples/qt3d/tank/main.cpp
index ee9c1429b..3907c5272 100644
--- a/examples/qt3d/tank/main.cpp
+++ b/examples/qt3d/tank/main.cpp
@@ -49,8 +49,13 @@ int main(int argc, char *argv[])
     qsrand(time(0));
 
     QApplication a(argc, argv);
-    TankView w;
-    w.show();
+    TankView view;
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
 
     return a.exec();
 }
diff --git a/examples/qt3d/tank/tank.desktop b/examples/qt3d/tank/tank.desktop
new file mode 100644
index 000000000..e9636e175
--- /dev/null
+++ b/examples/qt3d/tank/tank.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Tank
+Icon=icon-l-qt3d
+Exec=/usr/bin/tank -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_tank
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/qt3d/tank/tank.pro b/examples/qt3d/tank/tank.pro
index 418a86bcb..fd737f55e 100644
--- a/examples/qt3d/tank/tank.pro
+++ b/examples/qt3d/tank/tank.pro
@@ -13,6 +13,14 @@ HEADERS  += tankview.h \
     quadplane.h
 
 package {
+    maemo {
+        applnk.files = tank.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qt3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
     LIBS += -L../../../src/threed -lQt3D
     INCLUDEPATH += ../../../include
     target.path += $$[QT_INSTALL_BINS]
diff --git a/examples/qt3d/tank/tankview.cpp b/examples/qt3d/tank/tankview.cpp
index 9d4d7afbc..1c2e706d0 100644
--- a/examples/qt3d/tank/tankview.cpp
+++ b/examples/qt3d/tank/tankview.cpp
@@ -60,8 +60,6 @@ TankView::TankView(QWidget *parent)
     Tank *tank = addTank();
     connect(tank, SIGNAL(updated()), this, SLOT(update()));
 
-    qDumpScene(m_tankScene);
-
     setToolTip(tr("Double-click to add more tanks"));
     setWindowTitle(tr("Double-click Me!"));
 }
diff --git a/examples/qt3d/teapot/icon-l-qt3d.png b/examples/qt3d/teapot/icon-l-qt3d.png
new file mode 100644
index 000000000..07cc4092d
--- /dev/null
+++ b/examples/qt3d/teapot/icon-l-qt3d.png
diff --git a/examples/qt3d/teapot/teapot.desktop b/examples/qt3d/teapot/teapot.desktop
new file mode 100644
index 000000000..264fe1a92
--- /dev/null
+++ b/examples/qt3d/teapot/teapot.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=teapot Qt3D
+Icon=icon-l-qt3d
+Exec=/usr/bin/teapot -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_teapot
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/qt3d/teapot/teapot.pro b/examples/qt3d/teapot/teapot.pro
index c109e9932..0742e10da 100644
--- a/examples/qt3d/teapot/teapot.pro
+++ b/examples/qt3d/teapot/teapot.pro
@@ -7,6 +7,14 @@ SOURCES = teapotview.cpp main.cpp
 HEADERS = teapotview.h
 
 package {
+    maemo {
+        applnk.files = teapot.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qt3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
     LIBS += -L../../../src/threed -lQt3D
     INCLUDEPATH += ../../../include
     target.path += $$[QT_INSTALL_BINS]
diff --git a/examples/qt3d/tutorials/icon-l-qt3d.png b/examples/qt3d/tutorials/icon-l-qt3d.png
new file mode 100644
index 000000000..07cc4092d
--- /dev/null
+++ b/examples/qt3d/tutorials/icon-l-qt3d.png
diff --git a/examples/qt3d/tutorials/tutorials.desktop b/examples/qt3d/tutorials/tutorials.desktop
new file mode 100644
index 000000000..3b3c55d33
--- /dev/null
+++ b/examples/qt3d/tutorials/tutorials.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=tutorials Qt3D
+Icon=icon-l-qt3d
+Exec=/usr/bin/tutorials -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_tutorials
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/quick3d/basket/basket.pro b/examples/quick3d/basket/basket.pro
index 32f9a7df5..dfd0e69b0 100644
--- a/examples/quick3d/basket/basket.pro
+++ b/examples/quick3d/basket/basket.pro
@@ -34,6 +34,15 @@ distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
 INSTALLS += distInstalls
 
 package {
+    maemo {
+        applnk.files = basket_qml.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qtquick3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
diff --git a/examples/quick3d/basket/basket_qml.desktop b/examples/quick3d/basket/basket_qml.desktop
new file mode 100644
index 000000000..1fb9f1e04
--- /dev/null
+++ b/examples/quick3d/basket/basket_qml.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Basket
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/basket_qml -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_basket_qml
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/quick3d/basket/icon-l-qtquick3d.png b/examples/quick3d/basket/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/examples/quick3d/basket/icon-l-qtquick3d.png
diff --git a/examples/quick3d/bounce/bounce.desktop b/examples/quick3d/bounce/bounce.desktop
new file mode 100644
index 000000000..3a982428d
--- /dev/null
+++ b/examples/quick3d/bounce/bounce.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Bounce
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/bounce -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_bounce
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/quick3d/bounce/bounce.pro b/examples/quick3d/bounce/bounce.pro
index b39ecb174..e80e8e764 100644
--- a/examples/quick3d/bounce/bounce.pro
+++ b/examples/quick3d/bounce/bounce.pro
@@ -34,6 +34,15 @@ distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
 INSTALLS += distInstalls
 
 package {
+    maemo {
+        applnk.files = bounce.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qtquick3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
diff --git a/examples/quick3d/bounce/icon-l-qtquick3d.png b/examples/quick3d/bounce/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/examples/quick3d/bounce/icon-l-qtquick3d.png
diff --git a/examples/quick3d/cube/cube.desktop b/examples/quick3d/cube/cube.desktop
new file mode 100644
index 000000000..e28b8fa27
--- /dev/null
+++ b/examples/quick3d/cube/cube.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Cube
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/cube -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_cube
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/quick3d/cube/cube.pro b/examples/quick3d/cube/cube.pro
index 62877c0dd..483137baf 100644
--- a/examples/quick3d/cube/cube.pro
+++ b/examples/quick3d/cube/cube.pro
@@ -34,6 +34,15 @@ distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
 INSTALLS += distInstalls
 
 package {
+    maemo {
+        applnk.files = cube_qml.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qtquick3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
diff --git a/examples/quick3d/cube/icon-l-qtquick3d.png b/examples/quick3d/cube/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/examples/quick3d/cube/icon-l-qtquick3d.png
diff --git a/examples/quick3d/dirs b/examples/quick3d/dirs
index 32915235b..e8a9e382d 100644
--- a/examples/quick3d/dirs
+++ b/examples/quick3d/dirs
@@ -1,13 +1,12 @@
-./sphere
-./textures
-./shaders
-./forest
-./bounce
-./cube
-./moon
-./lander
-./monkeygod
-./teapot
-./photoroom
-./matrix_animation
-./basket
+sphere
+textures
+shaders
+forest
+bounce
+cube
+moon
+lander
+monkeygod
+teapot
+photoroom
+matrix_animation
diff --git a/examples/quick3d/forest/forest.desktop b/examples/quick3d/forest/forest.desktop
new file mode 100644
index 000000000..fc5054da1
--- /dev/null
+++ b/examples/quick3d/forest/forest.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Forest
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/forest -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_forest
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/quick3d/forest/forest.pro b/examples/quick3d/forest/forest.pro
index a13dfecef..a46d77267 100644
--- a/examples/quick3d/forest/forest.pro
+++ b/examples/quick3d/forest/forest.pro
@@ -34,6 +34,15 @@ distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
 INSTALLS += distInstalls
 
 package {
+    maemo {
+        applnk.files = forest.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qtquick3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
diff --git a/examples/quick3d/forest/icon-l-qtquick3d.png b/examples/quick3d/forest/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/examples/quick3d/forest/icon-l-qtquick3d.png
diff --git a/examples/quick3d/lander/icon-l-qtquick3d.png b/examples/quick3d/lander/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/examples/quick3d/lander/icon-l-qtquick3d.png
diff --git a/examples/quick3d/lander/lander.desktop b/examples/quick3d/lander/lander.desktop
new file mode 100644
index 000000000..09241e0ec
--- /dev/null
+++ b/examples/quick3d/lander/lander.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Lunar Lander
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/lander -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_lander
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/quick3d/lander/lander.pro b/examples/quick3d/lander/lander.pro
index 16f8e39e1..839fa8f83 100644
--- a/examples/quick3d/lander/lander.pro
+++ b/examples/quick3d/lander/lander.pro
@@ -1,7 +1,6 @@
 TEMPLATE = app
 TARGET = lander
 CONFIG += qt warn_on
-INCLUDEPATH += ../basket
 
 SOURCES += main.cpp
 HEADERS += ../qmlres.h
@@ -35,6 +34,15 @@ distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
 INSTALLS += distInstalls
 
 package {
+    maemo {
+        applnk.files = lander.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qtquick3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
diff --git a/examples/quick3d/matrix_animation/icon-l-qtquick3d.png b/examples/quick3d/matrix_animation/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/examples/quick3d/matrix_animation/icon-l-qtquick3d.png
diff --git a/examples/quick3d/matrix_animation/matrix_animation.desktop b/examples/quick3d/matrix_animation/matrix_animation.desktop
new file mode 100644
index 000000000..6ece282f7
--- /dev/null
+++ b/examples/quick3d/matrix_animation/matrix_animation.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Matrix
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/matrix_animation -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_matrix_animation
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/quick3d/matrix_animation/matrix_animation.pro b/examples/quick3d/matrix_animation/matrix_animation.pro
index e6070141d..2237111f0 100644
--- a/examples/quick3d/matrix_animation/matrix_animation.pro
+++ b/examples/quick3d/matrix_animation/matrix_animation.pro
@@ -2,8 +2,6 @@ TEMPLATE = app
 TARGET = matrix_animation
 CONFIG += qt warn_on
 
-INCLUDEPATH += ../basket
-
 SOURCES += main.cpp
 HEADERS += ../qmlres.h
 
@@ -36,6 +34,15 @@ distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
 INSTALLS += distInstalls
 
 package {
+    maemo {
+        applnk.files = matrix_animation.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qtquick3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
diff --git a/examples/quick3d/monkeygod/icon-l-qtquick3d.png b/examples/quick3d/monkeygod/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/examples/quick3d/monkeygod/icon-l-qtquick3d.png
diff --git a/examples/quick3d/monkeygod/monkeygod.desktop b/examples/quick3d/monkeygod/monkeygod.desktop
new file mode 100644
index 000000000..dd646cfbc
--- /dev/null
+++ b/examples/quick3d/monkeygod/monkeygod.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=monkeygod
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/monkeygod -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_monkeygod
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/quick3d/monkeygod/monkeygod.pro b/examples/quick3d/monkeygod/monkeygod.pro
index 59c8946de..ebeec5423 100644
--- a/examples/quick3d/monkeygod/monkeygod.pro
+++ b/examples/quick3d/monkeygod/monkeygod.pro
@@ -2,8 +2,6 @@ TEMPLATE = app
 TARGET = monkeygod
 CONFIG += qt warn_on
 
-INCLUDEPATH += ../basket
-
 SOURCES += main.cpp
 HEADERS += ../qmlres.h
 
@@ -36,6 +34,15 @@ distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
 INSTALLS += distInstalls
 
 package {
+    maemo {
+        applnk.files = monkeygod.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qtquick3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
diff --git a/examples/quick3d/moon/icon-l-qtquick3d.png b/examples/quick3d/moon/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/examples/quick3d/moon/icon-l-qtquick3d.png
diff --git a/examples/quick3d/moon/moon.desktop b/examples/quick3d/moon/moon.desktop
new file mode 100644
index 000000000..14e498d58
--- /dev/null
+++ b/examples/quick3d/moon/moon.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Moon
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/moon -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_moon
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/quick3d/moon/moon.pro b/examples/quick3d/moon/moon.pro
index 3b5fd27ff..e3b374941 100644
--- a/examples/quick3d/moon/moon.pro
+++ b/examples/quick3d/moon/moon.pro
@@ -34,6 +34,15 @@ distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
 INSTALLS += distInstalls
 
 package {
+    maemo {
+        applnk.files = moon.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qtquick3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
diff --git a/examples/quick3d/photoroom/icon-l-qtquick3d.png b/examples/quick3d/photoroom/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/examples/quick3d/photoroom/icon-l-qtquick3d.png
diff --git a/examples/quick3d/photoroom/photoroom.desktop b/examples/quick3d/photoroom/photoroom.desktop
new file mode 100644
index 000000000..65624b3d0
--- /dev/null
+++ b/examples/quick3d/photoroom/photoroom.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=PhotoRoom
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/photoroom -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_photoroom
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/quick3d/photoroom/photoroom.pro b/examples/quick3d/photoroom/photoroom.pro
index 5fe93b5e3..6e7126dc4 100644
--- a/examples/quick3d/photoroom/photoroom.pro
+++ b/examples/quick3d/photoroom/photoroom.pro
@@ -34,6 +34,15 @@ distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
 INSTALLS += distInstalls
 
 package {
+    maemo {
+        applnk.files = photoroom.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qtquick3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
diff --git a/examples/quick3d/qmlres.h b/examples/quick3d/qmlres.h
index 47470628b..ac293aa13 100644
--- a/examples/quick3d/qmlres.h
+++ b/examples/quick3d/qmlres.h
@@ -60,8 +60,9 @@ static QString q_get_qmldir(const QString &name)
     QString qml = name;
     // try for a Linux package install first
     QDir pkgdir(QLatin1String("/usr/share/qt4/quick3d/examples"));
-    if (pkgdir.cd(QCoreApplication::applicationName())
-            && pkgdir.exists())
+    QString app = QCoreApplication::applicationFilePath();
+    app = app.section(QDir::separator(), -1);
+    if (pkgdir.cd(app) && pkgdir.exists())
     {
         qml = pkgdir.filePath(qml);
     }
@@ -87,8 +88,6 @@ static QString q_get_qmldir(const QString &name)
             // in a "resources" directory next to the binary
             if (dir.cd(QLatin1String("resources")) && dir.exists())
             {
-                QString app = QCoreApplication::applicationFilePath();
-                app = app.section(QDir::separator(), -1);
                 if (dir.cd(QLatin1String("examples")) && dir.cd(app) && dir.exists())
                 {
                     qml = dir.filePath(qml);
@@ -97,7 +96,7 @@ static QString q_get_qmldir(const QString &name)
                 {
                     QString msg = QLatin1String("examples");
                     msg += QDir::separator();
-                    msg += QCoreApplication::applicationName();
+                    msg += app;
                     qWarning("Expected %s directry with qml resources!", qPrintable(msg));
                 }
             }
diff --git a/examples/quick3d/shaders/icon-l-qtquick3d.png b/examples/quick3d/shaders/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/examples/quick3d/shaders/icon-l-qtquick3d.png
diff --git a/examples/quick3d/shaders/shaders.desktop b/examples/quick3d/shaders/shaders.desktop
new file mode 100644
index 000000000..d5663e398
--- /dev/null
+++ b/examples/quick3d/shaders/shaders.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Shaders
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/shaders -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_shaders
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/quick3d/shaders/shaders.pro b/examples/quick3d/shaders/shaders.pro
index 3d5348eec..f95b2ffab 100644
--- a/examples/quick3d/shaders/shaders.pro
+++ b/examples/quick3d/shaders/shaders.pro
@@ -34,6 +34,15 @@ distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
 INSTALLS += distInstalls
 
 package {
+    maemo {
+        applnk.files = shaders.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qtquick3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
diff --git a/examples/quick3d/sphere/icon-l-qtquick3d.png b/examples/quick3d/sphere/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/examples/quick3d/sphere/icon-l-qtquick3d.png
diff --git a/examples/quick3d/sphere/sphere.desktop b/examples/quick3d/sphere/sphere.desktop
new file mode 100644
index 000000000..de9c2951f
--- /dev/null
+++ b/examples/quick3d/sphere/sphere.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Sphere
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/sphere -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_sphere
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/quick3d/sphere/sphere.pro b/examples/quick3d/sphere/sphere.pro
index 7fb6e0d5b..32a84dff5 100644
--- a/examples/quick3d/sphere/sphere.pro
+++ b/examples/quick3d/sphere/sphere.pro
@@ -34,6 +34,15 @@ distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
 INSTALLS += distInstalls
 
 package {
+    maemo {
+        applnk.files = sphere.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qtquick3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
diff --git a/examples/quick3d/teapot/icon-l-qtquick3d.png b/examples/quick3d/teapot/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/examples/quick3d/teapot/icon-l-qtquick3d.png
diff --git a/examples/quick3d/teapot/teapot.pro b/examples/quick3d/teapot/teapot.pro
index 37d435b87..fa86b7992 100644
--- a/examples/quick3d/teapot/teapot.pro
+++ b/examples/quick3d/teapot/teapot.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = teapot
+TARGET = teapot_qml
 CONFIG += qt warn_on
 
 SOURCES += main.cpp
@@ -34,6 +34,15 @@ distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
 INSTALLS += distInstalls
 
 package {
+    maemo {
+        applnk.files = teapot_qml.desktop
+        applnk.path = /usr/share/applications
+
+        icons.files = icon-l-qtquick3d.png
+        icons.path = /usr/share/themes/base/meegotouch/icons
+        INSTALLS += icons applnk
+    }
+
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
diff --git a/examples/quick3d/teapot/teapot_qml.desktop b/examples/quick3d/teapot/teapot_qml.desktop
new file mode 100644
index 000000000..733cb7936
--- /dev/null
+++ b/examples/quick3d/teapot/teapot_qml.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Teapot
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/teapot_qml -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_teapot_qml
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/quick3d/textures/icon-l-qtquick3d.png b/examples/quick3d/textures/icon-l-qtquick3d.png
new file mode 100644
index 000000000..69deef3f6
--- /dev/null
+++ b/examples/quick3d/textures/icon-l-qtquick3d.png
diff --git a/examples/quick3d/textures/textures.desktop b/examples/quick3d/textures/textures.desktop
new file mode 100644
index 000000000..0c971d37b
--- /dev/null
+++ b/examples/quick3d/textures/textures.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=textures
+Icon=icon-l-qtquick3d
+Exec=/usr/bin/textures -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_textures
+X-MeeGo-Translation-Catalog=essentials
diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro
index 25bec4917..c0c9158fe 100644
--- a/src/imports/shapes/shapes.pro
+++ b/src/imports/shapes/shapes.pro
@@ -3,7 +3,7 @@ TARGET  = qshapesqmlplugin
 CONFIG += qt plugin qt3dquick
 
 package {
-    LIBS += -L../../quick3d -L../../threed
+    LIBS += -L../../quick3d -L../../threed -lQt3D -lQt3DQuick
     INCLUDEPATH += ../../../include
 } else {
     CONFIG += qt3dquick
diff --git a/src/imports/threed/scale3d.h b/src/imports/threed/scale3d.h
index 5d71cea2f..b77863f3e 100644
--- a/src/imports/threed/scale3d.h
+++ b/src/imports/threed/scale3d.h
@@ -42,7 +42,7 @@
 #ifndef SCALE3D_H
 #define SCALE3D_H
 
-#include <Qt3D/qgraphicsscale3d.h>
+#include "qgraphicsscale3d.h"
 
 #include <QtCore/qvariant.h>
 #include <QtDeclarative/qdeclarative.h>
diff --git a/src/imports/threed/threed.cpp b/src/imports/threed/threed.cpp
index dd99d3135..c682bb214 100644
--- a/src/imports/threed/threed.cpp
+++ b/src/imports/threed/threed.cpp
@@ -50,11 +50,11 @@
 #include "qdeclarativeeffect.h"
 #include "scale3d.h"
 
-#include <Qt3D/qgraphicsrotation3d.h>
-#include <Qt3D/qgraphicstranslation3d.h>
-#include <Qt3D/qgraphicsscale3d.h>
-#include <Qt3D/qgraphicsbillboardtransform.h>
-#include <Qt3D/qglscenenode.h>
+#include "qgraphicsrotation3d.h"
+#include "qgraphicstranslation3d.h"
+#include "qgraphicsscale3d.h"
+#include "qgraphicsbillboardtransform.h"
+#include "qglscenenode.h"
 
 #include "qgraphicslookattransform.h"
 #include "shaderprogram.h"
diff --git a/src/imports/threed/threed.pro b/src/imports/threed/threed.pro
index f3c16cbbc..755bb453d 100644
--- a/src/imports/threed/threed.pro
+++ b/src/imports/threed/threed.pro
@@ -3,7 +3,7 @@ TARGET  = qthreedqmlplugin
 CONFIG += qt plugin
 
 package {
-    LIBS += -L../../threed -L../../quick3d
+    LIBS += -L../../threed -L../../quick3d -lQt3D -lQt3DQuick
     INCLUDEPATH += ../../../include
 } else {
     CONFIG += qt3d qt3dquick
diff --git a/src/imports/threed/viewport.cpp b/src/imports/threed/viewport.cpp
index 74cb06eb9..cfb7b911d 100644
--- a/src/imports/threed/viewport.cpp
+++ b/src/imports/threed/viewport.cpp
@@ -42,12 +42,12 @@
 #include "viewport.h"
 #include "qdeclarativeeffect.h"
 
-#include <Qt3D/qgllightmodel.h>
-#include <Qt3D/qgllightparameters.h>
-#include <Qt3D/qglcamera.h>
-#include <Qt3D/qglview.h>
-#include <Qt3D/qglsubsurface.h>
-#include <Qt3D/qglframebufferobjectsurface.h>
+#include "qgllightmodel.h"
+#include "qgllightparameters.h"
+#include "qglcamera.h"
+#include "qglview.h"
+#include "qglsubsurface.h"
+#include "qglframebufferobjectsurface.h"
 
 #include <QtGui/qpainter.h>
 #include <QtGui/qgraphicsview.h>
diff --git a/src/plugins/sceneformats/3ds/3ds.pro b/src/plugins/sceneformats/3ds/3ds.pro
index d1f77c76d..a0fdcfefa 100644
--- a/src/plugins/sceneformats/3ds/3ds.pro
+++ b/src/plugins/sceneformats/3ds/3ds.pro
@@ -11,7 +11,7 @@ SOURCES += main.cpp \
     qgl3dsmesh.cpp
 
 package {
-    LIBS += -L../../../threed
+    LIBS += -L$$PWD/../threed -lQt3D
     INCLUDEPATH += ../../../../include
 } else {
     CONFIG += qt3d
diff --git a/src/plugins/sceneformats/assimp/assimp.pro b/src/plugins/sceneformats/assimp/assimp.pro
index bd777dd79..7bb9f3bbf 100644
--- a/src/plugins/sceneformats/assimp/assimp.pro
+++ b/src/plugins/sceneformats/assimp/assimp.pro
@@ -15,7 +15,7 @@ SOURCES += main.cpp \
     ailoaderiosystem.cpp
 
 package {
-    LIBS += -L../../../threed
+    LIBS += -L$$PWD/../threed -lQt3D
     INCLUDEPATH += ../../../../include
 } else {
     CONFIG += qt3d
diff --git a/src/plugins/sceneformats/bezier/bezier.pro b/src/plugins/sceneformats/bezier/bezier.pro
index 19e4ba83d..6341a1cdb 100644
--- a/src/plugins/sceneformats/bezier/bezier.pro
+++ b/src/plugins/sceneformats/bezier/bezier.pro
@@ -8,7 +8,7 @@ SOURCES += main.cpp \
            qglbezierscenehandler.cpp
 
 package {
-    LIBS += -L../../../threed
+    LIBS += -L$$PWD/../threed -lQt3D
     INCLUDEPATH += ../../../../include
 } else {
     CONFIG += qt3d
diff --git a/src/plugins/sceneformats/obj/obj.pro b/src/plugins/sceneformats/obj/obj.pro
index 8033b3070..731118877 100644
--- a/src/plugins/sceneformats/obj/obj.pro
+++ b/src/plugins/sceneformats/obj/obj.pro
@@ -8,7 +8,7 @@ SOURCES += main.cpp \
            qglobjscenehandler.cpp
 
 package {
-    LIBS += -L../../../threed
+    LIBS += -L$$PWD/../threed -lQt3D
     INCLUDEPATH += ../../../../include
 } else {
     CONFIG += qt3d
diff --git a/src/quick3d/qdeclarativeeffect.cpp b/src/quick3d/qdeclarativeeffect.cpp
index 4758d78bc..0d5fa7918 100644
--- a/src/quick3d/qdeclarativeeffect.cpp
+++ b/src/quick3d/qdeclarativeeffect.cpp
@@ -41,8 +41,8 @@
 
 #include "qdeclarativeeffect.h"
 
-#include <Qt3D/qglpainter.h>
-#include <Qt3D/qglmaterial.h>
+#include "qglpainter.h"
+#include "qglmaterial.h"
 
 #include <QNetworkRequest>
 #include <QNetworkReply>
diff --git a/src/quick3d/qdeclarativeeffect.h b/src/quick3d/qdeclarativeeffect.h
index 50a03c263..0fb2d01e2 100644
--- a/src/quick3d/qdeclarativeeffect.h
+++ b/src/quick3d/qdeclarativeeffect.h
@@ -50,7 +50,7 @@
 #include <QtGui/qimage.h>
 #include <QtDeclarative/qdeclarative.h>
 
-#include <Qt3D/qgltexture2d.h>
+#include "qgltexture2d.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/quick3d/qdeclarativeitem3d.cpp b/src/quick3d/qdeclarativeitem3d.cpp
index b4495c4a2..fdb8ed316 100644
--- a/src/quick3d/qdeclarativeitem3d.cpp
+++ b/src/quick3d/qdeclarativeitem3d.cpp
@@ -44,11 +44,11 @@
 #include "qdeclarativemesh.h"
 #include "qdeclarativeeffect.h"
 
-#include <Qt3D/qgllightparameters.h>
-#include <Qt3D/qglabstractscene.h>
-#include <Qt3D/qglscenenode.h>
-#include <Qt3D/qglview.h>
-#include <Qt3D/qgraphicstransform3d.h>
+#include "qgllightparameters.h"
+#include "qglabstractscene.h"
+#include "qglscenenode.h"
+#include "qglview.h"
+#include "qgraphicstransform3d.h"
 
 #include <QtGui/qevent.h>
 #include <QtDeclarative/qdeclarativecontext.h>
@@ -1218,7 +1218,9 @@ void QDeclarativeItem3D::initialize(QGLPainter *painter)
 void QDeclarativeItem3D::drawItem(QGLPainter *painter)
 {
     if (d->mesh)
+    {
         d->mesh->draw(painter, d->mainBranchId);
+    }
 }
 
 
diff --git a/src/quick3d/qdeclarativemesh.cpp b/src/quick3d/qdeclarativemesh.cpp
index e393bc724..a0e2d3aff 100644
--- a/src/quick3d/qdeclarativemesh.cpp
+++ b/src/quick3d/qdeclarativemesh.cpp
@@ -41,10 +41,10 @@
 
 #include "qdeclarativemesh.h"
 
-#include <Qt3D/qglabstractscene.h>
-#include <Qt3D/qglscenenode.h>
-#include <Qt3D/qglmaterial.h>
-#include <Qt3D/qglmaterialcollection.h>
+#include "qglabstractscene.h"
+#include "qglscenenode.h"
+#include "qglmaterial.h"
+#include "qglmaterialcollection.h"
 
 #include <QNetworkRequest>
 #include <QNetworkReply>
@@ -181,7 +181,9 @@ void QDeclarativeMesh::setSource(const QUrl& value)
 //#define QT_NO_LOCALFILE_OPTIMIZED_QML
 #ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
     if (d->data.scheme() == QLatin1String("file")) {
-        setScene(QGLAbstractScene::loadScene(d->data.toLocalFile(), QString(), d->options));
+        QGLAbstractScene *s = QGLAbstractScene::loadScene(d->data.toLocalFile(),
+                                                          QString(), d->options);
+        setScene(s);
     } else
 #endif
     {
diff --git a/src/quick3d/quick3d.pro b/src/quick3d/quick3d.pro
index 7be897bdf..aa8d6e4a6 100644
--- a/src/quick3d/quick3d.pro
+++ b/src/quick3d/quick3d.pro
@@ -13,7 +13,7 @@ QT += declarative
 package {
     target.path = $$[QT_INSTALL_LIBS]
     INSTALLS += target
-    LIBS += -L$$PWD/../threed
+    LIBS += -L$$PWD/../threed -lQt3D
     INCLUDEPATH += ../../include
     QT += opengl network
 } else {
diff --git a/util/qglinfo/qglinfo.pro b/util/qglinfo/qglinfo.pro
index 9f3c4f865..65298e898 100644
--- a/util/qglinfo/qglinfo.pro
+++ b/util/qglinfo/qglinfo.pro
@@ -8,6 +8,7 @@ SOURCES += main.cpp \
 package {
     LIBS += -L../../src/threed -lQt3D
     INCLUDEPATH += ../../include
+    QT += opengl
 } else {
     CONFIG += qt3d
     DESTDIR = ../../bin