diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 03:00:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 03:00:24 (GMT) |
| commit | c68fc875a4f824686b1a55f5eb810ad72922e58a (patch) | |
| tree | 011b16835c9dc4ce30b5fc0fa214da0012b67a4e /tests/auto | |
| parent | add9c43407a63c28f1107b9a77e74f6f62593246 (diff) | |
| parent | ee7c3b576ced47d3b68da1913cdf6995144bddd2 (diff) | |
| download | Qt-c68fc875a4f824686b1a55f5eb810ad72922e58a.zip Qt-c68fc875a4f824686b1a55f5eb810ad72922e58a.tar.gz Qt-c68fc875a4f824686b1a55f5eb810ad72922e58a.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:
Only modify pixmap cache reply when protected by a mutex
Fix broken example code
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp index 16d2063..6b36224 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp +++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp @@ -71,6 +71,7 @@ private slots: void parallel(); void parallel_data(); void massive(); + void cancelcrash(); private: QDeclarativeEngine engine; @@ -316,6 +317,15 @@ void tst_qdeclarativepixmapcache::massive() } } +// QTBUG-12729 +void tst_qdeclarativepixmapcache::cancelcrash() +{ + QUrl url("http://127.0.0.1:14452/cancelcrash_notexist.png"); + for (int ii = 0; ii < 1000; ++ii) { + QDeclarativePixmap pix(&engine, url); + } +} + QTEST_MAIN(tst_qdeclarativepixmapcache) #include "tst_qdeclarativepixmapcache.moc" |