diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-17 02:58:35 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-17 02:58:35 (GMT) |
| commit | 1dcc60793f16e5922887a6fb2abff7d6fbe7146c (patch) | |
| tree | 0950e1f4c48d9d1b8d4d907816f4c33ed1e67cf9 /tests/auto | |
| parent | 20470e30d11733ada5443ff993d8518aa14737ca (diff) | |
| parent | 349df5c1ec50fde17a2dbf94af64ed76c55d7aaf (diff) | |
| download | Qt-1dcc60793f16e5922887a6fb2abff7d6fbe7146c.zip Qt-1dcc60793f16e5922887a6fb2abff7d6fbe7146c.tar.gz Qt-1dcc60793f16e5922887a6fb2abff7d6fbe7146c.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp index b63e14b..91115e4 100644 --- a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp +++ b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp @@ -122,8 +122,7 @@ void tst_qdeclarativewebview::cleanupTestCase() void tst_qdeclarativewebview::checkNoErrors(const QDeclarativeComponent& component) { // Wait until the component is ready - QTRY_VERIFY(component.isReady()); - + QTRY_VERIFY(component.isReady() || component.isError()); if (component.isError()) { QList<QDeclarativeError> errors = component.errors(); |