diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-24 05:27:44 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-24 05:27:44 (GMT) |
| commit | 0f93f08d1d2dd8cbaaf80d13244c1b655f122357 (patch) | |
| tree | 29026809136ec51e9f1be1b19377956f80819751 /tests/auto | |
| parent | bf0d4605ddec0043d21c1c3e5b309702d61328c1 (diff) | |
| download | Qt-0f93f08d1d2dd8cbaaf80d13244c1b655f122357.zip Qt-0f93f08d1d2dd8cbaaf80d13244c1b655f122357.tar.gz Qt-0f93f08d1d2dd8cbaaf80d13244c1b655f122357.tar.bz2 | |
Manually merge 0f761d9d95bc187cb786ce7dc03a7d8c9ad9d779
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp index b2ef16b..8aeba6d 100644 --- a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp +++ b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp @@ -60,7 +60,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); \ } \ diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp index f38fca9..821386b 100644 --- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp +++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.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); \ } \ |