diff options
author | Sarah Smith <sarah.j.smith@nokia.com> | 2011-11-25 12:50:35 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-01 02:06:03 +0100 |
commit | 8548b98f756ed8d8f986b56facc16ecf7e59fbd3 (patch) | |
tree | 7a252d3798ae1d40c75001f0809db13346acc9f6 /tests/manual | |
parent | 987ce26ee470933f945d507d1e51dccfff4d8920 (diff) |
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>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/animations/qtquick3d.png (renamed from tests/manual/animations/icon-l-qtquick3d.png) | bin | 6565 -> 6565 bytes | |||
-rw-r--r-- | tests/manual/animations/tst_animations_qml.desktop | 4 | ||||
-rw-r--r-- | tests/manual/displaymodel/qtquick3d.png (renamed from tests/manual/displaymodel/icon-l-qtquick3d.png) | bin | 4050 -> 4050 bytes | |||
-rw-r--r-- | tests/manual/lighting/qtquick3d.png (renamed from tests/manual/lighting/icon-l-qtquick3d.png) | bin | 4050 -> 4050 bytes | |||
-rw-r--r-- | tests/manual/lighting/tst_lighting_qml.desktop | 4 | ||||
-rw-r--r-- | tests/manual/model3ds/qtquick3d.png (renamed from tests/manual/model3ds/icon-l-qtquick3d.png) | bin | 4050 -> 4050 bytes | |||
-rw-r--r-- | tests/manual/model3ds/tst_submesh_qml.desktop | 4 | ||||
-rw-r--r-- | tests/manual/navigation1/qtquick3d.png (renamed from tests/manual/navigation1/icon-l-qtquick3d.png) | bin | 4050 -> 4050 bytes | |||
-rw-r--r-- | tests/manual/qrc/qtquick3d.png (renamed from tests/manual/qrc/icon-l-qtquick3d.png) | bin | 4050 -> 4050 bytes | |||
-rw-r--r-- | tests/manual/qrc/tst_qrc_qml.desktop | 4 | ||||
-rw-r--r-- | tests/manual/rotation/qtquick3d.png (renamed from tests/manual/rotation/icon-l-qtquick3d.png) | bin | 4050 -> 4050 bytes | |||
-rw-r--r-- | tests/manual/rotation/tst_rotation_qml.desktop | 4 | ||||
-rw-r--r-- | tests/manual/scaling/qtquick3d.png (renamed from tests/manual/scaling/icon-l-qtquick3d.png) | bin | 4050 -> 4050 bytes | |||
-rw-r--r-- | tests/manual/scaling/tst_scaling_qml.desktop | 4 | ||||
-rw-r--r-- | tests/manual/submesh/qtquick3d.png (renamed from tests/manual/submesh/icon-l-qtquick3d.png) | bin | 4050 -> 4050 bytes | |||
-rw-r--r-- | tests/manual/submesh/tst_submesh_qml.desktop | 4 | ||||
-rw-r--r-- | tests/manual/transformations/qtquick3d.png (renamed from tests/manual/transformations/icon-l-qtquick3d.png) | bin | 4050 -> 4050 bytes | |||
-rw-r--r-- | tests/manual/transformations/tst_transformations_qml.desktop | 4 | ||||
-rw-r--r-- | tests/manual/translation/qtquick3d.png (renamed from tests/manual/translation/icon-l-qtquick3d.png) | bin | 4050 -> 4050 bytes | |||
-rw-r--r-- | tests/manual/translation/tst_translation_qml.desktop | 4 |
20 files changed, 18 insertions, 18 deletions
diff --git a/tests/manual/animations/icon-l-qtquick3d.png b/tests/manual/animations/qtquick3d.png Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 |