diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 13:12:33 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 13:12:33 +0200 |
| commit | 7f1bcb38ef61b2af9ff50c1ae474ed38fa901755 (patch) | |
| tree | 1eab0f3da1d1c824edacdda1a4e3715ec4f2647d /tests/auto/declarative | |
| parent | 9868e6b2f14e146e486e127664789f2978fabed0 (diff) | |
| parent | 8d0159a64e7b10e8c39ade516b27a06d875bff65 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I03cb83e49d476283280ebb5963a513d109d224c8
Diffstat (limited to 'tests/auto/declarative')
| -rw-r--r-- | tests/auto/declarative/examples/examples.pro | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro index 043fa5d0..c960b8fd 100644 --- a/tests/auto/declarative/examples/examples.pro +++ b/tests/auto/declarative/examples/examples.pro @@ -14,6 +14,4 @@ include(../../../../tools/qml/qml.pri) DEFINES += SRCDIR=\\\"$$PWD\\\" -CONFIG += parallel_test - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp index 78c43f9e..2b099ad1 100644 --- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp +++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp @@ -572,7 +572,7 @@ void tst_qdeclarativeimage::noLoading() QTRY_VERIFY(obj->status() == QDeclarativeImage::Ready); QTRY_VERIFY(obj->progress() == 1.0); QTRY_COMPARE(sourceSpy.count(), 2); - QTRY_COMPARE(progressSpy.count(), 2); + QTRY_VERIFY(progressSpy.count() > 1); QTRY_COMPARE(statusSpy.count(), 2); // Loading remote file again - should not go through 'Loading' state. @@ -581,7 +581,7 @@ void tst_qdeclarativeimage::noLoading() QTRY_VERIFY(obj->status() == QDeclarativeImage::Ready); QTRY_VERIFY(obj->progress() == 1.0); QTRY_COMPARE(sourceSpy.count(), 4); - QTRY_COMPARE(progressSpy.count(), 2); + QTRY_VERIFY(progressSpy.count() > 1); QTRY_COMPARE(statusSpy.count(), 2); } |