diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-05 18:36:10 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-05 18:36:10 (GMT) |
| commit | dbc4a07327e0c306eb84a65ae7fa98bdb36c6ad0 (patch) | |
| tree | 21ea670935253bb7002a29bea308d0cf9fa78595 /tests/auto/qimagereader/qimagereader.qrc | |
| parent | 6abee18b8ab9899b909a15227fba8fbc4506fad8 (diff) | |
| parent | 4c486619517cea4012a157995bce197c817d83e5 (diff) | |
| download | Qt-dbc4a07327e0c306eb84a65ae7fa98bdb36c6ad0.zip Qt-dbc4a07327e0c306eb84a65ae7fa98bdb36c6ad0.tar.gz Qt-dbc4a07327e0c306eb84a65ae7fa98bdb36c6ad0.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Diffstat (limited to 'tests/auto/qimagereader/qimagereader.qrc')
| -rw-r--r-- | tests/auto/qimagereader/qimagereader.qrc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qimagereader/qimagereader.qrc b/tests/auto/qimagereader/qimagereader.qrc index 11b9406..58f2f74 100644 --- a/tests/auto/qimagereader/qimagereader.qrc +++ b/tests/auto/qimagereader/qimagereader.qrc @@ -57,5 +57,7 @@ <file>images/qt6.gif</file> <file>images/qt7.gif</file> <file>images/qt8.gif</file> + <file>images/endless-anim.gif</file> + <file>images/four-frames.gif</file> </qresource> </RCC> |