Fixing harmattan pkgs

The fixes are going into the qtc_harmattan packaging scripts, since the
scratchbox for harmattan seems to be no longer working.  Eventually we
should remove it and put the qtc_harmattan one in instead, but for now
keep both around until its proven to work.  This is also important
because bifh might need it.

Basically - remove the translation line, fix up a lot of broken desktop
files, use a different location for the icons, and generally fix all
the problems as described in the bug.

Task-number: QTBUG-21955

Change-Id: I02cdf6c02ef9515b14384aaaf8e039a09a6cb82b
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>

134 files changed, 297 insertions, 278 deletions

diff --git a/debian/control b/debian/control
index 7d969ded..6fae1a52 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: libqt4-3d
 Section: libdevel
 Priority: extra
 Maintainer: Sarah Smith <sarah.j.smith@nokia.com>
-Build-Depends: debhelper (>= 7), libqt4-dev (>= 4.7.2~git20110208-0maemo1+0m6), cdbs (>= 0.4.87+maemo2+0m6)
+Build-Depends: debhelper (>= 7), libqtcore4 (>= 4.7.3), libqtgui4 (>= 4.7.3), libqt4-opengl (>= 4.7.3), libqt4-declarative-dev (>= 4.7.3), cdbs (>= 0.4.87+maemo2+0m6)
 Standards-Version: 3.8.4
 
 Package: libqt4-3d
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libqtcore4 (>= 4.7.3), libqtgui4  (>= 4.7.3), libqt4-opengl (>= 4.7.3), libqt4-declarative (>= 4.7.3)
 Description: Qt4 3D module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/libqt4-3d-examples.install b/debian/libqt4-3d-examples.install
index 9bc01a58..47d99cab 100644
--- a/debian/libqt4-3d-examples.install
+++ b/debian/libqt4-3d-examples.install
@@ -1,4 +1,4 @@
 usr/bin/*
 usr/share/qt4/quick3d
-usr/share/themes/base/meegotouch/icons
+usr/share/icons/hicolor/80x80/apps
 usr/share/applications
diff --git a/demos/qt3d/cubehouse/cubehouse.desktop b/demos/qt3d/cubehouse/cubehouse.desktop
index a7866e46..685e6418 100644
--- a/demos/qt3d/cubehouse/cubehouse.desktop
+++ b/demos/qt3d/cubehouse/cubehouse.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=CubeHouse
-Icon=icon-l-qt3d
-Exec=/usr/bin/cubehouse -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qt3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/cubehouse -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_cubehouse
diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro
index bf343d7e..f809849e 100644
--- a/demos/qt3d/cubehouse/cubehouse.pro
+++ b/demos/qt3d/cubehouse/cubehouse.pro
@@ -15,7 +15,8 @@ OTHER_FILES += \
     shaders/objectlineartexgen.vert
 
 OTHER_FILES += \
-    cubehouse.rc
+    cubehouse.rc \
+    cubehouse.desktop
 
 RC_FILE = cubehouse.rc
 
diff --git a/demos/qt3d/cubehouse/icon-l-qt3d.png b/demos/qt3d/cubehouse/qt3d.png
index 21ec0176..21ec0176 100644
--- a/demos/qt3d/cubehouse/icon-l-qt3d.png
+++ b/demos/qt3d/cubehouse/qt3d.png
diff --git a/demos/qt3d/pageflip/pageflip.desktop b/demos/qt3d/pageflip/pageflip.desktop
index 7be5a59e..4ee69dad 100644
--- a/demos/qt3d/pageflip/pageflip.desktop
+++ b/demos/qt3d/pageflip/pageflip.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Pageflip
-Icon=icon-l-qt3d
-Exec=/usr/bin/pageflip -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qt3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/pageflip -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_pageflip
diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro
index a42d5754..cdcfd4f9 100644
--- a/demos/qt3d/pageflip/pageflip.pro
+++ b/demos/qt3d/pageflip/pageflip.pro
@@ -10,7 +10,8 @@ HEADERS = pageflipmath_p.h
 RESOURCES = pageflip.qrc
 
 OTHER_FILES += \
-    pageflip.rc
+    pageflip.rc \
+    pageflip.desktop
 
 RC_FILE = pageflip.rc
 
diff --git a/demos/qt3d/pageflip/icon-l-qt3d.png b/demos/qt3d/pageflip/qt3d.png
index 21ec0176..21ec0176 100644
--- a/demos/qt3d/pageflip/icon-l-qt3d.png
+++ b/demos/qt3d/pageflip/qt3d.png
diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.desktop b/demos/qt3d/photobrowser3d/photobrowser3d.desktop
index 21794479..6c4085d5 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3d.desktop
+++ b/demos/qt3d/photobrowser3d/photobrowser3d.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Photobrowser 3D
-Icon=icon-l-qt3d
-Exec=/usr/bin/photobrowser3d -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qt3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/photobrowser3d -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_photobrowser3d
diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro
index 547f659a..8830bb88 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3d.pro
+++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro
@@ -65,6 +65,7 @@ symbian {
 }
 
 OTHER_FILES += \
-    photobrowser.rc
+    photobrowser.rc \
+    photobrowser3d.desktop
 
 RC_FILE = photobrowser.rc
diff --git a/demos/qt3d/photobrowser3d/icon-l-qt3d.png b/demos/qt3d/photobrowser3d/qt3d.png
index 21ec0176..21ec0176 100644
--- a/demos/qt3d/photobrowser3d/icon-l-qt3d.png
+++ b/demos/qt3d/photobrowser3d/qt3d.png
diff --git a/demos/qt3d/shapes/icon-l-qt3d.png b/demos/qt3d/shapes/qt3d.png
index 21ec0176..21ec0176 100644
--- a/demos/qt3d/shapes/icon-l-qt3d.png
+++ b/demos/qt3d/shapes/qt3d.png
diff --git a/demos/qt3d/shapes/shapes.desktop b/demos/qt3d/shapes/shapes.desktop
index 5ad3cc1d..9880fbfb 100644
--- a/demos/qt3d/shapes/shapes.desktop
+++ b/demos/qt3d/shapes/shapes.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=shapes
-Icon=icon-l-qt3d
-Exec=/usr/bin/shapes -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qt3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/shapes -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_shapes
diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro
index fb53bec4..3d6be070 100644
--- a/demos/qt3d/shapes/shapes.pro
+++ b/demos/qt3d/shapes/shapes.pro
@@ -8,6 +8,7 @@ include(../../../pkg.pri)
 SOURCES = shapes.cpp
 
 OTHER_FILES += \
-    shapes.rc
+    shapes.rc \
+    shapes.desktop
 
 RC_FILE = shapes.rc
diff --git a/demos/qt3d/teaservice/icon-l-qt3d.png b/demos/qt3d/teaservice/qt3d.png
index 21ec0176..21ec0176 100644
--- a/demos/qt3d/teaservice/icon-l-qt3d.png
+++ b/demos/qt3d/teaservice/qt3d.png
diff --git a/demos/qt3d/teaservice/teaservice.desktop b/demos/qt3d/teaservice/teaservice.desktop
index 69e1b2ac..eee50a74 100644
--- a/demos/qt3d/teaservice/teaservice.desktop
+++ b/demos/qt3d/teaservice/teaservice.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Tea Service
-Icon=icon-l-qt3d
-Exec=/usr/bin/teaservice -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qt3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/teaservice -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_teaservice
diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro
index f61b6401..94968531 100644
--- a/demos/qt3d/teaservice/teaservice.pro
+++ b/demos/qt3d/teaservice/teaservice.pro
@@ -10,7 +10,8 @@ HEADERS = meshobject.h sceneobject.h perpixeleffect.h
 RESOURCES = teaservice.qrc
 
 OTHER_FILES += \
-    teaservice.rc
+    teaservice.rc \
+    teaservice.desktop
 
 RC_FILE = teaservice.rc
 
diff --git a/demos/quick3d/flickr3d/flickr3d.desktop b/demos/quick3d/flickr3d/flickr3d.desktop
index 25b6a7c2..dc54c201 100644
--- a/demos/quick3d/flickr3d/flickr3d.desktop
+++ b/demos/quick3d/flickr3d/flickr3d.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Flickr3D
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/flickr3d -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/flickr3d -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_flickr3d
diff --git a/demos/quick3d/flickr3d/flickr3d.pro b/demos/quick3d/flickr3d/flickr3d.pro
index 996d716c..b4c84830 100644
--- a/demos/quick3d/flickr3d/flickr3d.pro
+++ b/demos/quick3d/flickr3d/flickr3d.pro
@@ -10,7 +10,8 @@ qtcAddDeployment()
 SOURCES += main.cpp
 
 OTHER_FILES += \
-    flickr3d.rc
+    flickr3d.rc \
+    flickr3d.desktop
 
 RC_FILE = flickr3d.rc
 
diff --git a/demos/quick3d/model_viewer/model_viewer.desktop b/demos/quick3d/model_viewer/model_viewer.desktop
index 165e1ac5..79350595 100644
--- a/demos/quick3d/model_viewer/model_viewer.desktop
+++ b/demos/quick3d/model_viewer/model_viewer.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Model Viewer
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/model_viewer -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/model_viewer -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_model_viewer
diff --git a/demos/quick3d/model_viewer/model_viewer.pro b/demos/quick3d/model_viewer/model_viewer.pro
index 96ab797d..2163c4f0 100644
--- a/demos/quick3d/model_viewer/model_viewer.pro
+++ b/demos/quick3d/model_viewer/model_viewer.pro
@@ -19,6 +19,7 @@ symbian {
 }
 
 OTHER_FILES += \
-    model_viewer.rc
+    model_viewer.rc \
+    model_viewer.desktop
 
 RC_FILE = model_viewer.rc
diff --git a/demos/quick3d/model_viewer/icon-l-qtquick3d.png b/demos/quick3d/model_viewer/qtquick3d.png
index 8351083e..8351083e 100644
--- a/demos/quick3d/model_viewer/icon-l-qtquick3d.png
+++ b/demos/quick3d/model_viewer/qtquick3d.png
diff --git a/demos/quick3d/robo_bounce/icon-l-qtquick3d.png b/demos/quick3d/robo_bounce/qtquick3d.png
index 8351083e..8351083e 100644
--- a/demos/quick3d/robo_bounce/icon-l-qtquick3d.png
+++ b/demos/quick3d/robo_bounce/qtquick3d.png
diff --git a/demos/quick3d/robo_bounce/robo_bounce.desktop b/demos/quick3d/robo_bounce/robo_bounce.desktop
index 1e87d94e..d21ea4f0 100644
--- a/demos/quick3d/robo_bounce/robo_bounce.desktop
+++ b/demos/quick3d/robo_bounce/robo_bounce.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=RoboBounce
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/robo_bounce -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/robo_bounce -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_robo_bounce
diff --git a/demos/quick3d/robo_bounce/robo_bounce.pro b/demos/quick3d/robo_bounce/robo_bounce.pro
index 6730f4e5..5232a715 100644
--- a/demos/quick3d/robo_bounce/robo_bounce.pro
+++ b/demos/quick3d/robo_bounce/robo_bounce.pro
@@ -8,7 +8,8 @@ include(../../../pkg.pri)
 SOURCES += main.cpp
 
 OTHER_FILES += \
-    robo_bounce.rc
+    robo_bounce.rc \
+    robo_bounce.desktop
 
 RC_FILE = robo_bounce.rc
 
diff --git a/demos/quick3d/tea_service/icon-l-qtquick3d.png b/demos/quick3d/tea_service/qtquick3d.png
index 8351083e..8351083e 100644
--- a/demos/quick3d/tea_service/icon-l-qtquick3d.png
+++ b/demos/quick3d/tea_service/qtquick3d.png
diff --git a/demos/quick3d/tea_service/tea_service.desktop b/demos/quick3d/tea_service/tea_service.desktop
index 9965faf3..d45e0812 100644
--- a/demos/quick3d/tea_service/tea_service.desktop
+++ b/demos/quick3d/tea_service/tea_service.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Tea Service
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/tea_service -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/tea_service -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_tea_service
diff --git a/demos/quick3d/tea_service/tea_service.pro b/demos/quick3d/tea_service/tea_service.pro
index d977a896..af610655 100644
--- a/demos/quick3d/tea_service/tea_service.pro
+++ b/demos/quick3d/tea_service/tea_service.pro
@@ -10,6 +10,7 @@ qtcAddDeployment()
 SOURCES += main.cpp
 
 OTHER_FILES += \
-    tea_service.rc
+    tea_service.rc \
+    tea_service.desktop
 
 RC_FILE = tea_service.rc
diff --git a/examples/qt3d/basket/basket.desktop b/examples/qt3d/basket/basket.desktop
index f1428c92..3d16c486 100644
--- a/examples/qt3d/basket/basket.desktop
+++ b/examples/qt3d/basket/basket.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Basket
-Icon=icon-l-qt3d
-Exec=/usr/bin/basket -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qt3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/basket -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_basket
diff --git a/examples/qt3d/basket/basket.pro b/examples/qt3d/basket/basket.pro
index a1df714a..f3659e8c 100644
--- a/examples/qt3d/basket/basket.pro
+++ b/examples/qt3d/basket/basket.pro
@@ -10,6 +10,7 @@ HEADERS = basketview.h basket_data.h
 RESOURCES = basket.qrc
 
 OTHER_FILES += \
-    basket.rc
+    basket.rc \
+    basket.desktop
 
 RC_FILE = basket.rc
diff --git a/examples/qt3d/basket/icon-l-qt3d.png b/examples/qt3d/basket/qt3d.png
index 21ec0176..21ec0176 100644
--- a/examples/qt3d/basket/icon-l-qt3d.png
+++ b/examples/qt3d/basket/qt3d.png
diff --git a/examples/qt3d/builder/builder.desktop b/examples/qt3d/builder/builder.desktop
index de76899f..da231ad1 100644
--- a/examples/qt3d/builder/builder.desktop
+++ b/examples/qt3d/builder/builder.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Builder
-Icon=icon-l-qt3d
-Exec=/usr/bin/builder -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qt3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/builder -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_builder
diff --git a/examples/qt3d/builder/builder.pro b/examples/qt3d/builder/builder.pro
index 29a0592a..aaa1e5d8 100644
--- a/examples/qt3d/builder/builder.pro
+++ b/examples/qt3d/builder/builder.pro
@@ -11,6 +11,7 @@ HEADERS = builder.h
 RESOURCES += builder.qrc
 
 OTHER_FILES += \
-    builder.rc
+    builder.rc \
+    builder.desktop
 
 RC_FILE = builder.rc
diff --git a/examples/qt3d/builder/icon-l-qt3d.png b/examples/qt3d/builder/qt3d.png
index 21ec0176..21ec0176 100644
--- a/examples/qt3d/builder/icon-l-qt3d.png
+++ b/examples/qt3d/builder/qt3d.png
diff --git a/examples/qt3d/cube/cube.desktop b/examples/qt3d/cube/cube.desktop
index c8a2ad0f..8610bf06 100644
--- a/examples/qt3d/cube/cube.desktop
+++ b/examples/qt3d/cube/cube.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=cube Qt3D
-Icon=icon-l-qt3d
-Exec=/usr/bin/cube -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qt3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/cube -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_cube
diff --git a/examples/qt3d/cube/cube.pro b/examples/qt3d/cube/cube.pro
index cd09d9bb..a91ed947 100644
--- a/examples/qt3d/cube/cube.pro
+++ b/examples/qt3d/cube/cube.pro
@@ -10,7 +10,8 @@ HEADERS = cubeview.h
 RESOURCES = cube.qrc
 
 OTHER_FILES += \
-    cube.rc
+    cube.rc \
+    cube.desktop
 
 RC_FILE = cube.rc
 
diff --git a/examples/qt3d/cube/icon-l-qt3d.png b/examples/qt3d/cube/qt3d.png
index 21ec0176..21ec0176 100644
--- a/examples/qt3d/cube/icon-l-qt3d.png
+++ b/examples/qt3d/cube/qt3d.png
diff --git a/examples/qt3d/cylinder/cylinder.desktop b/examples/qt3d/cylinder/cylinder.desktop
index c95c7ba0..da9d8102 100644
--- a/examples/qt3d/cylinder/cylinder.desktop
+++ b/examples/qt3d/cylinder/cylinder.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Cappucino
-Icon=icon-l-qt3d
-Exec=/usr/bin/cylinder -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qt3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/cylinder -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_cylinder
diff --git a/examples/qt3d/cylinder/cylinder.pro b/examples/qt3d/cylinder/cylinder.pro
index 7d20f8ec..229ae5b0 100644
--- a/examples/qt3d/cylinder/cylinder.pro
+++ b/examples/qt3d/cylinder/cylinder.pro
@@ -10,7 +10,8 @@ HEADERS = cylinderview.h
 RESOURCES = cylinder.qrc
 
 OTHER_FILES += \
-    cylinder.rc
+    cylinder.rc \
+    cylinder.desktop
 
 RC_FILE = cylinder.rc
 
diff --git a/examples/qt3d/cylinder/icon-l-qt3d.png b/examples/qt3d/cylinder/qt3d.png
index 21ec0176..21ec0176 100644
--- a/examples/qt3d/cylinder/icon-l-qt3d.png
+++ b/examples/qt3d/cylinder/qt3d.png
diff --git a/examples/qt3d/geometry/geometry.desktop b/examples/qt3d/geometry/geometry.desktop
index 611f6fc3..62c79a41 100644
--- a/examples/qt3d/geometry/geometry.desktop
+++ b/examples/qt3d/geometry/geometry.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=D20 Qt3D
-Icon=icon-l-qt3d
-Exec=/usr/bin/geometry -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qt3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/geometry -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_geometry
diff --git a/examples/qt3d/geometry/geometry.pro b/examples/qt3d/geometry/geometry.pro
index 970039d7..f2a8fbde 100644
--- a/examples/qt3d/geometry/geometry.pro
+++ b/examples/qt3d/geometry/geometry.pro
@@ -15,7 +15,8 @@ HEADERS = geometryview.h \
 RESOURCES = geometry.qrc
 
 OTHER_FILES += \
-    geometry.rc
+    geometry.rc \
+    geometry.desktop
 
 RC_FILE = geometry.rc
 
diff --git a/examples/qt3d/geometry/icon-l-qt3d.png b/examples/qt3d/geometry/qt3d.png
index 21ec0176..21ec0176 100644
--- a/examples/qt3d/geometry/icon-l-qt3d.png
+++ b/examples/qt3d/geometry/qt3d.png
diff --git a/examples/qt3d/graphicsview/graphicsview.desktop b/examples/qt3d/graphicsview/graphicsview.desktop
index b931c95e..3a38c3a6 100644
--- a/examples/qt3d/graphicsview/graphicsview.desktop
+++ b/examples/qt3d/graphicsview/graphicsview.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=GraphicsView
-Icon=icon-l-qt3d
-Exec=/usr/bin/graphicsview -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qt3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/graphicsview -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_graphicsview
diff --git a/examples/qt3d/graphicsview/graphicsview.pro b/examples/qt3d/graphicsview/graphicsview.pro
index 120dcce1..48523320 100644
--- a/examples/qt3d/graphicsview/graphicsview.pro
+++ b/examples/qt3d/graphicsview/graphicsview.pro
@@ -29,7 +29,8 @@ RESOURCES = \
     graphicsview.qrc
 
 OTHER_FILES += \
-    graphicsview.rc
+    graphicsview.rc \
+    graphicsview.desktop
 
 RC_FILE = graphicsview.rc
 
diff --git a/examples/qt3d/graphicsview/icon-l-qt3d.png b/examples/qt3d/graphicsview/qt3d.png
index 21ec0176..21ec0176 100644
--- a/examples/qt3d/graphicsview/icon-l-qt3d.png
+++ b/examples/qt3d/graphicsview/qt3d.png
diff --git a/examples/qt3d/nesting/nesting.desktop b/examples/qt3d/nesting/nesting.desktop
index 1c601885..85668cc3 100644
--- a/examples/qt3d/nesting/nesting.desktop
+++ b/examples/qt3d/nesting/nesting.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Nesting
-Icon=icon-l-qt3d
-Exec=/usr/bin/nesting -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qt3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/nesting -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_nesting
diff --git a/examples/qt3d/nesting/nesting.pro b/examples/qt3d/nesting/nesting.pro
index 794d178c..7725c2f3 100644
--- a/examples/qt3d/nesting/nesting.pro
+++ b/examples/qt3d/nesting/nesting.pro
@@ -10,7 +10,8 @@ HEADERS = cubeview.h
 RESOURCES = nesting.qrc
 
 OTHER_FILES += \
-    nesting.rc
+    nesting.rc \
+    nesting.desktop
 
 RC_FILE = nesting.rc
 
diff --git a/examples/qt3d/nesting/icon-l-qt3d.png b/examples/qt3d/nesting/qt3d.png
index 21ec0176..21ec0176 100644
--- a/examples/qt3d/nesting/icon-l-qt3d.png
+++ b/examples/qt3d/nesting/qt3d.png
diff --git a/examples/qt3d/solarsystem/icon-l-qt3d.png b/examples/qt3d/solarsystem/qt3d.png
index 21ec0176..21ec0176 100644
--- a/examples/qt3d/solarsystem/icon-l-qt3d.png
+++ b/examples/qt3d/solarsystem/qt3d.png
diff --git a/examples/qt3d/solarsystem/solarsystem.desktop b/examples/qt3d/solarsystem/solarsystem.desktop
index f1428c92..3d16c486 100644
--- a/examples/qt3d/solarsystem/solarsystem.desktop
+++ b/examples/qt3d/solarsystem/solarsystem.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Basket
-Icon=icon-l-qt3d
-Exec=/usr/bin/basket -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qt3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/basket -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_basket
diff --git a/examples/qt3d/solarsystem/solarsystem.pro b/examples/qt3d/solarsystem/solarsystem.pro
index cc0ce69c..757d3753 100644
--- a/examples/qt3d/solarsystem/solarsystem.pro
+++ b/examples/qt3d/solarsystem/solarsystem.pro
@@ -19,7 +19,8 @@ OTHER_FILES += \
     resources/solar.vsh
 
 OTHER_FILES += \
-    solarsystem.rc
+    solarsystem.rc \
+    solarsystem.desktop
 
 RC_FILE = solarsystem.rc
 
diff --git a/examples/qt3d/tank/icon-l-qt3d.png b/examples/qt3d/tank/qt3d.png
index 21ec0176..21ec0176 100644
--- a/examples/qt3d/tank/icon-l-qt3d.png
+++ b/examples/qt3d/tank/qt3d.png
diff --git a/examples/qt3d/tank/tank.desktop b/examples/qt3d/tank/tank.desktop
index 8f77e213..17ebe2c6 100644
--- a/examples/qt3d/tank/tank.desktop
+++ b/examples/qt3d/tank/tank.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Tank
-Icon=icon-l-qt3d
-Exec=/usr/bin/tank -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qt3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/invoker --type=d -s /usr/bin/tank -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_tank
diff --git a/examples/qt3d/tank/tank.pro b/examples/qt3d/tank/tank.pro
index 7349d900..fa622cdf 100644
--- a/examples/qt3d/tank/tank.pro
+++ b/examples/qt3d/tank/tank.pro
@@ -15,6 +15,7 @@ HEADERS  += tankview.h \
     quadplane.h
 
 OTHER_FILES += \
-    tank.rc
+    tank.rc \
+    tank.desktop
 
 RC_FILE = tank.rc
diff --git a/examples/qt3d/teapot/icon-l-qt3d.png b/examples/qt3d/teapot/qt3d.png
index 21ec0176..21ec0176 100644
--- a/examples/qt3d/teapot/icon-l-qt3d.png
+++ b/examples/qt3d/teapot/qt3d.png
diff --git a/examples/qt3d/teapot/teapot.desktop b/examples/qt3d/teapot/teapot.desktop
index c4440c9d..b28a3dac 100644
--- a/examples/qt3d/teapot/teapot.desktop
+++ b/examples/qt3d/teapot/teapot.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=teapot Qt3D
-Icon=icon-l-qt3d
-Exec=/usr/bin/teapot -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qt3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/teapot -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_teapot
diff --git a/examples/qt3d/teapot/teapot.pro b/examples/qt3d/teapot/teapot.pro
index c3c584f6..907db547 100644
--- a/examples/qt3d/teapot/teapot.pro
+++ b/examples/qt3d/teapot/teapot.pro
@@ -9,6 +9,7 @@ SOURCES = teapotview.cpp main.cpp
 HEADERS = teapotview.h
 
 OTHER_FILES += \
-    teapot.rc
+    teapot.rc \
+    teapot.desktop
 
 RC_FILE = teapot.rc
diff --git a/examples/quick3d/basket/basket.pro b/examples/quick3d/basket/basket.pro
index bcc5cf76..15db3ed5 100644
--- a/examples/quick3d/basket/basket.pro
+++ b/examples/quick3d/basket/basket.pro
@@ -8,7 +8,8 @@ include(../../../pkg.pri)
 SOURCES += main.cpp
 
 OTHER_FILES += \
-    basket_qml.rc
+    basket_qml.rc \
+    basket_qml.desktop
 
 RC_FILE = basket_qml.rc
 
diff --git a/examples/quick3d/basket/basket_qml.desktop b/examples/quick3d/basket/basket_qml.desktop
index 8dfd6fcc..76b06cd6 100644
--- a/examples/quick3d/basket/basket_qml.desktop
+++ b/examples/quick3d/basket/basket_qml.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Basket
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/basket_qml -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/basket_qml -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_basket_qml
diff --git a/examples/quick3d/basket/icon-l-qtquick3d.png b/examples/quick3d/basket/qtquick3d.png
index 8351083e..8351083e 100644
--- a/examples/quick3d/basket/icon-l-qtquick3d.png
+++ b/examples/quick3d/basket/qtquick3d.png
diff --git a/examples/quick3d/cube/cube.desktop b/examples/quick3d/cube/cube.desktop
deleted file mode 100644
index 6f18a8c2..00000000
--- a/examples/quick3d/cube/cube.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[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
diff --git a/examples/quick3d/cube/cube.pro b/examples/quick3d/cube/cube.pro
index 44b3e7dc..82101573 100644
--- a/examples/quick3d/cube/cube.pro
+++ b/examples/quick3d/cube/cube.pro
@@ -10,6 +10,7 @@ qtcAddDeployment()
 SOURCES += main.cpp
 
 OTHER_FILES += \
-    cube_qml.rc
+    cube_qml.rc \
+    cube_qml.desktop
 
 RC_FILE = cube_qml.rc
diff --git a/examples/quick3d/cube/cube_qml.desktop b/examples/quick3d/cube/cube_qml.desktop
new file mode 100644
index 00000000..2872740c
--- /dev/null
+++ b/examples/quick3d/cube/cube_qml.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Cube
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/cube_qml -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_cube_qml
diff --git a/examples/quick3d/cube/icon-l-qtquick3d.png b/examples/quick3d/cube/qtquick3d.png
index 8351083e..8351083e 100644
--- a/examples/quick3d/cube/icon-l-qtquick3d.png
+++ b/examples/quick3d/cube/qtquick3d.png
diff --git a/examples/quick3d/forest/forest.desktop b/examples/quick3d/forest/forest.desktop
deleted file mode 100644
index 0170bc65..00000000
--- a/examples/quick3d/forest/forest.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[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
diff --git a/examples/quick3d/forest/forest.pro b/examples/quick3d/forest/forest.pro
index 6c11e948..6c60025a 100644
--- a/examples/quick3d/forest/forest.pro
+++ b/examples/quick3d/forest/forest.pro
@@ -8,7 +8,8 @@ include(../../../pkg.pri)
 SOURCES += main.cpp
 
 OTHER_FILES += \
-    forest.rc
+    forest.rc \
+    forest_qml.desktop
 
 RC_FILE = forest.rc
 
diff --git a/examples/quick3d/forest/forest_qml.desktop b/examples/quick3d/forest/forest_qml.desktop
new file mode 100644
index 00000000..0c27d6ed
--- /dev/null
+++ b/examples/quick3d/forest/forest_qml.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Forest
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/forest_qml -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_forest
diff --git a/examples/quick3d/forest/icon-l-qtquick3d.png b/examples/quick3d/forest/qtquick3d.png
index 8351083e..8351083e 100644
--- a/examples/quick3d/forest/icon-l-qtquick3d.png
+++ b/examples/quick3d/forest/qtquick3d.png
diff --git a/examples/quick3d/lander/lander.desktop b/examples/quick3d/lander/lander.desktop
index 81f5ed43..9020fea1 100644
--- a/examples/quick3d/lander/lander.desktop
+++ b/examples/quick3d/lander/lander.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Lunar Lander
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/lander -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/lander -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_lander
diff --git a/examples/quick3d/lander/lander.pro b/examples/quick3d/lander/lander.pro
index 38062777..6594bf05 100644
--- a/examples/quick3d/lander/lander.pro
+++ b/examples/quick3d/lander/lander.pro
@@ -16,6 +16,7 @@ symbian {
 }
 
 OTHER_FILES += \
-    lander.rc
+    lander.rc \
+    lander.desktop
 
 RC_FILE = lander.rc
diff --git a/examples/quick3d/lander/icon-l-qtquick3d.png b/examples/quick3d/lander/qtquick3d.png
index 8351083e..8351083e 100644
--- a/examples/quick3d/lander/icon-l-qtquick3d.png
+++ b/examples/quick3d/lander/qtquick3d.png
diff --git a/examples/quick3d/matrix_animation/matrix_animation.desktop b/examples/quick3d/matrix_animation/matrix_animation.desktop
index d118dc0d..9a940637 100644
--- a/examples/quick3d/matrix_animation/matrix_animation.desktop
+++ b/examples/quick3d/matrix_animation/matrix_animation.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Matrix
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/matrix_animation -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/matrix_animation -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_matrix_animation
diff --git a/examples/quick3d/matrix_animation/matrix_animation.pro b/examples/quick3d/matrix_animation/matrix_animation.pro
index 4cbd42e2..48f21182 100644
--- a/examples/quick3d/matrix_animation/matrix_animation.pro
+++ b/examples/quick3d/matrix_animation/matrix_animation.pro
@@ -10,7 +10,8 @@ qtcAddDeployment()
 SOURCES += main.cpp
 
 OTHER_FILES += \
-    matrix_animation.rc
+    matrix_animation.rc \
+    matrix_animation.desktop
 
 RC_FILE = matrix_animation.rc
 
diff --git a/examples/quick3d/matrix_animation/icon-l-qtquick3d.png b/examples/quick3d/matrix_animation/qtquick3d.png
index 8351083e..8351083e 100644
--- a/examples/quick3d/matrix_animation/icon-l-qtquick3d.png
+++ b/examples/quick3d/matrix_animation/qtquick3d.png
diff --git a/examples/quick3d/modelview3d/modelview3d.desktop b/examples/quick3d/modelview3d/modelview3d.desktop
deleted file mode 100644
index b4db60d4..00000000
--- a/examples/quick3d/modelview3d/modelview3d.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=ModelView3D
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/modelview3d -fullscreen
-OnlyShowIn=X-MeeGo;
-X-MeeGo-Logical-Id=qtn_comm_appname_modelview3d
diff --git a/examples/quick3d/modelview3d/modelview3d.pro b/examples/quick3d/modelview3d/modelview3d.pro
index 3db1a4b9..578244df 100644
--- a/examples/quick3d/modelview3d/modelview3d.pro
+++ b/examples/quick3d/modelview3d/modelview3d.pro
@@ -10,6 +10,7 @@ qtcAddDeployment()
 SOURCES += main.cpp
 
 OTHER_FILES += \
-    modelview3d_qml.rc
+    modelview3d_qml.rc \
+    modelview3d_qml.desktop
 
 RC_FILE = modelview3d_qml.rc
diff --git a/examples/quick3d/modelview3d/modelview3d_qml.desktop b/examples/quick3d/modelview3d/modelview3d_qml.desktop
new file mode 100644
index 00000000..2a47edef
--- /dev/null
+++ b/examples/quick3d/modelview3d/modelview3d_qml.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=ModelView3D
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/modelview3d_qml -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_modelview3d
diff --git a/examples/quick3d/modelview3d/icon-l-qtquick3d.png b/examples/quick3d/modelview3d/qtquick3d.png
index 8351083e..8351083e 100644
--- a/examples/quick3d/modelview3d/icon-l-qtquick3d.png
+++ b/examples/quick3d/modelview3d/qtquick3d.png
diff --git a/examples/quick3d/monkeygod/monkeygod.desktop b/examples/quick3d/monkeygod/monkeygod.desktop
index f7a27456..c5a8e49f 100644
--- a/examples/quick3d/monkeygod/monkeygod.desktop
+++ b/examples/quick3d/monkeygod/monkeygod.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=monkeygod
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/monkeygod -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/monkeygod -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_monkeygod
diff --git a/examples/quick3d/monkeygod/monkeygod.pro b/examples/quick3d/monkeygod/monkeygod.pro
index a28ea392..8437ae93 100644
--- a/examples/quick3d/monkeygod/monkeygod.pro
+++ b/examples/quick3d/monkeygod/monkeygod.pro
@@ -16,6 +16,7 @@ symbian {
 }
 
 OTHER_FILES += \
-    monkeygod.rc
+    monkeygod.rc \
+    monkeygod.desktop
 
 RC_FILE = monkeygod.rc
diff --git a/examples/quick3d/monkeygod/icon-l-qtquick3d.png b/examples/quick3d/monkeygod/qtquick3d.png
index 8351083e..8351083e 100644
--- a/examples/quick3d/monkeygod/icon-l-qtquick3d.png
+++ b/examples/quick3d/monkeygod/qtquick3d.png
diff --git a/examples/quick3d/moon/moon.desktop b/examples/quick3d/moon/moon.desktop
index 14e498d5..6eae4393 100644
--- a/examples/quick3d/moon/moon.desktop
+++ b/examples/quick3d/moon/moon.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
 Name=Moon
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/moon -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /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 7236b389..18ecaa4a 100644
--- a/examples/quick3d/moon/moon.pro
+++ b/examples/quick3d/moon/moon.pro
@@ -10,7 +10,8 @@ qtcAddDeployment()
 SOURCES += main.cpp
 
 OTHER_FILES += \
-    moon.rc
+    moon.rc \
+    moon.desktop
 
 RC_FILE = moon.rc
 
diff --git a/examples/quick3d/moon/icon-l-qtquick3d.png b/examples/quick3d/moon/qtquick3d.png
index 8351083e..8351083e 100644
--- a/examples/quick3d/moon/icon-l-qtquick3d.png
+++ b/examples/quick3d/moon/qtquick3d.png
diff --git a/examples/quick3d/photoroom/photoroom.desktop b/examples/quick3d/photoroom/photoroom.desktop
index efb7115f..c3b8c11f 100644
--- a/examples/quick3d/photoroom/photoroom.desktop
+++ b/examples/quick3d/photoroom/photoroom.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=PhotoRoom
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/photoroom -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/photoroom -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_photoroom
diff --git a/examples/quick3d/photoroom/photoroom.pro b/examples/quick3d/photoroom/photoroom.pro
index 80532a17..fc54f9a0 100644
--- a/examples/quick3d/photoroom/photoroom.pro
+++ b/examples/quick3d/photoroom/photoroom.pro
@@ -17,6 +17,7 @@ symbian {
 }
 
 OTHER_FILES += \
-    photoroom.rc
+    photoroom.rc \
+    photoroom.desktop
 
 RC_FILE = photoroom.rc
diff --git a/examples/quick3d/photoroom/icon-l-qtquick3d.png b/examples/quick3d/photoroom/qtquick3d.png
index 8351083e..8351083e 100644
--- a/examples/quick3d/photoroom/icon-l-qtquick3d.png
+++ b/examples/quick3d/photoroom/qtquick3d.png
diff --git a/examples/quick3d/shaders/icon-l-qtquick3d.png b/examples/quick3d/shaders/qtquick3d.png
index 8351083e..8351083e 100644
--- a/examples/quick3d/shaders/icon-l-qtquick3d.png
+++ b/examples/quick3d/shaders/qtquick3d.png
diff --git a/examples/quick3d/shaders/shaders.desktop b/examples/quick3d/shaders/shaders.desktop
index 9be246e6..a9b22425 100644
--- a/examples/quick3d/shaders/shaders.desktop
+++ b/examples/quick3d/shaders/shaders.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Shaders
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/shaders -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/shaders -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_shaders
diff --git a/examples/quick3d/shaders/shaders.pro b/examples/quick3d/shaders/shaders.pro
index 00281f07..f3076572 100644
--- a/examples/quick3d/shaders/shaders.pro
+++ b/examples/quick3d/shaders/shaders.pro
@@ -19,6 +19,7 @@ symbian {
 }
 
 OTHER_FILES += \
-    shaders.rc
+    shaders.rc \
+    shaders.desktop
 
 RC_FILE = shaders.rc
diff --git a/examples/quick3d/solarsystem_qml/icon-l-qtquick3d.png b/examples/quick3d/solarsystem_qml/qtquick3d.png
index 8351083e..8351083e 100644
--- a/examples/quick3d/solarsystem_qml/icon-l-qtquick3d.png
+++ b/examples/quick3d/solarsystem_qml/qtquick3d.png
diff --git a/examples/quick3d/solarsystem_qml/solarsystem_qml.desktop b/examples/quick3d/solarsystem_qml/solarsystem_qml.desktop
index 9ef9cc33..8fecffe2 100644
--- a/examples/quick3d/solarsystem_qml/solarsystem_qml.desktop
+++ b/examples/quick3d/solarsystem_qml/solarsystem_qml.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=Cube
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/solarsystem_qml -fullscreen
+Name=Solar System
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/solarsystem_qml -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_solarsystem_qml
diff --git a/examples/quick3d/solarsystem_qml/solarsystem_qml.pro b/examples/quick3d/solarsystem_qml/solarsystem_qml.pro
index 67f9313c..cdfd68cc 100644
--- a/examples/quick3d/solarsystem_qml/solarsystem_qml.pro
+++ b/examples/quick3d/solarsystem_qml/solarsystem_qml.pro
@@ -10,6 +10,7 @@ qtcAddDeployment()
 SOURCES += main.cpp
 
 OTHER_FILES += \
-    solarsystem_qml.rc
+    solarsystem_qml.rc \
+    solarsystem_qml.desktop
 
 RC_FILE = solarsystem_qml.rc
diff --git a/examples/quick3d/sphere/icon-l-qtquick3d.png b/examples/quick3d/sphere/qtquick3d.png
index 8351083e..8351083e 100644
--- a/examples/quick3d/sphere/icon-l-qtquick3d.png
+++ b/examples/quick3d/sphere/qtquick3d.png
diff --git a/examples/quick3d/sphere/sphere.desktop b/examples/quick3d/sphere/sphere.desktop
index f805f78e..030ee54e 100644
--- a/examples/quick3d/sphere/sphere.desktop
+++ b/examples/quick3d/sphere/sphere.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Sphere
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/sphere -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/sphere -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_sphere
diff --git a/examples/quick3d/sphere/sphere.pro b/examples/quick3d/sphere/sphere.pro
index 02bf2f65..74604c30 100644
--- a/examples/quick3d/sphere/sphere.pro
+++ b/examples/quick3d/sphere/sphere.pro
@@ -10,6 +10,7 @@ qtcAddDeployment()
 SOURCES += main.cpp
 
 OTHER_FILES += \
-    sphere.rc
+    sphere.rc \
+    sphere.desktop
 
 RC_FILE = sphere.rc
diff --git a/pkg.pri b/pkg.pri
index d5051755..61db7a4e 100644
--- a/pkg.pri
+++ b/pkg.pri
@@ -8,17 +8,19 @@ qtc_harmattan {
     CONFIG += package
     QMAKE_CXXFLAGS += -Wno-psabi
     # The Qt SDK / Qt Creator harmattan integration needs some special treatment
-    QT3D_INSTALL_BINS = /bin
+    QT3D_INSTALL_BINS = /usr/bin
     QT3D_INSTALL_LIBS = /usr/lib
     QT3D_INSTALL_PLUGINS = /usr/lib/qt4/plugins
     QT3D_INSTALL_IMPORTS = /usr/lib/qt4/imports
     QT3D_INSTALL_DATA = /usr/share/qt4
+    QT3D_INSTALL_HEADERS = /usr/include/qt4
 } else {
     QT3D_INSTALL_BINS = $$[QT_INSTALL_BINS]
     QT3D_INSTALL_LIBS = $$[QT_INSTALL_LIBS]
     QT3D_INSTALL_PLUGINS = $$[QT_INSTALL_PLUGINS]
     QT3D_INSTALL_IMPORTS = $$[QT_INSTALL_IMPORTS]
     QT3D_INSTALL_DATA = $$[QT_INSTALL_DATA]
+    QT3D_INSTALL_HEADERS = $$[QT_INSTALL_HEADERS]
 }
 
 qt3dquick_deploy_pkg {
@@ -43,7 +45,7 @@ qt3dquick_deploy_pkg {
         }
         QT += declarative opengl
 
-        maemo: icons.files = icon-l-qtquick3d.png
+        maemo: icons.files = qtquick3d.png
     } else {
         CONFIG += qt3dquick
     }
@@ -69,7 +71,7 @@ qt3d_deploy_pkg {
         }
         QT += opengl
 
-        !qt3dquick_deploy_pkg: maemo: icons.files = icon-l-qt3d.png
+        !qt3dquick_deploy_pkg: maemo: icons.files = qt3d.png
     } else {
         CONFIG += qt3d
     }
@@ -82,7 +84,7 @@ contains(TEMPLATE, app) {
             applnk.path = /usr/share/applications
 
             # icons.files is set by qt3dquick_pkg_dep.pri or qt3d_pkg_dep.pri
-            icons.path = /usr/share/themes/base/meegotouch/icons
+            icons.path = /usr/share/icons/hicolor/80x80/apps
             INSTALLS += icons applnk
 
             target.path += $$QT3D_INSTALL_BINS
@@ -253,7 +255,6 @@ defineTest(qtcAddDeployment) {
                 QMAKE_EXTRA_TARGETS += first copydeploymentfolders
             }
         }
-#        installPrefix = /opt/$${TARGET}
         for(deploymentfolder, DEPLOYMENTFOLDERS) {
             item = item$${deploymentfolder}
             itemfiles = $${item}.files
@@ -264,14 +265,6 @@ defineTest(qtcAddDeployment) {
             export($$itempath)
             INSTALLS += $$item
         }
-        target.path = $${installPrefix}/bin
-        # In the specific case of packages for a Maemo devices, binaries can't
-        # be installed into /bin, so use /usr/bin instead
-        maemo {
-            package {
-                target.path = /usr/bin
-            }
-        }
 
         export(icon.files)
         export(icon.path)
diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog
index 9829c5d5..15030940 100644
--- a/qtc_packaging/debian_harmattan/changelog
+++ b/qtc_packaging/debian_harmattan/changelog
@@ -1,5 +1,5 @@
-quick3d (0.0.1) unstable; urgency=low
+libqt4-3d (1.0-rc) unstable; urgency=low
 
-  * Initial Release.
+  * Candidate for 1.0 Release.
 
- -- unknown <sarasmit@unknown>  Wed, 29 Jun 2011 16:52:34 +1000
+ -- Sarah Smith <sarah.j.smith@nokia.com>  Thu, 24 Nov 2011 16:00:00 +1000
diff --git a/qtc_packaging/debian_harmattan/changelog.old b/qtc_packaging/debian_harmattan/changelog.old
deleted file mode 100644
index 3a4ac83d..00000000
--- a/qtc_packaging/debian_harmattan/changelog.old
+++ /dev/null
@@ -1,5 +0,0 @@
-libqt4-3d (1.0-tp1) unstable; urgency=low
-
-  * Technology Preview 1 Release.
-
- -- Sarah Smith <sarah.j.smith@nokia.com>  Wed, 06 Apr 2011 16:30:00 +1000
diff --git a/qtc_packaging/debian_harmattan/control b/qtc_packaging/debian_harmattan/control
index b6ef3409..d4f57b71 100644
--- a/qtc_packaging/debian_harmattan/control
+++ b/qtc_packaging/debian_harmattan/control
@@ -1,14 +1,35 @@
-Source: quick3d
-Section: user/other
-Priority: optional
+Source: libqt4-3d
+Section: libdevel
+Priority: extra
 Maintainer: Sarah Smith <sarah.j.smith@nokia.com>
 Build-Depends: debhelper (>= 5), libqt4-dev
 Standards-Version: 3.7.3
 Homepage: http://doc.qt.nokia.com/qt-quick3d-snapshot/
 
-Package: quick3d
+Package: libqt4-3d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: <insert up to 60 chars description>
+Description: Qt4 3D module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The Qt3d module contains functionality for 3D scenes and UIs.
+
+Package: libqt4-3d-examples
+Architecture: any
+Depends: libqt4-3d (= ${binary:Version})
+Description: Qt 4 3d module examples
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains examples and demos for the Qt3d module
+
+Package: libqt4-3d-dev
+Architecture: any
+Depends: libqt4-3d (= ${binary:Version})
+Description: Qt 4 3d module development files
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the development headers for the Qt3d moduleescription: <insert up to 60 chars description>
  Qt Quick 3D lets you use QML to write 3D (OpenGL) apps.
-XSBC-Maemo-Display-Name: quick3d
diff --git a/qtc_packaging/debian_harmattan/control.old b/qtc_packaging/debian_harmattan/control.old
deleted file mode 100644
index 7d969ded..00000000
--- a/qtc_packaging/debian_harmattan/control.old
+++ /dev/null
@@ -1,33 +0,0 @@
-Source: libqt4-3d
-Section: libdevel
-Priority: extra
-Maintainer: Sarah Smith <sarah.j.smith@nokia.com>
-Build-Depends: debhelper (>= 7), libqt4-dev (>= 4.7.2~git20110208-0maemo1+0m6), cdbs (>= 0.4.87+maemo2+0m6)
-Standards-Version: 3.8.4
-
-Package: libqt4-3d
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt4 3D module
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- The Qt3d module contains functionality for 3D scenes and UIs.
-
-Package: libqt4-3d-examples
-Architecture: any
-Depends: libqt4-3d (= ${binary:Version})
-Description: Qt 4 3d module examples
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains examples and demos for the Qt3d module
-
-Package: libqt4-3d-dev
-Architecture: any
-Depends: libqt4-3d (= ${binary:Version})
-Description: Qt 4 3d module development files
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the development headers for the Qt3d module
diff --git a/qtc_packaging/debian_harmattan/libqt4-3d-examples.install b/qtc_packaging/debian_harmattan/libqt4-3d-examples.install
index 9bc01a58..47d99cab 100644
--- a/qtc_packaging/debian_harmattan/libqt4-3d-examples.install
+++ b/qtc_packaging/debian_harmattan/libqt4-3d-examples.install
@@ -1,4 +1,4 @@
 usr/bin/*
 usr/share/qt4/quick3d
-usr/share/themes/base/meegotouch/icons
+usr/share/icons/hicolor/80x80/apps
 usr/share/applications
diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules
index b9f7b7dc..72f257ef 100644..100755
--- a/qtc_packaging/debian_harmattan/rules
+++ b/qtc_packaging/debian_harmattan/rules
@@ -1,34 +1,74 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# This rules file is for new Nokia devices using maemo6/meego.
+# For fremantle / N900 see the file devices/maemo5/debian/rules.
+# For ubuntu desktop see the file devices/ubuntu/debian/rules.
+
+# To build using this rules file, the Madde environment is needed.  This ships
+# (for example) with the QtSDK.
+#
+# This file ships ready to use with Qt Creator.  To use it from the command line
+# uncomment the lines below which say # Uncomment for use without Qt Creator
+# and then follow these steps:
+#
+# ### Step 1: set up the build directory - DO NOT CD INTO IT YET!
+# mkdir -p ~/build/harmattan/pkg
+# cd ~/build/harmattan
+#
+# ### Step 2: set up to use the Madde build environment - eg if Madde is in your home under QtSDK:
+# export MADDE=$HOME/QtSDK/Madde
+# export PATH=$MADDE/targets/harmattan-platform-api/bin:$MADDE/bin:$MADDE/madlib:$MADDE/madbin:$PATH
+# export PERL5LIB=$MADDE/madlib/perl5
+# export SYSROOT_DIR=$MADDE/sysroots/harmattan-meego-arm-sysroot-1122-slim
+#
+# ### Step 3: copy all the stuff across - cannot shadow build (probably don't want git)
+# (cd ~/depot/qt/quick3d && tar cf - --exclude-vcs .)|(cd pkg && tar xf -)
+# cd pkg
+# cp -f -v qtc_packaging/debian_harmattan/* debian/.
+#
+# ### Step 4: actually do the build, using lots of cores if available
+# export DEB_BUILD_OPTIONS="parallel=4"
+# dpkg-buildpackage -b
+#
+#
+# This rules file should use the control and *.install files (driven by the dh_install cmd below)
+# to actually build 3 seperate debian packages:
+#    libqt4-3d  -- Qt3D "run time" with C++ libs and QML imports
+#    libqt4-3d-dev  -- Qt3D development files - eg headers and .prf files
+#    libqt4-3d-examples  -- installed Qt3D examples incl desktop files to run on device
+
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
+# Find out how many parallel threads to run
+TMP_BUILD_OPTS = $(subst $(comma),$(space),$(DEB_BUILD_OPTIONS))
+ifneq (,$(filter parallel=%,$(TMP_BUILD_OPTS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(TMP_BUILD_OPTS)))
+	PARALLEL_MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+DEB_MAKE_INVOKE := $(MAKE) $(PARALLEL_MAKEFLAGS)
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	# qmake PREFIX=/usr# Uncomment this line for use without Qt Creator
-
+	qmake -spec linux-g++-maemo quick3d.pro CONFIG+=qtc_harmattan # Uncomment this line for use without Qt Creator
 	touch configure-stamp
 
-
 build: build-stamp
 
 build-stamp: configure-stamp  
 	dh_testdir
 
 	# Add here commands to compile the package.
-	# $(MAKE) # Uncomment this line for use without Qt Creator
+	$(DEB_MAKE_INVOKE) # Uncomment this line for use without Qt Creator
 	#docbook-to-man debian/quick3d.sgml > quick3d.1
 
 	touch $@
 
-clean: 
+clean: configure-stamp
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -44,8 +84,8 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/quick3d.
-	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/quick3d install
+	# Add here commands to install the package into debian/tmp.
+	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/tmp install
 
 
 # Build architecture-independent files here.
@@ -59,7 +99,7 @@ binary-arch: build install
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installexamples
-#	dh_install
+	dh_install --sourcedir=debian/tmp
 #	dh_installmenu
 #	dh_installdebconf	
 #	dh_installlogrotate
diff --git a/qtc_packaging/debian_harmattan/rules.old b/qtc_packaging/debian_harmattan/rules.old
deleted file mode 100644
index a09b5b39..00000000
--- a/qtc_packaging/debian_harmattan/rules.old
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# This rules file is for new Nokia devices using maemo6/meego.
-# For fremantle / N900 see the file devices/maemo5/debian/rules.
-# For ubuntu desktop see the file devices/ubuntu/debian/rules.
-
-# To build using this rules file:
-# #
-# ### install debian packaging stuff if not already present:
-# sudo apt-get install dpkg-dev debhelper cdbs
-#
-# ### set up the build directory with version number - DO NOT CD INTO IT YET!
-# mkdir quick3d-tp1
-#
-# ### copy all the stuff across - cannot shadow build (probably don't want git)
-# (cd ~/depot/qt/quick3d && tar cf - --exclude-vcs .)|(cd quick3d-tp1 && tar xf -)
-#
-# ### if the qmake in the $PATH is not the Qt you want to use
-# ### you can use a binary package or a Qt built from source (even if its installed with
-# ### "make install") as long as it has declarative & opengl
-# # export PATH=/usr/local/qt/%VERSION%/bin:$PATH
-#
-# cd quick3d-tp1
-# export DEB_BUILD_OPTIONS="parallel=4"
-# dpkg-buildpackage -b
-
-# Uncomment this to turn on verbose mode.
-export DH_OPTIONS=-v
-export DH_VERBOSE=1
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-
-# Find out how many parallel threads to run 
-TMP_BUILD_OPTS = $(subst $(comma),$(space),$(DEB_BUILD_OPTIONS))
-ifneq (,$(filter parallel=%,$(TMP_BUILD_OPTS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(TMP_BUILD_OPTS)))
-	PARALLEL_MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-DEB_MAKE_INVOKE := $(MAKE) $(PARALLEL_MAKEFLAGS)
-DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-
-common-configure-arch::
-	qmake -spec linux-g++-maemo quick3d.pro CONFIG+=maemo CONFIG+=package
diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro
index 1251d361..9c6eded6 100644
--- a/src/imports/shapes/shapes.pro
+++ b/src/imports/shapes/shapes.pro
@@ -56,12 +56,18 @@ QML_INFRA_FILES += \
     teapot.bez
 # see the file README.library_xml for more on library.xml
 
-copyqmlinfra.input = QML_INFRA_FILES
-copyqmlinfra.output = $$[QT_INSTALL_IMPORTS]/Qt3D/Shapes/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
-copyqmlinfra.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-copyqmlinfra.CONFIG += no_link_no_clean
-copyqmlinfra.variable_out = PRE_TARGETDEPS
-!package: QMAKE_EXTRA_COMPILERS += copyqmlinfra
+package {
+    copyqmlinfra_install.files = $$QML_INFRA_FILES
+    copyqmlinfra_install.path = $$QT3D_INSTALL_IMPORTS/Qt3D/Shapes
+    INSTALLS += copyqmlinfra_install
+} else {
+    copyqmlinfra.input = QML_INFRA_FILES
+    copyqmlinfra.output = $$[QT_INSTALL_IMPORTS]/Qt3D/Shapes/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
+    copyqmlinfra.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+    copyqmlinfra.CONFIG += no_link_no_clean
+    copyqmlinfra.variable_out = PRE_TARGETDEPS
+    QMAKE_EXTRA_COMPILERS += copyqmlinfra
+}
 
 OTHER_FILES += \
     README.plugins_types \
diff --git a/src/imports/threed/threed.pro b/src/imports/threed/threed.pro
index 3455adee..c674d22e 100644
--- a/src/imports/threed/threed.pro
+++ b/src/imports/threed/threed.pro
@@ -54,13 +54,18 @@ QML_INFRA_FILES += \
     library.xml \
     plugins.qmltypes
 
-copyqmlinfra.input = QML_INFRA_FILES
-copyqmlinfra.output = $$[QT_INSTALL_IMPORTS]/Qt3D/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
-copyqmlinfra.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-copyqmlinfra.CONFIG += no_link_no_clean
-copyqmlinfra.variable_out = PRE_TARGETDEPS
-!package: QMAKE_EXTRA_COMPILERS += copyqmlinfra
-
+package {
+    copyqmlinfra_install.files = $$QML_INFRA_FILES
+    copyqmlinfra_install.path = $$QT3D_INSTALL_IMPORTS/Qt3D
+    INSTALLS += copyqmlinfra_install
+} else {
+    copyqmlinfra.input = QML_INFRA_FILES
+    copyqmlinfra.output = $$[QT_INSTALL_IMPORTS]/Qt3D/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
+    copyqmlinfra.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+    copyqmlinfra.CONFIG += no_link_no_clean
+    copyqmlinfra.variable_out = PRE_TARGETDEPS
+    QMAKE_EXTRA_COMPILERS += copyqmlinfra
+}
 
 OTHER_FILES += \
     README.plugins_types \
diff --git a/src/quick3d/quick3d.pro b/src/quick3d/quick3d.pro
index 340e902b..d4b005f6 100644
--- a/src/quick3d/quick3d.pro
+++ b/src/quick3d/quick3d.pro
@@ -72,13 +72,13 @@ DEFINES += QT_BUILD_QT3D_QUICK_LIB
 
 !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
 
-package: !qtc_harmattan {
+package {
     distInstalls.files = $$PUBLIC_HEADERS
-    distInstalls.path = $$[QT_INSTALL_HEADERS]/Qt3DQuick
+    distInstalls.path = $$QT3D_INSTALL_HEADERS/Qt3DQuick
     INSTALLS += distInstalls
 }
 
-# If Qt has been configured to build frameworks, then the build witll put
+# If Qt has been configured to build frameworks, then the build will put
 # the Qt3DQuick library into a framework bundle, so put the headers in the bundle
 # as well.  Other OS's, or mac without frameworks, install the headers into
 # the Qt build tree directly.
@@ -92,9 +92,11 @@ macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
 } else {
     exportHeaders.input = PUBLIC_HEADERS
     package {
+        # in the package case we need the headers for the actual build, the
+        # distInstalls stanza above takes care of packaging the headers for the dev pkg
         exportHeaders.output = ../../include/Qt3DQuick/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
     } else {
-        exportHeaders.output = $$[QT_INSTALL_HEADERS]/Qt3DQuick/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
+        !maemo: exportHeaders.output = $$[QT_INSTALL_HEADERS]/Qt3DQuick/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
     }
     exportHeaders.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
     exportHeaders.CONFIG += no_link_no_clean
diff --git a/src/threed/threed.pro b/src/threed/threed.pro
index fcc3318a..9070b38d 100644
--- a/src/threed/threed.pro
+++ b/src/threed/threed.pro
@@ -53,9 +53,9 @@ DEFINES += QT_BUILD_QT3D_LIB
 
 !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
 
-package: !qtc_harmattan {
+package {
     distInstalls.files = $$PUBLIC_HEADERS
-    distInstalls.path = $$[QT_INSTALL_HEADERS]/Qt3D
+    distInstalls.path = $$QT3D_INSTALL_HEADERS/Qt3D
     INSTALLS += distInstalls
 }
 
@@ -73,10 +73,12 @@ macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
 } else {
     !symbian {
         exportHeaders.input = PUBLIC_HEADERS
+        # in the package case we need the headers for the actual build, the
+        # distInstalls stanza above takes care of packaging the headers for the dev pkg
         package {
             exportHeaders.output = ../../include/Qt3D/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
         } else {
-            exportHeaders.output = $$[QT_INSTALL_HEADERS]/Qt3D/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
+            !maemo: exportHeaders.output = $$[QT_INSTALL_HEADERS]/Qt3D/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
         }
         exportHeaders.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
         exportHeaders.CONFIG += no_link_no_clean
diff --git a/tests/manual/animations/icon-l-qtquick3d.png b/tests/manual/animations/qtquick3d.png
index 69deef3f..69deef3f 100644
--- a/tests/manual/animations/icon-l-qtquick3d.png
+++ b/tests/manual/animations/qtquick3d.png
diff --git a/tests/manual/animations/tst_animations_qml.desktop b/tests/manual/animations/tst_animations_qml.desktop
index 5bf22950..3fc4e012 100644
--- a/tests/manual/animations/tst_animations_qml.desktop
+++ b/tests/manual/animations/tst_animations_qml.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=tst_animations
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/tst_animations -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/tst_animations -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_tst_animations_qml
diff --git a/tests/manual/displaymodel/icon-l-qtquick3d.png b/tests/manual/displaymodel/qtquick3d.png
index 8351083e..8351083e 100644
--- a/tests/manual/displaymodel/icon-l-qtquick3d.png
+++ b/tests/manual/displaymodel/qtquick3d.png
diff --git a/tests/manual/lighting/icon-l-qtquick3d.png b/tests/manual/lighting/qtquick3d.png
index 8351083e..8351083e 100644
--- a/tests/manual/lighting/icon-l-qtquick3d.png
+++ b/tests/manual/lighting/qtquick3d.png
diff --git a/tests/manual/lighting/tst_lighting_qml.desktop b/tests/manual/lighting/tst_lighting_qml.desktop
index 7e595171..6cb79035 100644
--- a/tests/manual/lighting/tst_lighting_qml.desktop
+++ b/tests/manual/lighting/tst_lighting_qml.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=tst_lighting
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/tst_lighting -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/tst_lighting -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_tst_lighting_qml
diff --git a/tests/manual/model3ds/icon-l-qtquick3d.png b/tests/manual/model3ds/qtquick3d.png
index 8351083e..8351083e 100644
--- a/tests/manual/model3ds/icon-l-qtquick3d.png
+++ b/tests/manual/model3ds/qtquick3d.png
diff --git a/tests/manual/model3ds/tst_submesh_qml.desktop b/tests/manual/model3ds/tst_submesh_qml.desktop
index df7f2dff..7bd7fd92 100644
--- a/tests/manual/model3ds/tst_submesh_qml.desktop
+++ b/tests/manual/model3ds/tst_submesh_qml.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=tst_submesh
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/tst_submesh -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/tst_submesh -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_tst_submesh_qml
diff --git a/tests/manual/navigation1/icon-l-qtquick3d.png b/tests/manual/navigation1/qtquick3d.png
index 8351083e..8351083e 100644
--- a/tests/manual/navigation1/icon-l-qtquick3d.png
+++ b/tests/manual/navigation1/qtquick3d.png
diff --git a/tests/manual/qrc/icon-l-qtquick3d.png b/tests/manual/qrc/qtquick3d.png
index 8351083e..8351083e 100644
--- a/tests/manual/qrc/icon-l-qtquick3d.png
+++ b/tests/manual/qrc/qtquick3d.png
diff --git a/tests/manual/qrc/tst_qrc_qml.desktop b/tests/manual/qrc/tst_qrc_qml.desktop
index 2e58cb77..02f18027 100644
--- a/tests/manual/qrc/tst_qrc_qml.desktop
+++ b/tests/manual/qrc/tst_qrc_qml.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=tst_qrc
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/tst_qrc -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/tst_qrc -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_tst_qrc_qml
diff --git a/tests/manual/rotation/icon-l-qtquick3d.png b/tests/manual/rotation/qtquick3d.png
index 8351083e..8351083e 100644
--- a/tests/manual/rotation/icon-l-qtquick3d.png
+++ b/tests/manual/rotation/qtquick3d.png
diff --git a/tests/manual/rotation/tst_rotation_qml.desktop b/tests/manual/rotation/tst_rotation_qml.desktop
index 74001904..37bf2fc6 100644
--- a/tests/manual/rotation/tst_rotation_qml.desktop
+++ b/tests/manual/rotation/tst_rotation_qml.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=tst_rotation
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/tst_rotation -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/tst_rotation -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_tst_rotation_qml
diff --git a/tests/manual/scaling/icon-l-qtquick3d.png b/tests/manual/scaling/qtquick3d.png
index 8351083e..8351083e 100644
--- a/tests/manual/scaling/icon-l-qtquick3d.png
+++ b/tests/manual/scaling/qtquick3d.png
diff --git a/tests/manual/scaling/tst_scaling_qml.desktop b/tests/manual/scaling/tst_scaling_qml.desktop
index bec0fb32..5b036b5c 100644
--- a/tests/manual/scaling/tst_scaling_qml.desktop
+++ b/tests/manual/scaling/tst_scaling_qml.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=tst_scaling
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/tst_scaling -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/tst_scaling -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_tst_scaling_qml
diff --git a/tests/manual/submesh/icon-l-qtquick3d.png b/tests/manual/submesh/qtquick3d.png
index 8351083e..8351083e 100644
--- a/tests/manual/submesh/icon-l-qtquick3d.png
+++ b/tests/manual/submesh/qtquick3d.png
diff --git a/tests/manual/submesh/tst_submesh_qml.desktop b/tests/manual/submesh/tst_submesh_qml.desktop
index df7f2dff..7bd7fd92 100644
--- a/tests/manual/submesh/tst_submesh_qml.desktop
+++ b/tests/manual/submesh/tst_submesh_qml.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=tst_submesh
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/tst_submesh -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/tst_submesh -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_tst_submesh_qml
diff --git a/tests/manual/transformations/icon-l-qtquick3d.png b/tests/manual/transformations/qtquick3d.png
index 8351083e..8351083e 100644
--- a/tests/manual/transformations/icon-l-qtquick3d.png
+++ b/tests/manual/transformations/qtquick3d.png
diff --git a/tests/manual/transformations/tst_transformations_qml.desktop b/tests/manual/transformations/tst_transformations_qml.desktop
index 515f0ed5..8dc16d05 100644
--- a/tests/manual/transformations/tst_transformations_qml.desktop
+++ b/tests/manual/transformations/tst_transformations_qml.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=tst_transformations
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/tst_transformations -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/tst_transformations -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_tst_transformations_qml
diff --git a/tests/manual/translation/icon-l-qtquick3d.png b/tests/manual/translation/qtquick3d.png
index 8351083e..8351083e 100644
--- a/tests/manual/translation/icon-l-qtquick3d.png
+++ b/tests/manual/translation/qtquick3d.png
diff --git a/tests/manual/translation/tst_translation_qml.desktop b/tests/manual/translation/tst_translation_qml.desktop
index 0b777a85..bbdab15c 100644
--- a/tests/manual/translation/tst_translation_qml.desktop
+++ b/tests/manual/translation/tst_translation_qml.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=tst_translation
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/tst_translation -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/tst_translation -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_tst_translation_qml
diff --git a/tests/tests.pro b/tests/tests.pro
index cfab8452..6f7cec58 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,4 +1,8 @@
 TEMPLATE = subdirs
-SUBDIRS = manual
+
+# load this since its needed to turn qtc_harmattan->maemo
 include(../pkg.pri)
+
+# we dont package unit tests for maemo
+!maemo: SUBDIRS = manual
 !package: SUBDIRS += auto benchmarks
diff --git a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.desktop b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.desktop
index 81658c08..13bc1a48 100644
--- a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.desktop
+++ b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Teapot Bounce
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/teapot_bounce_qml -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/teapot_bounce_qml -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_teapot_bounce_qml
diff --git a/tutorials/quick3d/teapot_qml/teapot_qml.desktop b/tutorials/quick3d/teapot_qml/teapot_qml.desktop
index 33c27c97..9d5c550e 100644
--- a/tutorials/quick3d/teapot_qml/teapot_qml.desktop
+++ b/tutorials/quick3d/teapot_qml/teapot_qml.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Teapot
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/teapot_qml -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/teapot_qml -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_teapot_qml
diff --git a/util/qt3d/modeltweak/modeltweak.desktop b/util/qt3d/modeltweak/modeltweak.desktop
index acddf8fb..a6667676 100644
--- a/util/qt3d/modeltweak/modeltweak.desktop
+++ b/util/qt3d/modeltweak/modeltweak.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Model Tweaker
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/modeltweak -fullscreen
+Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
+Exec=/usr/bin/invoker --type=e -s /usr/bin/modeltweak -fullscreen
 OnlyShowIn=X-MeeGo;
 X-MeeGo-Logical-Id=qtn_comm_appname_modeltweak
diff --git a/util/qt3d/modeltweak/icon-l-qtquick3d.png b/util/qt3d/modeltweak/qtquick3d.png
index 8351083e..8351083e 100644
--- a/util/qt3d/modeltweak/icon-l-qtquick3d.png
+++ b/util/qt3d/modeltweak/qtquick3d.png