From 0d6a7afa1505b93d484750d87b8f899440cb26c8 Mon Sep 17 00:00:00 2001 From: Julian de Bhal Date: Thu, 29 Mar 2012 15:43:06 +1000 Subject: Rename qtquick3d.png/svg to quick3d Change-Id: Iec7d0973dbfe3d2df6e3f6bc532aa0fb6eee520e Reviewed-by: Sarah Jane Smith --- demos/quick3d/flickr3d/flickr3d.desktop | 2 +- demos/quick3d/flickr3d/flickr3d.rc | 2 +- demos/quick3d/flickr3d/qtquick3d.ico | Bin 67646 -> 0 bytes demos/quick3d/flickr3d/quick3d.ico | Bin 0 -> 67646 bytes demos/quick3d/model_viewer/model_viewer.desktop | 2 +- demos/quick3d/model_viewer/model_viewer.rc | 2 +- demos/quick3d/model_viewer/qtquick3d.ico | Bin 67646 -> 0 bytes demos/quick3d/model_viewer/qtquick3d.png | Bin 4050 -> 0 bytes demos/quick3d/model_viewer/quick3d.ico | Bin 0 -> 67646 bytes demos/quick3d/model_viewer/quick3d.png | Bin 0 -> 4050 bytes demos/quick3d/qtquick3d.svg | 23 --------------------- demos/quick3d/quick3d.svg | 23 +++++++++++++++++++++ demos/quick3d/robo_bounce/qtquick3d.ico | Bin 67646 -> 0 bytes demos/quick3d/robo_bounce/qtquick3d.png | Bin 4050 -> 0 bytes demos/quick3d/robo_bounce/quick3d.ico | Bin 0 -> 67646 bytes demos/quick3d/robo_bounce/quick3d.png | Bin 0 -> 4050 bytes demos/quick3d/robo_bounce/robo_bounce.desktop | 2 +- demos/quick3d/robo_bounce/robo_bounce.rc | 2 +- demos/quick3d/tea_service/qtquick3d.ico | Bin 67646 -> 0 bytes demos/quick3d/tea_service/qtquick3d.png | Bin 4050 -> 0 bytes demos/quick3d/tea_service/quick3d.ico | Bin 0 -> 67646 bytes demos/quick3d/tea_service/quick3d.png | Bin 0 -> 4050 bytes demos/quick3d/tea_service/tea_service.desktop | 2 +- demos/quick3d/tea_service/tea_service.rc | 2 +- examples/quick3d/animations/animations_qml.desktop | 2 +- examples/quick3d/animations/animations_qml.rc | 2 +- examples/quick3d/animations/qtquick3d.ico | Bin 67646 -> 0 bytes examples/quick3d/animations/qtquick3d.png | Bin 4050 -> 0 bytes examples/quick3d/animations/quick3d.ico | Bin 0 -> 67646 bytes examples/quick3d/animations/quick3d.png | Bin 0 -> 4050 bytes examples/quick3d/basket/basket_qml.desktop | 2 +- examples/quick3d/basket/basket_qml.rc | 2 +- examples/quick3d/basket/qtquick3d.ico | Bin 67646 -> 0 bytes examples/quick3d/basket/qtquick3d.png | Bin 4050 -> 0 bytes examples/quick3d/basket/quick3d.ico | Bin 0 -> 67646 bytes examples/quick3d/basket/quick3d.png | Bin 0 -> 4050 bytes examples/quick3d/cube/cube_qml.desktop | 2 +- examples/quick3d/cube/cube_qml.rc | 2 +- examples/quick3d/cube/qtquick3d.ico | Bin 67646 -> 0 bytes examples/quick3d/cube/qtquick3d.png | Bin 4050 -> 0 bytes examples/quick3d/cube/quick3d.ico | Bin 0 -> 67646 bytes examples/quick3d/cube/quick3d.png | Bin 0 -> 4050 bytes examples/quick3d/forest/forest.rc | 2 +- examples/quick3d/forest/forest_qml.desktop | 2 +- examples/quick3d/forest/qtquick3d.ico | Bin 67646 -> 0 bytes examples/quick3d/forest/qtquick3d.png | Bin 4050 -> 0 bytes examples/quick3d/forest/quick3d.ico | Bin 0 -> 67646 bytes examples/quick3d/forest/quick3d.png | Bin 0 -> 4050 bytes examples/quick3d/lander/lander.desktop | 2 +- examples/quick3d/lander/lander.rc | 2 +- examples/quick3d/lander/qtquick3d.ico | Bin 67646 -> 0 bytes examples/quick3d/lander/qtquick3d.png | Bin 4050 -> 0 bytes examples/quick3d/lander/quick3d.ico | Bin 0 -> 67646 bytes examples/quick3d/lander/quick3d.png | Bin 0 -> 4050 bytes .../matrix_animation/matrix_animation.desktop | 2 +- .../quick3d/matrix_animation/matrix_animation.rc | 2 +- examples/quick3d/matrix_animation/qtquick3d.ico | Bin 67646 -> 0 bytes examples/quick3d/matrix_animation/qtquick3d.png | Bin 4050 -> 0 bytes examples/quick3d/matrix_animation/quick3d.ico | Bin 0 -> 67646 bytes examples/quick3d/matrix_animation/quick3d.png | Bin 0 -> 4050 bytes .../quick3d/modelview3d/modelview3d_qml.desktop | 2 +- examples/quick3d/modelview3d/modelview3d_qml.rc | 2 +- examples/quick3d/modelview3d/qtquick3d.ico | Bin 67646 -> 0 bytes examples/quick3d/modelview3d/qtquick3d.png | Bin 4050 -> 0 bytes examples/quick3d/modelview3d/quick3d.ico | Bin 0 -> 67646 bytes examples/quick3d/modelview3d/quick3d.png | Bin 0 -> 4050 bytes examples/quick3d/monkeygod/monkeygod.desktop | 2 +- examples/quick3d/monkeygod/monkeygod.rc | 2 +- examples/quick3d/monkeygod/qtquick3d.ico | Bin 67646 -> 0 bytes examples/quick3d/monkeygod/qtquick3d.png | Bin 4050 -> 0 bytes examples/quick3d/monkeygod/quick3d.ico | Bin 0 -> 67646 bytes examples/quick3d/monkeygod/quick3d.png | Bin 0 -> 4050 bytes examples/quick3d/moon/moon.desktop | 2 +- examples/quick3d/moon/moon.rc | 2 +- examples/quick3d/moon/qtquick3d.ico | Bin 67646 -> 0 bytes examples/quick3d/moon/qtquick3d.png | Bin 4050 -> 0 bytes examples/quick3d/moon/quick3d.ico | Bin 0 -> 67646 bytes examples/quick3d/moon/quick3d.png | Bin 0 -> 4050 bytes examples/quick3d/photoroom/photoroom.desktop | 2 +- examples/quick3d/photoroom/photoroom.rc | 2 +- examples/quick3d/photoroom/qtquick3d.ico | Bin 67646 -> 0 bytes examples/quick3d/photoroom/qtquick3d.png | Bin 4050 -> 0 bytes examples/quick3d/photoroom/quick3d.ico | Bin 0 -> 67646 bytes examples/quick3d/photoroom/quick3d.png | Bin 0 -> 4050 bytes examples/quick3d/qtquick3d.svg | 23 --------------------- examples/quick3d/quick3d.svg | 23 +++++++++++++++++++++ examples/quick3d/shaders/qtquick3d.ico | Bin 67646 -> 0 bytes examples/quick3d/shaders/qtquick3d.png | Bin 4050 -> 0 bytes examples/quick3d/shaders/quick3d.ico | Bin 0 -> 67646 bytes examples/quick3d/shaders/quick3d.png | Bin 0 -> 4050 bytes examples/quick3d/shaders/shaders.desktop | 2 +- examples/quick3d/shaders/shaders.rc | 2 +- examples/quick3d/solarsystem_qml/qtquick3d.ico | Bin 67646 -> 0 bytes examples/quick3d/solarsystem_qml/qtquick3d.png | Bin 4050 -> 0 bytes examples/quick3d/solarsystem_qml/quick3d.ico | Bin 0 -> 67646 bytes examples/quick3d/solarsystem_qml/quick3d.png | Bin 0 -> 4050 bytes .../solarsystem_qml/solarsystem_qml.desktop | 2 +- .../quick3d/solarsystem_qml/solarsystem_qml.rc | 2 +- examples/quick3d/sphere/qtquick3d.ico | Bin 67646 -> 0 bytes examples/quick3d/sphere/qtquick3d.png | Bin 4050 -> 0 bytes examples/quick3d/sphere/quick3d.ico | Bin 0 -> 67646 bytes examples/quick3d/sphere/quick3d.png | Bin 0 -> 4050 bytes examples/quick3d/sphere/sphere.desktop | 2 +- examples/quick3d/sphere/sphere.rc | 2 +- pkg.pri | 4 ++-- src/scripts/build_win_package.nsi | 2 +- src/scripts/qtquick3d.ico | Bin 51262 -> 0 bytes src/scripts/quick3d.ico | Bin 0 -> 51262 bytes tests/manual/animations/qtquick3d.png | Bin 6565 -> 0 bytes tests/manual/animations/quick3d.png | Bin 0 -> 6565 bytes tests/manual/animations/tst_animations_qml.desktop | 2 +- tests/manual/displaymodel/qtquick3d.png | Bin 4050 -> 0 bytes tests/manual/displaymodel/quick3d.png | Bin 0 -> 4050 bytes tests/manual/lighting/qtquick3d.png | Bin 4050 -> 0 bytes tests/manual/lighting/quick3d.png | Bin 0 -> 4050 bytes tests/manual/lighting/tst_lighting_qml.desktop | 2 +- tests/manual/model3ds/qtquick3d.png | Bin 4050 -> 0 bytes tests/manual/model3ds/quick3d.png | Bin 0 -> 4050 bytes tests/manual/model3ds/tst_submesh_qml.desktop | 2 +- tests/manual/navigation1/qtquick3d.png | Bin 4050 -> 0 bytes tests/manual/navigation1/quick3d.png | Bin 0 -> 4050 bytes tests/manual/qrc/qtquick3d.png | Bin 4050 -> 0 bytes tests/manual/qrc/quick3d.png | Bin 0 -> 4050 bytes tests/manual/qrc/tst_qrc_qml.desktop | 2 +- tests/manual/qtquick3d.svg | 23 --------------------- tests/manual/quick3d.svg | 23 +++++++++++++++++++++ tests/manual/rotation/qtquick3d.png | Bin 4050 -> 0 bytes tests/manual/rotation/quick3d.png | Bin 0 -> 4050 bytes tests/manual/rotation/tst_rotation_qml.desktop | 2 +- tests/manual/scaling/qtquick3d.png | Bin 4050 -> 0 bytes tests/manual/scaling/quick3d.png | Bin 0 -> 4050 bytes tests/manual/scaling/tst_scaling_qml.desktop | 2 +- tests/manual/shapes/qtquick3d.png | Bin 4050 -> 0 bytes tests/manual/shapes/quick3d.png | Bin 0 -> 4050 bytes tests/manual/shapes/tst_shapes_qml.desktop | 2 +- tests/manual/submesh/qtquick3d.png | Bin 4050 -> 0 bytes tests/manual/submesh/quick3d.png | Bin 0 -> 4050 bytes tests/manual/submesh/tst_submesh_qml.desktop | 2 +- tests/manual/transformations/qtquick3d.png | Bin 4050 -> 0 bytes tests/manual/transformations/quick3d.png | Bin 0 -> 4050 bytes .../tst_transformations_qml.desktop | 2 +- tests/manual/translation/qtquick3d.png | Bin 4050 -> 0 bytes tests/manual/translation/quick3d.png | Bin 0 -> 4050 bytes .../manual/translation/tst_translation_qml.desktop | 2 +- tutorials/quick3d/qtquick3d.svg | 23 --------------------- tutorials/quick3d/quick3d.svg | 23 +++++++++++++++++++++ .../teapot_bounce_qml/teapot_bounce_qml.desktop | 2 +- .../teapot_bounce_qml/teapot_bounce_qml.pro | 2 +- .../quick3d/teapot_bounce_qml/teapot_bounce_qml.rc | 2 +- tutorials/quick3d/teapot_qml/teapot_qml.desktop | 2 +- tutorials/quick3d/teapot_qml/teapot_qml.pro | 2 +- tutorials/quick3d/teapot_qml/teapot_qml.rc | 2 +- util/qt3d/assetviewer/assetviewer.desktop | 2 +- util/qt3d/assetviewer/assetviewer.rc | 2 +- util/qt3d/assetviewer/qtquick3d.ico | Bin 67646 -> 0 bytes util/qt3d/assetviewer/qtquick3d.png | Bin 4050 -> 0 bytes util/qt3d/assetviewer/quick3d.ico | Bin 0 -> 67646 bytes util/qt3d/assetviewer/quick3d.png | Bin 0 -> 4050 bytes util/qt3d/qglinfo/qglinfo.rc | 2 +- util/qt3d/qglinfo/qtquick3d.ico | Bin 51262 -> 0 bytes util/qt3d/qglinfo/quick3d.ico | Bin 0 -> 51262 bytes util/qt3d/qtquick3d.svg | 23 --------------------- util/qt3d/quick3d.svg | 23 +++++++++++++++++++++ 163 files changed, 171 insertions(+), 171 deletions(-) delete mode 100644 demos/quick3d/flickr3d/qtquick3d.ico create mode 100644 demos/quick3d/flickr3d/quick3d.ico delete mode 100644 demos/quick3d/model_viewer/qtquick3d.ico delete mode 100644 demos/quick3d/model_viewer/qtquick3d.png create mode 100644 demos/quick3d/model_viewer/quick3d.ico create mode 100644 demos/quick3d/model_viewer/quick3d.png delete mode 100644 demos/quick3d/qtquick3d.svg create mode 100644 demos/quick3d/quick3d.svg delete mode 100644 demos/quick3d/robo_bounce/qtquick3d.ico delete mode 100644 demos/quick3d/robo_bounce/qtquick3d.png create mode 100644 demos/quick3d/robo_bounce/quick3d.ico create mode 100644 demos/quick3d/robo_bounce/quick3d.png delete mode 100644 demos/quick3d/tea_service/qtquick3d.ico delete mode 100644 demos/quick3d/tea_service/qtquick3d.png create mode 100644 demos/quick3d/tea_service/quick3d.ico create mode 100644 demos/quick3d/tea_service/quick3d.png delete mode 100644 examples/quick3d/animations/qtquick3d.ico delete mode 100644 examples/quick3d/animations/qtquick3d.png create mode 100644 examples/quick3d/animations/quick3d.ico create mode 100644 examples/quick3d/animations/quick3d.png delete mode 100644 examples/quick3d/basket/qtquick3d.ico delete mode 100644 examples/quick3d/basket/qtquick3d.png create mode 100644 examples/quick3d/basket/quick3d.ico create mode 100644 examples/quick3d/basket/quick3d.png delete mode 100644 examples/quick3d/cube/qtquick3d.ico delete mode 100644 examples/quick3d/cube/qtquick3d.png create mode 100644 examples/quick3d/cube/quick3d.ico create mode 100644 examples/quick3d/cube/quick3d.png delete mode 100644 examples/quick3d/forest/qtquick3d.ico delete mode 100644 examples/quick3d/forest/qtquick3d.png create mode 100644 examples/quick3d/forest/quick3d.ico create mode 100644 examples/quick3d/forest/quick3d.png delete mode 100644 examples/quick3d/lander/qtquick3d.ico delete mode 100644 examples/quick3d/lander/qtquick3d.png create mode 100644 examples/quick3d/lander/quick3d.ico create mode 100644 examples/quick3d/lander/quick3d.png delete mode 100644 examples/quick3d/matrix_animation/qtquick3d.ico delete mode 100644 examples/quick3d/matrix_animation/qtquick3d.png create mode 100644 examples/quick3d/matrix_animation/quick3d.ico create mode 100644 examples/quick3d/matrix_animation/quick3d.png delete mode 100644 examples/quick3d/modelview3d/qtquick3d.ico delete mode 100644 examples/quick3d/modelview3d/qtquick3d.png create mode 100644 examples/quick3d/modelview3d/quick3d.ico create mode 100644 examples/quick3d/modelview3d/quick3d.png delete mode 100644 examples/quick3d/monkeygod/qtquick3d.ico delete mode 100644 examples/quick3d/monkeygod/qtquick3d.png create mode 100644 examples/quick3d/monkeygod/quick3d.ico create mode 100644 examples/quick3d/monkeygod/quick3d.png delete mode 100644 examples/quick3d/moon/qtquick3d.ico delete mode 100644 examples/quick3d/moon/qtquick3d.png create mode 100644 examples/quick3d/moon/quick3d.ico create mode 100644 examples/quick3d/moon/quick3d.png delete mode 100644 examples/quick3d/photoroom/qtquick3d.ico delete mode 100644 examples/quick3d/photoroom/qtquick3d.png create mode 100644 examples/quick3d/photoroom/quick3d.ico create mode 100644 examples/quick3d/photoroom/quick3d.png delete mode 100644 examples/quick3d/qtquick3d.svg create mode 100644 examples/quick3d/quick3d.svg delete mode 100644 examples/quick3d/shaders/qtquick3d.ico delete mode 100644 examples/quick3d/shaders/qtquick3d.png create mode 100644 examples/quick3d/shaders/quick3d.ico create mode 100644 examples/quick3d/shaders/quick3d.png delete mode 100644 examples/quick3d/solarsystem_qml/qtquick3d.ico delete mode 100644 examples/quick3d/solarsystem_qml/qtquick3d.png create mode 100644 examples/quick3d/solarsystem_qml/quick3d.ico create mode 100644 examples/quick3d/solarsystem_qml/quick3d.png delete mode 100644 examples/quick3d/sphere/qtquick3d.ico delete mode 100644 examples/quick3d/sphere/qtquick3d.png create mode 100644 examples/quick3d/sphere/quick3d.ico create mode 100644 examples/quick3d/sphere/quick3d.png delete mode 100644 src/scripts/qtquick3d.ico create mode 100644 src/scripts/quick3d.ico delete mode 100644 tests/manual/animations/qtquick3d.png create mode 100644 tests/manual/animations/quick3d.png delete mode 100644 tests/manual/displaymodel/qtquick3d.png create mode 100644 tests/manual/displaymodel/quick3d.png delete mode 100644 tests/manual/lighting/qtquick3d.png create mode 100644 tests/manual/lighting/quick3d.png delete mode 100644 tests/manual/model3ds/qtquick3d.png create mode 100644 tests/manual/model3ds/quick3d.png delete mode 100644 tests/manual/navigation1/qtquick3d.png create mode 100644 tests/manual/navigation1/quick3d.png delete mode 100644 tests/manual/qrc/qtquick3d.png create mode 100644 tests/manual/qrc/quick3d.png delete mode 100644 tests/manual/qtquick3d.svg create mode 100644 tests/manual/quick3d.svg delete mode 100644 tests/manual/rotation/qtquick3d.png create mode 100644 tests/manual/rotation/quick3d.png delete mode 100644 tests/manual/scaling/qtquick3d.png create mode 100644 tests/manual/scaling/quick3d.png delete mode 100644 tests/manual/shapes/qtquick3d.png create mode 100644 tests/manual/shapes/quick3d.png delete mode 100644 tests/manual/submesh/qtquick3d.png create mode 100644 tests/manual/submesh/quick3d.png delete mode 100644 tests/manual/transformations/qtquick3d.png create mode 100644 tests/manual/transformations/quick3d.png delete mode 100644 tests/manual/translation/qtquick3d.png create mode 100644 tests/manual/translation/quick3d.png delete mode 100644 tutorials/quick3d/qtquick3d.svg create mode 100644 tutorials/quick3d/quick3d.svg delete mode 100644 util/qt3d/assetviewer/qtquick3d.ico delete mode 100644 util/qt3d/assetviewer/qtquick3d.png create mode 100644 util/qt3d/assetviewer/quick3d.ico create mode 100644 util/qt3d/assetviewer/quick3d.png delete mode 100644 util/qt3d/qglinfo/qtquick3d.ico create mode 100644 util/qt3d/qglinfo/quick3d.ico delete mode 100644 util/qt3d/qtquick3d.svg create mode 100644 util/qt3d/quick3d.svg diff --git a/demos/quick3d/flickr3d/flickr3d.desktop b/demos/quick3d/flickr3d/flickr3d.desktop index dc54c201a..7ff7d65ae 100644 --- a/demos/quick3d/flickr3d/flickr3d.desktop +++ b/demos/quick3d/flickr3d/flickr3d.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Flickr3D -Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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.rc b/demos/quick3d/flickr3d/flickr3d.rc index 1b6228c97..9ba20274d 100644 --- a/demos/quick3d/flickr3d/flickr3d.rc +++ b/demos/quick3d/flickr3d/flickr3d.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/demos/quick3d/flickr3d/qtquick3d.ico b/demos/quick3d/flickr3d/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/demos/quick3d/flickr3d/qtquick3d.ico and /dev/null differ diff --git a/demos/quick3d/flickr3d/quick3d.ico b/demos/quick3d/flickr3d/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/demos/quick3d/flickr3d/quick3d.ico differ diff --git a/demos/quick3d/model_viewer/model_viewer.desktop b/demos/quick3d/model_viewer/model_viewer.desktop index 79350595f..18b3bb469 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=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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.rc b/demos/quick3d/model_viewer/model_viewer.rc index 1b6228c97..9ba20274d 100644 --- a/demos/quick3d/model_viewer/model_viewer.rc +++ b/demos/quick3d/model_viewer/model_viewer.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/demos/quick3d/model_viewer/qtquick3d.ico b/demos/quick3d/model_viewer/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/demos/quick3d/model_viewer/qtquick3d.ico and /dev/null differ diff --git a/demos/quick3d/model_viewer/qtquick3d.png b/demos/quick3d/model_viewer/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/demos/quick3d/model_viewer/qtquick3d.png and /dev/null differ diff --git a/demos/quick3d/model_viewer/quick3d.ico b/demos/quick3d/model_viewer/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/demos/quick3d/model_viewer/quick3d.ico differ diff --git a/demos/quick3d/model_viewer/quick3d.png b/demos/quick3d/model_viewer/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/demos/quick3d/model_viewer/quick3d.png differ diff --git a/demos/quick3d/qtquick3d.svg b/demos/quick3d/qtquick3d.svg deleted file mode 100644 index 3b8a5c7a3..000000000 --- a/demos/quick3d/qtquick3d.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/demos/quick3d/quick3d.svg b/demos/quick3d/quick3d.svg new file mode 100644 index 000000000..3b8a5c7a3 --- /dev/null +++ b/demos/quick3d/quick3d.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/quick3d/robo_bounce/qtquick3d.ico b/demos/quick3d/robo_bounce/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/demos/quick3d/robo_bounce/qtquick3d.ico and /dev/null differ diff --git a/demos/quick3d/robo_bounce/qtquick3d.png b/demos/quick3d/robo_bounce/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/demos/quick3d/robo_bounce/qtquick3d.png and /dev/null differ diff --git a/demos/quick3d/robo_bounce/quick3d.ico b/demos/quick3d/robo_bounce/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/demos/quick3d/robo_bounce/quick3d.ico differ diff --git a/demos/quick3d/robo_bounce/quick3d.png b/demos/quick3d/robo_bounce/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/demos/quick3d/robo_bounce/quick3d.png differ diff --git a/demos/quick3d/robo_bounce/robo_bounce.desktop b/demos/quick3d/robo_bounce/robo_bounce.desktop index d21ea4f03..a9915ad12 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=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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.rc b/demos/quick3d/robo_bounce/robo_bounce.rc index 1b6228c97..9ba20274d 100644 --- a/demos/quick3d/robo_bounce/robo_bounce.rc +++ b/demos/quick3d/robo_bounce/robo_bounce.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/demos/quick3d/tea_service/qtquick3d.ico b/demos/quick3d/tea_service/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/demos/quick3d/tea_service/qtquick3d.ico and /dev/null differ diff --git a/demos/quick3d/tea_service/qtquick3d.png b/demos/quick3d/tea_service/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/demos/quick3d/tea_service/qtquick3d.png and /dev/null differ diff --git a/demos/quick3d/tea_service/quick3d.ico b/demos/quick3d/tea_service/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/demos/quick3d/tea_service/quick3d.ico differ diff --git a/demos/quick3d/tea_service/quick3d.png b/demos/quick3d/tea_service/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/demos/quick3d/tea_service/quick3d.png differ diff --git a/demos/quick3d/tea_service/tea_service.desktop b/demos/quick3d/tea_service/tea_service.desktop index d45e08128..b893e5e66 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=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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.rc b/demos/quick3d/tea_service/tea_service.rc index 1b6228c97..9ba20274d 100644 --- a/demos/quick3d/tea_service/tea_service.rc +++ b/demos/quick3d/tea_service/tea_service.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/examples/quick3d/animations/animations_qml.desktop b/examples/quick3d/animations/animations_qml.desktop index b300b9200..a9393f959 100644 --- a/examples/quick3d/animations/animations_qml.desktop +++ b/examples/quick3d/animations/animations_qml.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Animations -Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.png Exec=/usr/bin/invoker --type=e -s /usr/bin/animations_qml -fullscreen OnlyShowIn=X-MeeGo; X-MeeGo-Logical-Id=qtn_comm_appname_animations_qml diff --git a/examples/quick3d/animations/animations_qml.rc b/examples/quick3d/animations/animations_qml.rc index 1b6228c97..9ba20274d 100644 --- a/examples/quick3d/animations/animations_qml.rc +++ b/examples/quick3d/animations/animations_qml.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/examples/quick3d/animations/qtquick3d.ico b/examples/quick3d/animations/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/examples/quick3d/animations/qtquick3d.ico and /dev/null differ diff --git a/examples/quick3d/animations/qtquick3d.png b/examples/quick3d/animations/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/examples/quick3d/animations/qtquick3d.png and /dev/null differ diff --git a/examples/quick3d/animations/quick3d.ico b/examples/quick3d/animations/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/examples/quick3d/animations/quick3d.ico differ diff --git a/examples/quick3d/animations/quick3d.png b/examples/quick3d/animations/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/examples/quick3d/animations/quick3d.png differ diff --git a/examples/quick3d/basket/basket_qml.desktop b/examples/quick3d/basket/basket_qml.desktop index 76b06cd69..c70fff4bd 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=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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/basket_qml.rc b/examples/quick3d/basket/basket_qml.rc index 1b6228c97..9ba20274d 100644 --- a/examples/quick3d/basket/basket_qml.rc +++ b/examples/quick3d/basket/basket_qml.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/examples/quick3d/basket/qtquick3d.ico b/examples/quick3d/basket/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/examples/quick3d/basket/qtquick3d.ico and /dev/null differ diff --git a/examples/quick3d/basket/qtquick3d.png b/examples/quick3d/basket/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/examples/quick3d/basket/qtquick3d.png and /dev/null differ diff --git a/examples/quick3d/basket/quick3d.ico b/examples/quick3d/basket/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/examples/quick3d/basket/quick3d.ico differ diff --git a/examples/quick3d/basket/quick3d.png b/examples/quick3d/basket/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/examples/quick3d/basket/quick3d.png differ diff --git a/examples/quick3d/cube/cube_qml.desktop b/examples/quick3d/cube/cube_qml.desktop index 2872740cc..d90843169 100644 --- a/examples/quick3d/cube/cube_qml.desktop +++ b/examples/quick3d/cube/cube_qml.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Cube -Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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/cube_qml.rc b/examples/quick3d/cube/cube_qml.rc index 1b6228c97..9ba20274d 100644 --- a/examples/quick3d/cube/cube_qml.rc +++ b/examples/quick3d/cube/cube_qml.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/examples/quick3d/cube/qtquick3d.ico b/examples/quick3d/cube/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/examples/quick3d/cube/qtquick3d.ico and /dev/null differ diff --git a/examples/quick3d/cube/qtquick3d.png b/examples/quick3d/cube/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/examples/quick3d/cube/qtquick3d.png and /dev/null differ diff --git a/examples/quick3d/cube/quick3d.ico b/examples/quick3d/cube/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/examples/quick3d/cube/quick3d.ico differ diff --git a/examples/quick3d/cube/quick3d.png b/examples/quick3d/cube/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/examples/quick3d/cube/quick3d.png differ diff --git a/examples/quick3d/forest/forest.rc b/examples/quick3d/forest/forest.rc index 1b6228c97..9ba20274d 100644 --- a/examples/quick3d/forest/forest.rc +++ b/examples/quick3d/forest/forest.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/examples/quick3d/forest/forest_qml.desktop b/examples/quick3d/forest/forest_qml.desktop index 0c27d6edd..4208983d4 100644 --- a/examples/quick3d/forest/forest_qml.desktop +++ b/examples/quick3d/forest/forest_qml.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Forest -Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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/qtquick3d.ico b/examples/quick3d/forest/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/examples/quick3d/forest/qtquick3d.ico and /dev/null differ diff --git a/examples/quick3d/forest/qtquick3d.png b/examples/quick3d/forest/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/examples/quick3d/forest/qtquick3d.png and /dev/null differ diff --git a/examples/quick3d/forest/quick3d.ico b/examples/quick3d/forest/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/examples/quick3d/forest/quick3d.ico differ diff --git a/examples/quick3d/forest/quick3d.png b/examples/quick3d/forest/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/examples/quick3d/forest/quick3d.png differ diff --git a/examples/quick3d/lander/lander.desktop b/examples/quick3d/lander/lander.desktop index 9020fea14..4a2d01a2c 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=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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.rc b/examples/quick3d/lander/lander.rc index 1b6228c97..9ba20274d 100644 --- a/examples/quick3d/lander/lander.rc +++ b/examples/quick3d/lander/lander.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/examples/quick3d/lander/qtquick3d.ico b/examples/quick3d/lander/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/examples/quick3d/lander/qtquick3d.ico and /dev/null differ diff --git a/examples/quick3d/lander/qtquick3d.png b/examples/quick3d/lander/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/examples/quick3d/lander/qtquick3d.png and /dev/null differ diff --git a/examples/quick3d/lander/quick3d.ico b/examples/quick3d/lander/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/examples/quick3d/lander/quick3d.ico differ diff --git a/examples/quick3d/lander/quick3d.png b/examples/quick3d/lander/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/examples/quick3d/lander/quick3d.png differ diff --git a/examples/quick3d/matrix_animation/matrix_animation.desktop b/examples/quick3d/matrix_animation/matrix_animation.desktop index 9a940637a..101fba378 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=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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.rc b/examples/quick3d/matrix_animation/matrix_animation.rc index 1b6228c97..9ba20274d 100644 --- a/examples/quick3d/matrix_animation/matrix_animation.rc +++ b/examples/quick3d/matrix_animation/matrix_animation.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/examples/quick3d/matrix_animation/qtquick3d.ico b/examples/quick3d/matrix_animation/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/examples/quick3d/matrix_animation/qtquick3d.ico and /dev/null differ diff --git a/examples/quick3d/matrix_animation/qtquick3d.png b/examples/quick3d/matrix_animation/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/examples/quick3d/matrix_animation/qtquick3d.png and /dev/null differ diff --git a/examples/quick3d/matrix_animation/quick3d.ico b/examples/quick3d/matrix_animation/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/examples/quick3d/matrix_animation/quick3d.ico differ diff --git a/examples/quick3d/matrix_animation/quick3d.png b/examples/quick3d/matrix_animation/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/examples/quick3d/matrix_animation/quick3d.png differ diff --git a/examples/quick3d/modelview3d/modelview3d_qml.desktop b/examples/quick3d/modelview3d/modelview3d_qml.desktop index 2a47edef4..c1bfe220b 100644 --- a/examples/quick3d/modelview3d/modelview3d_qml.desktop +++ b/examples/quick3d/modelview3d/modelview3d_qml.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=ModelView3D -Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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/modelview3d_qml.rc b/examples/quick3d/modelview3d/modelview3d_qml.rc index 1b6228c97..9ba20274d 100644 --- a/examples/quick3d/modelview3d/modelview3d_qml.rc +++ b/examples/quick3d/modelview3d/modelview3d_qml.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/examples/quick3d/modelview3d/qtquick3d.ico b/examples/quick3d/modelview3d/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/examples/quick3d/modelview3d/qtquick3d.ico and /dev/null differ diff --git a/examples/quick3d/modelview3d/qtquick3d.png b/examples/quick3d/modelview3d/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/examples/quick3d/modelview3d/qtquick3d.png and /dev/null differ diff --git a/examples/quick3d/modelview3d/quick3d.ico b/examples/quick3d/modelview3d/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/examples/quick3d/modelview3d/quick3d.ico differ diff --git a/examples/quick3d/modelview3d/quick3d.png b/examples/quick3d/modelview3d/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/examples/quick3d/modelview3d/quick3d.png differ diff --git a/examples/quick3d/monkeygod/monkeygod.desktop b/examples/quick3d/monkeygod/monkeygod.desktop index c5a8e49ff..9535d2ec9 100644 --- a/examples/quick3d/monkeygod/monkeygod.desktop +++ b/examples/quick3d/monkeygod/monkeygod.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=monkeygod -Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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.rc b/examples/quick3d/monkeygod/monkeygod.rc index 1b6228c97..9ba20274d 100644 --- a/examples/quick3d/monkeygod/monkeygod.rc +++ b/examples/quick3d/monkeygod/monkeygod.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/examples/quick3d/monkeygod/qtquick3d.ico b/examples/quick3d/monkeygod/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/examples/quick3d/monkeygod/qtquick3d.ico and /dev/null differ diff --git a/examples/quick3d/monkeygod/qtquick3d.png b/examples/quick3d/monkeygod/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/examples/quick3d/monkeygod/qtquick3d.png and /dev/null differ diff --git a/examples/quick3d/monkeygod/quick3d.ico b/examples/quick3d/monkeygod/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/examples/quick3d/monkeygod/quick3d.ico differ diff --git a/examples/quick3d/monkeygod/quick3d.png b/examples/quick3d/monkeygod/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/examples/quick3d/monkeygod/quick3d.png differ diff --git a/examples/quick3d/moon/moon.desktop b/examples/quick3d/moon/moon.desktop index 6eae43935..a390cbdeb 100644 --- a/examples/quick3d/moon/moon.desktop +++ b/examples/quick3d/moon/moon.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Moon -Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.png Exec=/usr/bin/invoker --type=e -s /usr/bin/moon -fullscreen OnlyShowIn=X-MeeGo; X-MeeGo-Logical-Id=qtn_comm_appname_moon diff --git a/examples/quick3d/moon/moon.rc b/examples/quick3d/moon/moon.rc index 1b6228c97..9ba20274d 100644 --- a/examples/quick3d/moon/moon.rc +++ b/examples/quick3d/moon/moon.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/examples/quick3d/moon/qtquick3d.ico b/examples/quick3d/moon/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/examples/quick3d/moon/qtquick3d.ico and /dev/null differ diff --git a/examples/quick3d/moon/qtquick3d.png b/examples/quick3d/moon/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/examples/quick3d/moon/qtquick3d.png and /dev/null differ diff --git a/examples/quick3d/moon/quick3d.ico b/examples/quick3d/moon/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/examples/quick3d/moon/quick3d.ico differ diff --git a/examples/quick3d/moon/quick3d.png b/examples/quick3d/moon/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/examples/quick3d/moon/quick3d.png differ diff --git a/examples/quick3d/photoroom/photoroom.desktop b/examples/quick3d/photoroom/photoroom.desktop index c3b8c11fa..3791e5d20 100644 --- a/examples/quick3d/photoroom/photoroom.desktop +++ b/examples/quick3d/photoroom/photoroom.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=PhotoRoom -Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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.rc b/examples/quick3d/photoroom/photoroom.rc index 1b6228c97..9ba20274d 100644 --- a/examples/quick3d/photoroom/photoroom.rc +++ b/examples/quick3d/photoroom/photoroom.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/examples/quick3d/photoroom/qtquick3d.ico b/examples/quick3d/photoroom/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/examples/quick3d/photoroom/qtquick3d.ico and /dev/null differ diff --git a/examples/quick3d/photoroom/qtquick3d.png b/examples/quick3d/photoroom/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/examples/quick3d/photoroom/qtquick3d.png and /dev/null differ diff --git a/examples/quick3d/photoroom/quick3d.ico b/examples/quick3d/photoroom/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/examples/quick3d/photoroom/quick3d.ico differ diff --git a/examples/quick3d/photoroom/quick3d.png b/examples/quick3d/photoroom/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/examples/quick3d/photoroom/quick3d.png differ diff --git a/examples/quick3d/qtquick3d.svg b/examples/quick3d/qtquick3d.svg deleted file mode 100644 index 3b8a5c7a3..000000000 --- a/examples/quick3d/qtquick3d.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/quick3d/quick3d.svg b/examples/quick3d/quick3d.svg new file mode 100644 index 000000000..3b8a5c7a3 --- /dev/null +++ b/examples/quick3d/quick3d.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/quick3d/shaders/qtquick3d.ico b/examples/quick3d/shaders/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/examples/quick3d/shaders/qtquick3d.ico and /dev/null differ diff --git a/examples/quick3d/shaders/qtquick3d.png b/examples/quick3d/shaders/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/examples/quick3d/shaders/qtquick3d.png and /dev/null differ diff --git a/examples/quick3d/shaders/quick3d.ico b/examples/quick3d/shaders/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/examples/quick3d/shaders/quick3d.ico differ diff --git a/examples/quick3d/shaders/quick3d.png b/examples/quick3d/shaders/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/examples/quick3d/shaders/quick3d.png differ diff --git a/examples/quick3d/shaders/shaders.desktop b/examples/quick3d/shaders/shaders.desktop index a9b224252..a53c7f0c4 100644 --- a/examples/quick3d/shaders/shaders.desktop +++ b/examples/quick3d/shaders/shaders.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Shaders -Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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.rc b/examples/quick3d/shaders/shaders.rc index 1b6228c97..9ba20274d 100644 --- a/examples/quick3d/shaders/shaders.rc +++ b/examples/quick3d/shaders/shaders.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/examples/quick3d/solarsystem_qml/qtquick3d.ico b/examples/quick3d/solarsystem_qml/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/examples/quick3d/solarsystem_qml/qtquick3d.ico and /dev/null differ diff --git a/examples/quick3d/solarsystem_qml/qtquick3d.png b/examples/quick3d/solarsystem_qml/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/examples/quick3d/solarsystem_qml/qtquick3d.png and /dev/null differ diff --git a/examples/quick3d/solarsystem_qml/quick3d.ico b/examples/quick3d/solarsystem_qml/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/examples/quick3d/solarsystem_qml/quick3d.ico differ diff --git a/examples/quick3d/solarsystem_qml/quick3d.png b/examples/quick3d/solarsystem_qml/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/examples/quick3d/solarsystem_qml/quick3d.png differ diff --git a/examples/quick3d/solarsystem_qml/solarsystem_qml.desktop b/examples/quick3d/solarsystem_qml/solarsystem_qml.desktop index 8fecffe2b..41daaa973 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=Solar System -Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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.rc b/examples/quick3d/solarsystem_qml/solarsystem_qml.rc index 1b6228c97..9ba20274d 100644 --- a/examples/quick3d/solarsystem_qml/solarsystem_qml.rc +++ b/examples/quick3d/solarsystem_qml/solarsystem_qml.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/examples/quick3d/sphere/qtquick3d.ico b/examples/quick3d/sphere/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/examples/quick3d/sphere/qtquick3d.ico and /dev/null differ diff --git a/examples/quick3d/sphere/qtquick3d.png b/examples/quick3d/sphere/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/examples/quick3d/sphere/qtquick3d.png and /dev/null differ diff --git a/examples/quick3d/sphere/quick3d.ico b/examples/quick3d/sphere/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/examples/quick3d/sphere/quick3d.ico differ diff --git a/examples/quick3d/sphere/quick3d.png b/examples/quick3d/sphere/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/examples/quick3d/sphere/quick3d.png differ diff --git a/examples/quick3d/sphere/sphere.desktop b/examples/quick3d/sphere/sphere.desktop index 030ee54e6..76e9fdb93 100644 --- a/examples/quick3d/sphere/sphere.desktop +++ b/examples/quick3d/sphere/sphere.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Sphere -Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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.rc b/examples/quick3d/sphere/sphere.rc index 1b6228c97..9ba20274d 100644 --- a/examples/quick3d/sphere/sphere.rc +++ b/examples/quick3d/sphere/sphere.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/pkg.pri b/pkg.pri index 0f8f50f1e..7105caf99 100644 --- a/pkg.pri +++ b/pkg.pri @@ -45,7 +45,7 @@ qt3dquick_deploy_pkg { } QT += declarative opengl - maemo: icons.files = qtquick3d.png + maemo: icons.files = quick3d.png } else { CONFIG += qt3dquick } @@ -118,7 +118,7 @@ contains(TEMPLATE, app) { DEPLOYMENT += my_deployment qt3dquick_deploy_pkg { - ICON = ../qtquick3d.svg + ICON = ../quick3d.svg } else { ICON = ../qt3d.svg } diff --git a/src/scripts/build_win_package.nsi b/src/scripts/build_win_package.nsi index fc92b9a75..ea8fb7de6 100644 --- a/src/scripts/build_win_package.nsi +++ b/src/scripts/build_win_package.nsi @@ -14,7 +14,7 @@ ; MUI Settings !define MUI_ABORTWARNING -!define MUI_ICON "src\scripts\qtquick3d.ico" +!define MUI_ICON "src\scripts\quick3d.ico" !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" !define MUI_WELCOMEFINISHPAGE_BITMAP "src\scripts\win_installer_background.bmp" !define MUI_WELCOMEPAGE_TITLE "${PRODUCT_NAME} Setup" diff --git a/src/scripts/qtquick3d.ico b/src/scripts/qtquick3d.ico deleted file mode 100644 index b3b85e37b..000000000 Binary files a/src/scripts/qtquick3d.ico and /dev/null differ diff --git a/src/scripts/quick3d.ico b/src/scripts/quick3d.ico new file mode 100644 index 000000000..b3b85e37b Binary files /dev/null and b/src/scripts/quick3d.ico differ diff --git a/tests/manual/animations/qtquick3d.png b/tests/manual/animations/qtquick3d.png deleted file mode 100644 index 69deef3f6..000000000 Binary files a/tests/manual/animations/qtquick3d.png and /dev/null differ diff --git a/tests/manual/animations/quick3d.png b/tests/manual/animations/quick3d.png new file mode 100644 index 000000000..69deef3f6 Binary files /dev/null and b/tests/manual/animations/quick3d.png differ diff --git a/tests/manual/animations/tst_animations_qml.desktop b/tests/manual/animations/tst_animations_qml.desktop index 3fc4e012e..b24f3c2cf 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=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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/qtquick3d.png b/tests/manual/displaymodel/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/tests/manual/displaymodel/qtquick3d.png and /dev/null differ diff --git a/tests/manual/displaymodel/quick3d.png b/tests/manual/displaymodel/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/tests/manual/displaymodel/quick3d.png differ diff --git a/tests/manual/lighting/qtquick3d.png b/tests/manual/lighting/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/tests/manual/lighting/qtquick3d.png and /dev/null differ diff --git a/tests/manual/lighting/quick3d.png b/tests/manual/lighting/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/tests/manual/lighting/quick3d.png differ diff --git a/tests/manual/lighting/tst_lighting_qml.desktop b/tests/manual/lighting/tst_lighting_qml.desktop index 6cb790350..4f4fb1fb7 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=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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/qtquick3d.png b/tests/manual/model3ds/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/tests/manual/model3ds/qtquick3d.png and /dev/null differ diff --git a/tests/manual/model3ds/quick3d.png b/tests/manual/model3ds/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/tests/manual/model3ds/quick3d.png differ diff --git a/tests/manual/model3ds/tst_submesh_qml.desktop b/tests/manual/model3ds/tst_submesh_qml.desktop index 7bd7fd920..a414498de 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=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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/qtquick3d.png b/tests/manual/navigation1/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/tests/manual/navigation1/qtquick3d.png and /dev/null differ diff --git a/tests/manual/navigation1/quick3d.png b/tests/manual/navigation1/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/tests/manual/navigation1/quick3d.png differ diff --git a/tests/manual/qrc/qtquick3d.png b/tests/manual/qrc/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/tests/manual/qrc/qtquick3d.png and /dev/null differ diff --git a/tests/manual/qrc/quick3d.png b/tests/manual/qrc/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/tests/manual/qrc/quick3d.png differ diff --git a/tests/manual/qrc/tst_qrc_qml.desktop b/tests/manual/qrc/tst_qrc_qml.desktop index 02f180270..feffc5840 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=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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/qtquick3d.svg b/tests/manual/qtquick3d.svg deleted file mode 100644 index 3b8a5c7a3..000000000 --- a/tests/manual/qtquick3d.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/manual/quick3d.svg b/tests/manual/quick3d.svg new file mode 100644 index 000000000..3b8a5c7a3 --- /dev/null +++ b/tests/manual/quick3d.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/manual/rotation/qtquick3d.png b/tests/manual/rotation/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/tests/manual/rotation/qtquick3d.png and /dev/null differ diff --git a/tests/manual/rotation/quick3d.png b/tests/manual/rotation/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/tests/manual/rotation/quick3d.png differ diff --git a/tests/manual/rotation/tst_rotation_qml.desktop b/tests/manual/rotation/tst_rotation_qml.desktop index 37bf2fc69..2de4e7548 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=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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/qtquick3d.png b/tests/manual/scaling/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/tests/manual/scaling/qtquick3d.png and /dev/null differ diff --git a/tests/manual/scaling/quick3d.png b/tests/manual/scaling/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/tests/manual/scaling/quick3d.png differ diff --git a/tests/manual/scaling/tst_scaling_qml.desktop b/tests/manual/scaling/tst_scaling_qml.desktop index 5b036b5c1..ad4b0238c 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=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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/shapes/qtquick3d.png b/tests/manual/shapes/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/tests/manual/shapes/qtquick3d.png and /dev/null differ diff --git a/tests/manual/shapes/quick3d.png b/tests/manual/shapes/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/tests/manual/shapes/quick3d.png differ diff --git a/tests/manual/shapes/tst_shapes_qml.desktop b/tests/manual/shapes/tst_shapes_qml.desktop index 7bd7fd920..a414498de 100644 --- a/tests/manual/shapes/tst_shapes_qml.desktop +++ b/tests/manual/shapes/tst_shapes_qml.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=tst_submesh -Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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/submesh/qtquick3d.png b/tests/manual/submesh/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/tests/manual/submesh/qtquick3d.png and /dev/null differ diff --git a/tests/manual/submesh/quick3d.png b/tests/manual/submesh/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/tests/manual/submesh/quick3d.png differ diff --git a/tests/manual/submesh/tst_submesh_qml.desktop b/tests/manual/submesh/tst_submesh_qml.desktop index 7bd7fd920..a414498de 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=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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/qtquick3d.png b/tests/manual/transformations/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/tests/manual/transformations/qtquick3d.png and /dev/null differ diff --git a/tests/manual/transformations/quick3d.png b/tests/manual/transformations/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/tests/manual/transformations/quick3d.png differ diff --git a/tests/manual/transformations/tst_transformations_qml.desktop b/tests/manual/transformations/tst_transformations_qml.desktop index 8dc16d055..d1f6595e2 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=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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/qtquick3d.png b/tests/manual/translation/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/tests/manual/translation/qtquick3d.png and /dev/null differ diff --git a/tests/manual/translation/quick3d.png b/tests/manual/translation/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/tests/manual/translation/quick3d.png differ diff --git a/tests/manual/translation/tst_translation_qml.desktop b/tests/manual/translation/tst_translation_qml.desktop index bbdab15c7..94f1f8214 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=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.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/tutorials/quick3d/qtquick3d.svg b/tutorials/quick3d/qtquick3d.svg deleted file mode 100644 index 3b8a5c7a3..000000000 --- a/tutorials/quick3d/qtquick3d.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tutorials/quick3d/quick3d.svg b/tutorials/quick3d/quick3d.svg new file mode 100644 index 000000000..3b8a5c7a3 --- /dev/null +++ b/tutorials/quick3d/quick3d.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.desktop b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.desktop index 13bc1a483..0f1739c1b 100644 --- a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.desktop +++ b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Teapot Bounce -Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.png Exec=/usr/bin/invoker --type=e -s /usr/bin/teapot_bounce_qml -fullscreen OnlyShowIn=X-MeeGo; X-MeeGo-Logical-Id=qtn_comm_appname_teapot_bounce_qml diff --git a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro index 00296cf1d..b8fedab34 100644 --- a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro +++ b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro @@ -21,5 +21,5 @@ symbian { my_deployment.pkg_prerules = vendorinfo DEPLOYMENT += my_deployment - ICON = ../qtquick3d.svg + ICON = ../quick3d.svg } diff --git a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.rc b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.rc index 1b6228c97..9ba20274d 100644 --- a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.rc +++ b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/tutorials/quick3d/teapot_qml/teapot_qml.desktop b/tutorials/quick3d/teapot_qml/teapot_qml.desktop index 9d5c550e3..6f7ab53ef 100644 --- a/tutorials/quick3d/teapot_qml/teapot_qml.desktop +++ b/tutorials/quick3d/teapot_qml/teapot_qml.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Teapot -Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.png Exec=/usr/bin/invoker --type=e -s /usr/bin/teapot_qml -fullscreen OnlyShowIn=X-MeeGo; X-MeeGo-Logical-Id=qtn_comm_appname_teapot_qml diff --git a/tutorials/quick3d/teapot_qml/teapot_qml.pro b/tutorials/quick3d/teapot_qml/teapot_qml.pro index 4a48a79b4..5676c2b90 100644 --- a/tutorials/quick3d/teapot_qml/teapot_qml.pro +++ b/tutorials/quick3d/teapot_qml/teapot_qml.pro @@ -21,5 +21,5 @@ symbian { my_deployment.pkg_prerules = vendorinfo DEPLOYMENT += my_deployment - ICON = ../qtquick3d.svg + ICON = ../quick3d.svg } diff --git a/tutorials/quick3d/teapot_qml/teapot_qml.rc b/tutorials/quick3d/teapot_qml/teapot_qml.rc index 1b6228c97..9ba20274d 100644 --- a/tutorials/quick3d/teapot_qml/teapot_qml.rc +++ b/tutorials/quick3d/teapot_qml/teapot_qml.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/util/qt3d/assetviewer/assetviewer.desktop b/util/qt3d/assetviewer/assetviewer.desktop index 1d682515c..1ad094da7 100644 --- a/util/qt3d/assetviewer/assetviewer.desktop +++ b/util/qt3d/assetviewer/assetviewer.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=3D Asset Viewer -Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png +Icon=/usr/share/icons/hicolor/80x80/apps/quick3d.png Exec=/usr/bin/invoker --type=e -s /usr/bin/modeltweak -fullscreen OnlyShowIn=X-MeeGo; X-MeeGo-Logical-Id=qtn_comm_appname_assetviewer diff --git a/util/qt3d/assetviewer/assetviewer.rc b/util/qt3d/assetviewer/assetviewer.rc index 1b6228c97..9ba20274d 100644 --- a/util/qt3d/assetviewer/assetviewer.rc +++ b/util/qt3d/assetviewer/assetviewer.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/util/qt3d/assetviewer/qtquick3d.ico b/util/qt3d/assetviewer/qtquick3d.ico deleted file mode 100644 index c695ac72b..000000000 Binary files a/util/qt3d/assetviewer/qtquick3d.ico and /dev/null differ diff --git a/util/qt3d/assetviewer/qtquick3d.png b/util/qt3d/assetviewer/qtquick3d.png deleted file mode 100644 index 8351083ed..000000000 Binary files a/util/qt3d/assetviewer/qtquick3d.png and /dev/null differ diff --git a/util/qt3d/assetviewer/quick3d.ico b/util/qt3d/assetviewer/quick3d.ico new file mode 100644 index 000000000..c695ac72b Binary files /dev/null and b/util/qt3d/assetviewer/quick3d.ico differ diff --git a/util/qt3d/assetviewer/quick3d.png b/util/qt3d/assetviewer/quick3d.png new file mode 100644 index 000000000..8351083ed Binary files /dev/null and b/util/qt3d/assetviewer/quick3d.png differ diff --git a/util/qt3d/qglinfo/qglinfo.rc b/util/qt3d/qglinfo/qglinfo.rc index 1b6228c97..9ba20274d 100644 --- a/util/qt3d/qglinfo/qglinfo.rc +++ b/util/qt3d/qglinfo/qglinfo.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" +IDI_ICON1 ICON DISCARDABLE "quick3d.ico" diff --git a/util/qt3d/qglinfo/qtquick3d.ico b/util/qt3d/qglinfo/qtquick3d.ico deleted file mode 100644 index b3b85e37b..000000000 Binary files a/util/qt3d/qglinfo/qtquick3d.ico and /dev/null differ diff --git a/util/qt3d/qglinfo/quick3d.ico b/util/qt3d/qglinfo/quick3d.ico new file mode 100644 index 000000000..b3b85e37b Binary files /dev/null and b/util/qt3d/qglinfo/quick3d.ico differ diff --git a/util/qt3d/qtquick3d.svg b/util/qt3d/qtquick3d.svg deleted file mode 100644 index 3b8a5c7a3..000000000 --- a/util/qt3d/qtquick3d.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/util/qt3d/quick3d.svg b/util/qt3d/quick3d.svg new file mode 100644 index 000000000..3b8a5c7a3 --- /dev/null +++ b/util/qt3d/quick3d.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3