diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-20 11:27:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-20 11:27:14 (GMT) |
| commit | 987a683ff51997cb23cb931af99c6554651742d7 (patch) | |
| tree | f6289720da5b8e280a7849c5dd52b5a3a1629a10 /tests/auto/declarative/qdeclarativeimage | |
| parent | 97b039438bc31bb420138d72549372adb1244dc8 (diff) | |
| parent | 197ec350e4014330851a013501c6dde3068ac26f (diff) | |
| download | Qt-987a683ff51997cb23cb931af99c6554651742d7.zip Qt-987a683ff51997cb23cb931af99c6554651742d7.tar.gz Qt-987a683ff51997cb23cb931af99c6554651742d7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Setting TextInput.cursorPosition outside bounds crashed.
Update test bitmaps for QDeclarativeImage::svg() autotest on Windows
Don't truncate image:// url strings prematurely
Update docs on importing javascript files
Diffstat (limited to 'tests/auto/declarative/qdeclarativeimage')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/data/heart-win32.png | bin | 12457 -> 12621 bytes |
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/data/heart200-win32.png | bin | 7939 -> 8062 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart-win32.png b/tests/auto/declarative/qdeclarativeimage/data/heart-win32.png Binary files differindex 5992e79..351da13 100644 --- a/tests/auto/declarative/qdeclarativeimage/data/heart-win32.png +++ b/tests/auto/declarative/qdeclarativeimage/data/heart-win32.png diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart200-win32.png b/tests/auto/declarative/qdeclarativeimage/data/heart200-win32.png Binary files differindex 19b20a8..4976ff9 100644 --- a/tests/auto/declarative/qdeclarativeimage/data/heart200-win32.png +++ b/tests/auto/declarative/qdeclarativeimage/data/heart200-win32.png |
