diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-02-24 04:16:04 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-02-24 04:16:04 (GMT) |
| commit | 6680766bcdd5bff7f1a871c711202a30fe91e25e (patch) | |
| tree | 668400393f44d7abf6099bb1ce78d431902e1b63 /tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp | |
| parent | d3e494b78a00a8109005b2c86605920799ad12c8 (diff) | |
| parent | 4d615766184e3eeee25ffc634847bec1edd47ac0 (diff) | |
| download | Qt-6680766bcdd5bff7f1a871c711202a30fe91e25e.zip Qt-6680766bcdd5bff7f1a871c711202a30fe91e25e.tar.gz Qt-6680766bcdd5bff7f1a871c711202a30fe91e25e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure
Diffstat (limited to 'tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp')
| -rw-r--r-- | tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp b/tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp index 503b05e..a25dcd2 100644 --- a/tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp +++ b/tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp @@ -59,7 +59,7 @@ #define TRY_WAIT(expr) \ do { \ - for (int ii = 0; ii < 6; ++ii) { \ + for (int ii = 0; ii < 60; ++ii) { \ if ((expr)) break; \ QTest::qWait(50); \ } \ |