diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-24 01:12:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-24 01:12:57 (GMT) |
| commit | 9d26b5ad31a946ef631ca29da7379571267efddf (patch) | |
| tree | 133092cc0d8a4b2e96f04c0d1c7ee689dd996536 /tests/auto/qmovie/tst_qmovie.cpp | |
| parent | b270e0f4f3db56a4854782036cdb4ceacb7874ff (diff) | |
| parent | ce432e1799111cbed492e46bb62d8dfb40585a10 (diff) | |
| download | Qt-9d26b5ad31a946ef631ca29da7379571267efddf.zip Qt-9d26b5ad31a946ef631ca29da7379571267efddf.tar.gz Qt-9d26b5ad31a946ef631ca29da7379571267efddf.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Prevented infinite loop in QMoviePrivate::next().
Added int overloads to QPoint operator* and operator*=.
tst_qmessagebox: add debug to know why it fails
QMessageBox wrong Show/Hide Details button label
Diffstat (limited to 'tests/auto/qmovie/tst_qmovie.cpp')
| -rw-r--r-- | tests/auto/qmovie/tst_qmovie.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/qmovie/tst_qmovie.cpp b/tests/auto/qmovie/tst_qmovie.cpp index 80a551b..d43d4cb 100644 --- a/tests/auto/qmovie/tst_qmovie.cpp +++ b/tests/auto/qmovie/tst_qmovie.cpp @@ -72,6 +72,7 @@ private slots: void jumpToFrame_data(); void jumpToFrame(); void changeMovieFile(); + void infiniteLoop(); }; // Testing get/set functions @@ -208,5 +209,17 @@ void tst_QMovie::changeMovieFile() QVERIFY(movie.currentFrameNumber() == -1); } +void tst_QMovie::infiniteLoop() +{ + QLabel label; + label.show(); + QMovie *movie = new QMovie(QLatin1String(":animations/corrupt.gif"), QByteArray(), &label); + label.setMovie(movie); + movie->start(); + + QTestEventLoop::instance().enterLoop(1); + QTestEventLoop::instance().timeout(); +} + QTEST_MAIN(tst_QMovie) #include "tst_qmovie.moc" |