diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-29 16:37:38 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-29 16:37:38 +0100 |
commit | aaff94c2df665035addb90714bab4722003894da (patch) | |
tree | 3af76e8aa4dbf86a86b1e4d2ad2f6dda06374ee0 /tests/auto/gui/image/qicoimageformat | |
parent | 2302d386c7a1aa1a96658f79c236d6b8a59db7ac (diff) | |
parent | 1196f691120d77ab3be55f21824aba645210fb8c (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/tools/qbytearray.cpp
src/gui/kernel/qplatformsystemtrayicon.cpp
src/gui/kernel/qplatformsystemtrayicon.h
src/plugins/platforms/xcb/xcb-plugin.pro
Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79
Diffstat (limited to 'tests/auto/gui/image/qicoimageformat')
-rw-r--r-- | tests/auto/gui/image/qicoimageformat/qicoimageformat.pro | 1 | ||||
-rw-r--r-- | tests/auto/gui/image/qicoimageformat/qicoimageformat.qrc | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro b/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro index 83af3960a6..a58336e511 100644 --- a/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro +++ b/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro @@ -14,3 +14,4 @@ wince*: { DEPLOYMENT += addPlugins } TESTDATA += icons/* +android:RESOURCES+=qicoimageformat.qrc diff --git a/tests/auto/gui/image/qicoimageformat/qicoimageformat.qrc b/tests/auto/gui/image/qicoimageformat/qicoimageformat.qrc new file mode 100644 index 0000000000..1e0ee8aa8c --- /dev/null +++ b/tests/auto/gui/image/qicoimageformat/qicoimageformat.qrc @@ -0,0 +1,18 @@ +<RCC> + <qresource prefix="/"> + <file>icons/invalid/35floppy.ico</file> + <file>icons/valid/35FLOPPY.ICO</file> + <file>icons/valid/abcardWindow.ico</file> + <file>icons/valid/AddPerfMon.ico</file> + <file>icons/valid/App.ico</file> + <file>icons/valid/Obj_N2_Internal_Mem.ico</file> + <file>icons/valid/Qt.ico</file> + <file>icons/valid/semitransparent.ico</file> + <file>icons/valid/Status_Play.ico</file> + <file>icons/valid/TIMER01.ICO</file> + <file>icons/valid/trolltechlogo_tiny.ico</file> + <file>icons/valid/WORLD.ico</file> + <file>icons/valid/WORLDH.ico</file> + <file>icons/valid/yellow.cur</file> + </qresource> +</RCC> |