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 /examples/qt3d/geometry | |
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 'examples/qt3d/geometry')
-rw-r--r-- | examples/qt3d/geometry/geometry.desktop | 4 | ||||
-rw-r--r-- | examples/qt3d/geometry/geometry.pro | 3 | ||||
-rw-r--r-- | examples/qt3d/geometry/qt3d.png (renamed from examples/qt3d/geometry/icon-l-qt3d.png) | bin | 3677 -> 3677 bytes |
3 files changed, 4 insertions, 3 deletions
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 Binary files differindex 21ec0176..21ec0176 100644 --- a/examples/qt3d/geometry/icon-l-qt3d.png +++ b/examples/qt3d/geometry/qt3d.png |