diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-20 10:47:02 +0100 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-20 10:47:02 +0100 |
| commit | 10c90522d6e3807baac3c4bfca4eedc51a4251f5 (patch) | |
| tree | 92005b547e3b92eb9e640fae8c78fdcdc13b6dd9 /tests/auto/declarative/qdeclarativeimage | |
| parent | 64e1f888586f2c988b08bcc93579990e970b7206 (diff) | |
| parent | 97b039438bc31bb420138d72549372adb1244dc8 (diff) | |
| download | qt4-tools-10c90522d6e3807baac3c4bfca4eedc51a4251f5.tar.gz | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/plugins/phonon/mmf/mmf.pro
src/s60installs/s60installs.pro
tests/auto/qapplication/test/test.pro
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
Diffstat (limited to 'tests/auto/declarative/qdeclarativeimage')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/data/heart.png | bin | 12424 -> 12577 bytes |
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/data/heart200.png | bin | 7943 -> 8063 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart.png b/tests/auto/declarative/qdeclarativeimage/data/heart.png Binary files differindex ff93f6c6e4..abe97fee4b 100644 --- a/tests/auto/declarative/qdeclarativeimage/data/heart.png +++ b/tests/auto/declarative/qdeclarativeimage/data/heart.png diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart200.png b/tests/auto/declarative/qdeclarativeimage/data/heart200.png Binary files differindex 5a31ae8f4d..7fbb13c5bb 100644 --- a/tests/auto/declarative/qdeclarativeimage/data/heart200.png +++ b/tests/auto/declarative/qdeclarativeimage/data/heart200.png |
