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>

69 files changed, 104 insertions, 82 deletions

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