summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeimage
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-17 23:02:57 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-17 23:02:57 (GMT)
commitafb304bc3de01262e183b7f9904493e3d898a744 (patch)
tree41642e36b440b5e326a2dd56e2dca041ddb52908 /tests/auto/declarative/qdeclarativeimage
parentc94bf708b2a70e125847ec24184af12af6593ff0 (diff)
parentab9d11946e5ff88008e8c2d887b8d0458ab9a98c (diff)
downloadQt-afb304bc3de01262e183b7f9904493e3d898a744.zip
Qt-afb304bc3de01262e183b7f9904493e3d898a744.tar.gz
Qt-afb304bc3de01262e183b7f9904493e3d898a744.tar.bz2
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Fix incorrect file name case for OpenGL libraries in symbian.conf. Fix QDeclarativeState::reset() autotest Update test bitmaps for QDeclarativeImage::svg() autotest on Linux Doc: typo fixed in doc/src/declarative/extending.qdoc Add work around for bug when painting w/glTexSubImage into large texture
Diffstat (limited to 'tests/auto/declarative/qdeclarativeimage')
-rw-r--r--tests/auto/declarative/qdeclarativeimage/data/heart.pngbin12424 -> 12577 bytes
-rw-r--r--tests/auto/declarative/qdeclarativeimage/data/heart200.pngbin7943 -> 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
index ff93f6c..abe97fe 100644
--- a/tests/auto/declarative/qdeclarativeimage/data/heart.png
+++ b/tests/auto/declarative/qdeclarativeimage/data/heart.png
Binary files differ
diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart200.png b/tests/auto/declarative/qdeclarativeimage/data/heart200.png
index 5a31ae8..7fbb13c 100644
--- a/tests/auto/declarative/qdeclarativeimage/data/heart200.png
+++ b/tests/auto/declarative/qdeclarativeimage/data/heart200.png
Binary files differ