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>

21 files changed, 23 insertions, 19 deletions

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