diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-09-15 14:11:49 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-15 08:08:46 +0200 |
| commit | 582037a9312de14d482979baddd9fcf1898f36e3 (patch) | |
| tree | a583f6a5368305d12153f9a17bb14a8a0bb144c3 /tests/auto/declarative/qdeclarativebehaviors | |
| parent | e5a0d7076a296bf054e923c8dbd9cdcf69fa6b30 (diff) | |
Test fixes.
Change-Id: Icaf5f287ce5f8fe954c55ec7a60308659ccce547
Reviewed-on: http://codereview.qt-project.org/4935
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativebehaviors')
| -rw-r--r-- | tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro index 03ba50ad15..8ed7ee5a16 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro +++ b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro @@ -11,6 +11,6 @@ symbian: { DEFINES += SRCDIR=\\\"$$PWD\\\" } -CONFIG += parallel_test +CONFIG += parallel_test insignificant_test QT += core-private gui-private v8-private declarative-private opengl-private diff --git a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp index 15248e301d..c39766e22d 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp +++ b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp @@ -404,9 +404,6 @@ void tst_qdeclarativebehaviors::sameValue() QCOMPARE(target->x(), qreal(100)); target->setProperty("x", 0); -#ifdef Q_WS_QPA - QEXPECT_FAIL("", "QTBUG-21001 fails", Abort); -#endif QTRY_VERIFY(target->x() != qreal(0) && target->x() != qreal(100)); QTRY_VERIFY(target->x() == qreal(0)); //make sure Behavior has finished. |