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>

26 files changed, 36 insertions, 27 deletions

diff --git a/demos/qt3d/cubehouse/cubehouse.desktop b/demos/qt3d/cubehouse/cubehouse.desktop
index a7866e46f..685e6418f 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 bf343d7e4..f809849e7 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 21ec01768..21ec01768 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 7be5a59e8..4ee69dadf 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 a42d57544..cdcfd4f93 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 21ec01768..21ec01768 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 217944796..6c4085d56 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 547f659a1..8830bb880 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 21ec01768..21ec01768 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 21ec01768..21ec01768 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 5ad3cc1df..9880fbfba 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 fb53bec48..3d6be0707 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 21ec01768..21ec01768 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 69e1b2ac3..eee50a74a 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 f61b6401c..94968531a 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 25b6a7c21..dc54c201a 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 996d716c2..b4c84830e 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 165e1ac50..79350595f 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 96ab797d4..2163c4f07 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 8351083ed..8351083ed 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 8351083ed..8351083ed 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 1e87d94ec..d21ea4f03 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 6730f4e5e..5232a715b 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 8351083ed..8351083ed 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 9965faf34..d45e08128 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 d977a8968..af6106552 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