diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:18:11 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:18:11 +0200 |
| commit | 084c5b3db794af1ce86b2b17455d9be5e64baebe (patch) | |
| tree | 46d29a7b89ff251c07b6fdd59c57e30f14baa64a /tests/auto/gui/image/qicon/tst_qicon.qrc | |
| parent | f4a0d6d2494d1dd41cd5b854a48b435120714d32 (diff) | |
| parent | 54987c6bf55b159d3ddb79461439700f6e0111f9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754
Diffstat (limited to 'tests/auto/gui/image/qicon/tst_qicon.qrc')
| -rw-r--r-- | tests/auto/gui/image/qicon/tst_qicon.qrc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/gui/image/qicon/tst_qicon.qrc b/tests/auto/gui/image/qicon/tst_qicon.qrc index 7925a33c84..469a0a21b4 100644 --- a/tests/auto/gui/image/qicon/tst_qicon.qrc +++ b/tests/auto/gui/image/qicon/tst_qicon.qrc @@ -16,5 +16,11 @@ <file>./icons/themeparent/index.theme</file> <file>./icons/themeparent/scalable/actions/address-book-new.svg</file> <file>./icons/themeparent/scalable/actions/appointment-new.svg</file> +<file>./styles/commonstyle/images/standardbutton-open-16.png</file> +<file>./styles/commonstyle/images/standardbutton-open-32.png</file> +<file>./styles/commonstyle/images/standardbutton-open-128.png</file> +<file>./styles/commonstyle/images/standardbutton-save-16.png</file> +<file>./styles/commonstyle/images/standardbutton-save-32.png</file> +<file>./styles/commonstyle/images/standardbutton-save-128.png</file> </qresource> </RCC> |