From 582037a9312de14d482979baddd9fcf1898f36e3 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Thu, 15 Sep 2011 14:11:49 +1000 Subject: [PATCH] Test fixes. Change-Id: Icaf5f287ce5f8fe954c55ec7a60308659ccce547 Reviewed-on: http://codereview.qt-project.org/4935 Reviewed-by: Qt Sanity Bot Reviewed-by: Rohan McGovern --- .../qdeclarativebehaviors.pro | 2 +- .../tst_qdeclarativebehaviors.cpp | 3 - .../tst_qdeclarativecomponent.cpp | 1 - tests/auto/declarative/qsgitem2/qsgitem.pro | 2 +- tests/auto/qtquick1/examples/examples.pro | 2 +- tests/auto/qtquick1/moduleqt47/moduleqt47.pro | 2 +- .../qdeclarativeanchors/qdeclarativeanchors.pro | 2 +- .../qdeclarativeanimatedimage.pro | 2 +- .../qdeclarativeanimations.pro | 2 +- .../qdeclarativeapplication.pro | 2 +- .../qdeclarativebehaviors.pro | 4 +- .../tst_qdeclarativebehaviors.cpp | 3 - .../qdeclarativebinding/qdeclarativebinding.pro | 2 +- .../qdeclarativeborderimage.pro | 2 +- .../qdeclarativeconnection.pro | 2 +- .../qdeclarativeflickable.pro | 2 +- .../qdeclarativeflipable/qdeclarativeflipable.pro | 2 +- .../qdeclarativefocusscope.pro | 2 +- .../qdeclarativefontloader.pro | 2 +- .../qdeclarativegridview/qdeclarativegridview.pro | 2 +- .../qdeclarativeimage/qdeclarativeimage.pro | 2 +- .../qdeclarativeimageprovider.pro | 2 +- .../qtquick1/qdeclarativeitem/qdeclarativeitem.pro | 2 +- .../qdeclarativelayoutitem.pro | 2 +- .../qdeclarativelistmodel.pro | 2 +- .../qdeclarativelistview/qdeclarativelistview.pro | 2 +- .../qdeclarativeloader/qdeclarativeloader.pro | 2 +- .../qdeclarativemousearea.pro | 2 +- .../qdeclarativeparticles.pro | 2 +- .../qdeclarativepathview/qdeclarativepathview.pro | 2 +- .../qdeclarativepincharea.pro | 2 +- .../tst_qdeclarativepincharea.cpp | 40 ++++++++++---------- .../qdeclarativepositioners.pro | 2 +- .../qdeclarativerepeater/qdeclarativerepeater.pro | 2 +- .../qdeclarativesmoothedanimation.pro | 2 +- .../qdeclarativespringanimation.pro | 2 +- .../qdeclarativestates/qdeclarativestates.pro | 2 +- .../qdeclarativesystempalette.pro | 2 +- .../qtquick1/qdeclarativetext/qdeclarativetext.pro | 2 +- .../qdeclarativetextedit/qdeclarativetextedit.pro | 2 +- .../tst_qdeclarativetextedit.cpp | 2 +- .../qdeclarativetextinput.pro | 2 +- .../tst_qdeclarativetextinput.cpp | 2 +- .../qdeclarativetimer/qdeclarativetimer.pro | 2 +- .../qtquick1/qdeclarativeview/qdeclarativeview.pro | 2 +- .../qdeclarativeviewer/qdeclarativeviewer.pro | 4 +- .../qdeclarativevisualdatamodel.pro | 2 +- .../qdeclarativexmllistmodel.pro | 2 +- 48 files changed, 66 insertions(+), 73 deletions(-) diff --git a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro index 03ba50a..8ed7ee5 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 15248e3..c39766e 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. diff --git a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp index 9cbc98d..d983f9b 100644 --- a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp +++ b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp @@ -117,7 +117,6 @@ void tst_qdeclarativecomponent::qmlCreateObjectWithProperties() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/createObjectWithScript.qml")); - qDebug() << component.errorString(); QVERIFY2(component.errorString().isEmpty(), component.errorString().toUtf8()); QObject *object = component.create(); QVERIFY(object != 0); diff --git a/tests/auto/declarative/qsgitem2/qsgitem.pro b/tests/auto/declarative/qsgitem2/qsgitem.pro index afab61d..aa2528f 100644 --- a/tests/auto/declarative/qsgitem2/qsgitem.pro +++ b/tests/auto/declarative/qsgitem2/qsgitem.pro @@ -14,5 +14,5 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private v8-private declarative-private QT += opengl-private diff --git a/tests/auto/qtquick1/examples/examples.pro b/tests/auto/qtquick1/examples/examples.pro index 14756b9..ab1d897 100644 --- a/tests/auto/qtquick1/examples/examples.pro +++ b/tests/auto/qtquick1/examples/examples.pro @@ -9,6 +9,6 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private qpa:CONFIG+=insignificant_test # QTBUG-20990, aborts diff --git a/tests/auto/qtquick1/moduleqt47/moduleqt47.pro b/tests/auto/qtquick1/moduleqt47/moduleqt47.pro index 2a3f087..f58c96f 100644 --- a/tests/auto/qtquick1/moduleqt47/moduleqt47.pro +++ b/tests/auto/qtquick1/moduleqt47/moduleqt47.pro @@ -14,4 +14,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativeanchors/qdeclarativeanchors.pro b/tests/auto/qtquick1/qdeclarativeanchors/qdeclarativeanchors.pro index dc87f68..0c3e1cf 100644 --- a/tests/auto/qtquick1/qdeclarativeanchors/qdeclarativeanchors.pro +++ b/tests/auto/qtquick1/qdeclarativeanchors/qdeclarativeanchors.pro @@ -13,4 +13,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro b/tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro index a338a94..5e34dd6 100644 --- a/tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro +++ b/tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro @@ -14,4 +14,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/qtquick1/qdeclarativeanimations/qdeclarativeanimations.pro index c6e87ca..ad217c4 100644 --- a/tests/auto/qtquick1/qdeclarativeanimations/qdeclarativeanimations.pro +++ b/tests/auto/qtquick1/qdeclarativeanimations/qdeclarativeanimations.pro @@ -13,4 +13,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativeapplication/qdeclarativeapplication.pro b/tests/auto/qtquick1/qdeclarativeapplication/qdeclarativeapplication.pro index 96b3c0b..abbe163 100644 --- a/tests/auto/qtquick1/qdeclarativeapplication/qdeclarativeapplication.pro +++ b/tests/auto/qtquick1/qdeclarativeapplication/qdeclarativeapplication.pro @@ -3,4 +3,4 @@ contains(QT_CONFIG,declarative): QT += declarative gui qtquick1 macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeapplication.cpp -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativebehaviors/qdeclarativebehaviors.pro b/tests/auto/qtquick1/qdeclarativebehaviors/qdeclarativebehaviors.pro index 15512bd..4d76160 100644 --- a/tests/auto/qtquick1/qdeclarativebehaviors/qdeclarativebehaviors.pro +++ b/tests/auto/qtquick1/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 qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp b/tests/auto/qtquick1/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp index 68efbe1..773fc24 100644 --- a/tests/auto/qtquick1/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp +++ b/tests/auto/qtquick1/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp @@ -401,9 +401,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. diff --git a/tests/auto/qtquick1/qdeclarativebinding/qdeclarativebinding.pro b/tests/auto/qtquick1/qdeclarativebinding/qdeclarativebinding.pro index b335e11..af82548 100644 --- a/tests/auto/qtquick1/qdeclarativebinding/qdeclarativebinding.pro +++ b/tests/auto/qtquick1/qdeclarativebinding/qdeclarativebinding.pro @@ -14,4 +14,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro b/tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro index a6701ba..2a5f79d 100644 --- a/tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro +++ b/tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro @@ -15,4 +15,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/qtquick1/qdeclarativeconnection/qdeclarativeconnection.pro index 3dc73e6..405969b 100644 --- a/tests/auto/qtquick1/qdeclarativeconnection/qdeclarativeconnection.pro +++ b/tests/auto/qtquick1/qdeclarativeconnection/qdeclarativeconnection.pro @@ -14,4 +14,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativeflickable/qdeclarativeflickable.pro b/tests/auto/qtquick1/qdeclarativeflickable/qdeclarativeflickable.pro index 8c9d187..ea3144a 100644 --- a/tests/auto/qtquick1/qdeclarativeflickable/qdeclarativeflickable.pro +++ b/tests/auto/qtquick1/qdeclarativeflickable/qdeclarativeflickable.pro @@ -14,4 +14,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativeflipable/qdeclarativeflipable.pro b/tests/auto/qtquick1/qdeclarativeflipable/qdeclarativeflipable.pro index 6ec02c5..d982b99 100644 --- a/tests/auto/qtquick1/qdeclarativeflipable/qdeclarativeflipable.pro +++ b/tests/auto/qtquick1/qdeclarativeflipable/qdeclarativeflipable.pro @@ -14,5 +14,5 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private qpa:contains(QT_CONFIG,xcb):CONFIG+=insignificant_test # QTBUG-21012 fails on exit (X11-specific) diff --git a/tests/auto/qtquick1/qdeclarativefocusscope/qdeclarativefocusscope.pro b/tests/auto/qtquick1/qdeclarativefocusscope/qdeclarativefocusscope.pro index 5e943d7..78123ab 100644 --- a/tests/auto/qtquick1/qdeclarativefocusscope/qdeclarativefocusscope.pro +++ b/tests/auto/qtquick1/qdeclarativefocusscope/qdeclarativefocusscope.pro @@ -11,5 +11,5 @@ symbian: { DEFINES += SRCDIR=\\\"$$PWD\\\" } -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private qpa:CONFIG+=insignificant_test # QTBUG-21013 unstable diff --git a/tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro index 9bb0c8e..0940239 100644 --- a/tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro +++ b/tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro @@ -15,4 +15,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativegridview/qdeclarativegridview.pro b/tests/auto/qtquick1/qdeclarativegridview/qdeclarativegridview.pro index 48c4d21..2d2075b 100644 --- a/tests/auto/qtquick1/qdeclarativegridview/qdeclarativegridview.pro +++ b/tests/auto/qtquick1/qdeclarativegridview/qdeclarativegridview.pro @@ -14,4 +14,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro b/tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro index dde8ed9..b50241c 100644 --- a/tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro +++ b/tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro @@ -15,4 +15,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativeimageprovider/qdeclarativeimageprovider.pro b/tests/auto/qtquick1/qdeclarativeimageprovider/qdeclarativeimageprovider.pro index 1de026e..74d9e8a 100644 --- a/tests/auto/qtquick1/qdeclarativeimageprovider/qdeclarativeimageprovider.pro +++ b/tests/auto/qtquick1/qdeclarativeimageprovider/qdeclarativeimageprovider.pro @@ -14,4 +14,4 @@ SOURCES += tst_qdeclarativeimageprovider.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativeitem/qdeclarativeitem.pro b/tests/auto/qtquick1/qdeclarativeitem/qdeclarativeitem.pro index 05bb55a..0515e56 100644 --- a/tests/auto/qtquick1/qdeclarativeitem/qdeclarativeitem.pro +++ b/tests/auto/qtquick1/qdeclarativeitem/qdeclarativeitem.pro @@ -14,5 +14,5 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private qpa:contains(QT_CONFIG,xcb):CONFIG+=insignificant_test # QTBUG-21012 fails on exit (X11-specific) diff --git a/tests/auto/qtquick1/qdeclarativelayoutitem/qdeclarativelayoutitem.pro b/tests/auto/qtquick1/qdeclarativelayoutitem/qdeclarativelayoutitem.pro index b248ee0..29b0380 100644 --- a/tests/auto/qtquick1/qdeclarativelayoutitem/qdeclarativelayoutitem.pro +++ b/tests/auto/qtquick1/qdeclarativelayoutitem/qdeclarativelayoutitem.pro @@ -11,4 +11,4 @@ symbian: { } else { DEFINES += SRCDIR=\\\"$$PWD\\\" } -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativelistmodel/qdeclarativelistmodel.pro b/tests/auto/qtquick1/qdeclarativelistmodel/qdeclarativelistmodel.pro index 059f923..799b48a 100644 --- a/tests/auto/qtquick1/qdeclarativelistmodel/qdeclarativelistmodel.pro +++ b/tests/auto/qtquick1/qdeclarativelistmodel/qdeclarativelistmodel.pro @@ -14,4 +14,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private v8-private widgets-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativelistview/qdeclarativelistview.pro b/tests/auto/qtquick1/qdeclarativelistview/qdeclarativelistview.pro index 8b3f848..6adac21 100644 --- a/tests/auto/qtquick1/qdeclarativelistview/qdeclarativelistview.pro +++ b/tests/auto/qtquick1/qdeclarativelistview/qdeclarativelistview.pro @@ -14,4 +14,4 @@ symbian: { } CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro b/tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro index 980e584..c2d0fe6 100644 --- a/tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro +++ b/tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro @@ -17,4 +17,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro b/tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro index bc717ee..1739908 100644 --- a/tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro +++ b/tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro @@ -15,4 +15,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativeparticles/qdeclarativeparticles.pro b/tests/auto/qtquick1/qdeclarativeparticles/qdeclarativeparticles.pro index 44bc1a9..e968467 100644 --- a/tests/auto/qtquick1/qdeclarativeparticles/qdeclarativeparticles.pro +++ b/tests/auto/qtquick1/qdeclarativeparticles/qdeclarativeparticles.pro @@ -14,4 +14,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1 +QT += core-private gui-private widgets-private declarative-private qtquick1 diff --git a/tests/auto/qtquick1/qdeclarativepathview/qdeclarativepathview.pro b/tests/auto/qtquick1/qdeclarativepathview/qdeclarativepathview.pro index e37ad5c..d72d3f3 100644 --- a/tests/auto/qtquick1/qdeclarativepathview/qdeclarativepathview.pro +++ b/tests/auto/qtquick1/qdeclarativepathview/qdeclarativepathview.pro @@ -14,4 +14,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativepincharea/qdeclarativepincharea.pro b/tests/auto/qtquick1/qdeclarativepincharea/qdeclarativepincharea.pro index e0eb3b5..7079de3 100644 --- a/tests/auto/qtquick1/qdeclarativepincharea/qdeclarativepincharea.pro +++ b/tests/auto/qtquick1/qdeclarativepincharea/qdeclarativepincharea.pro @@ -14,4 +14,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativepincharea/tst_qdeclarativepincharea.cpp b/tests/auto/qtquick1/qdeclarativepincharea/tst_qdeclarativepincharea.cpp index 5f4795e..e48bad3 100644 --- a/tests/auto/qtquick1/qdeclarativepincharea/tst_qdeclarativepincharea.cpp +++ b/tests/auto/qtquick1/qdeclarativepincharea/tst_qdeclarativepincharea.cpp @@ -218,17 +218,17 @@ void tst_QDeclarative1PinchArea::scale() QPoint p1(80, 80); QPoint p2(100, 100); - QTest::touchEvent(vp).press(0, p1); - QTest::touchEvent(vp).stationary(0).press(1, p2); + QTest::touchEvent(vp).press(0, p1, canvas); + QTest::touchEvent(vp).stationary(0).press(1, p2, canvas); p1 -= QPoint(10,10); p2 += QPoint(10,10); - QTest::touchEvent(vp).move(0, p1).move(1, p2); + QTest::touchEvent(vp).move(0, p1, canvas).move(1, p2, canvas); QCOMPARE(root->property("scale").toReal(), 1.0); p1 -= QPoint(10,10); p2 += QPoint(10,10); - QTest::touchEvent(vp).move(0, p1).move(1, p2); + QTest::touchEvent(vp).move(0, p1, canvas).move(1, p2, canvas); QCOMPARE(root->property("scale").toReal(), 1.5); QCOMPARE(root->property("center").toPointF(), QPointF(40, 40)); // blackrect is at 50,50 @@ -237,11 +237,11 @@ void tst_QDeclarative1PinchArea::scale() // scale beyond bound p1 -= QPoint(50,50); p2 += QPoint(50,50); - QTest::touchEvent(vp).move(0, p1).move(1, p2); + QTest::touchEvent(vp).move(0, p1, canvas).move(1, p2, canvas); QCOMPARE(blackRect->scale(), 2.0); - QTest::touchEvent(vp).release(0, p1).release(1, p2); + QTest::touchEvent(vp).release(0, p1, canvas).release(1, p2, canvas); delete canvas; } @@ -273,17 +273,17 @@ void tst_QDeclarative1PinchArea::pan() QPoint p1(80, 80); QPoint p2(100, 100); - QTest::touchEvent(vp).press(0, p1); - QTest::touchEvent(vp).stationary(0).press(1, p2); + QTest::touchEvent(vp).press(0, p1, canvas); + QTest::touchEvent(vp).stationary(0).press(1, p2, canvas); p1 += QPoint(10,10); p2 += QPoint(10,10); - QTest::touchEvent(vp).move(0, p1).move(1, p2); + QTest::touchEvent(vp).move(0, p1, canvas).move(1, p2, canvas); QCOMPARE(root->property("scale").toReal(), 1.0); p1 += QPoint(10,10); p2 += QPoint(10,10); - QTest::touchEvent(vp).move(0, p1).move(1, p2); + QTest::touchEvent(vp).move(0, p1, canvas).move(1, p2, canvas); QCOMPARE(root->property("center").toPointF(), QPointF(60, 60)); // blackrect is at 50,50 @@ -293,12 +293,12 @@ void tst_QDeclarative1PinchArea::pan() // pan x beyond bound p1 += QPoint(100,100); p2 += QPoint(100,100); - QTest::touchEvent(vp).move(0, p1).move(1, p2); + QTest::touchEvent(vp).move(0, p1, canvas).move(1, p2, canvas); QCOMPARE(blackRect->x(), 140.0); QCOMPARE(blackRect->y(), 160.0); - QTest::touchEvent(vp).release(0, p1).release(1, p2); + QTest::touchEvent(vp).release(0, p1, canvas).release(1, p2, canvas); delete canvas; } @@ -328,24 +328,24 @@ void tst_QDeclarative1PinchArea::flickable() // begin by moving one touch point (mouse) QTest::mousePress(vp, Qt::LeftButton, 0, canvas->mapFromScene(p1)); - QTest::touchEvent(vp).press(0, p1); + QTest::touchEvent(vp).press(0, p1, canvas); { p1 -= QPoint(10,10); QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(p1), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier); QApplication::sendEvent(canvas->viewport(), &mv); - QTest::touchEvent(vp).move(0, p1); + QTest::touchEvent(vp).move(0, p1, canvas); } { p1 -= QPoint(10,10); QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(p1), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier); QApplication::sendEvent(vp, &mv); - QTest::touchEvent(vp).move(0, p1); + QTest::touchEvent(vp).move(0, p1, canvas); } { p1 -= QPoint(10,10); QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(p1), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier); QApplication::sendEvent(vp, &mv); - QTest::touchEvent(vp).move(0, p1); + QTest::touchEvent(vp).move(0, p1, canvas); } // Flickable has reacted to the gesture @@ -353,23 +353,23 @@ void tst_QDeclarative1PinchArea::flickable() QVERIFY(root->property("scale").toReal() == 1.0); // add another touch point and continue moving - QTest::touchEvent(vp).stationary(0).press(1, p2); + QTest::touchEvent(vp).stationary(0).press(1, p2, canvas); p1 -= QPoint(10,10); p2 += QPoint(10,10); - QTest::touchEvent(vp).move(0, p1).move(1, p2); + QTest::touchEvent(vp).move(0, p1, canvas).move(1, p2, canvas); QCOMPARE(root->property("scale").toReal(), 1.0); p1 -= QPoint(10,10); p2 += QPoint(10,10); - QTest::touchEvent(vp).move(0, p1).move(1, p2); + QTest::touchEvent(vp).move(0, p1, canvas).move(1, p2, canvas); // PinchArea has stolen the gesture. QVERIFY(!root->isMoving()); QVERIFY(root->property("scale").toReal() > 1.0); QTest::mouseRelease(vp, Qt::LeftButton, 0, canvas->mapFromScene(p1)); - QTest::touchEvent(vp).release(0, p1).release(1, p2); + QTest::touchEvent(vp).release(0, p1, canvas).release(1, p2, canvas); delete canvas; } diff --git a/tests/auto/qtquick1/qdeclarativepositioners/qdeclarativepositioners.pro b/tests/auto/qtquick1/qdeclarativepositioners/qdeclarativepositioners.pro index b01f8a3..b5772ee 100644 --- a/tests/auto/qtquick1/qdeclarativepositioners/qdeclarativepositioners.pro +++ b/tests/auto/qtquick1/qdeclarativepositioners/qdeclarativepositioners.pro @@ -13,4 +13,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativerepeater/qdeclarativerepeater.pro b/tests/auto/qtquick1/qdeclarativerepeater/qdeclarativerepeater.pro index dd5fa97..03bfdd8 100644 --- a/tests/auto/qtquick1/qdeclarativerepeater/qdeclarativerepeater.pro +++ b/tests/auto/qtquick1/qdeclarativerepeater/qdeclarativerepeater.pro @@ -13,4 +13,4 @@ symbian: { } CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro b/tests/auto/qtquick1/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro index 1afe01f..873e15f 100644 --- a/tests/auto/qtquick1/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro +++ b/tests/auto/qtquick1/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro @@ -14,4 +14,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativespringanimation/qdeclarativespringanimation.pro b/tests/auto/qtquick1/qdeclarativespringanimation/qdeclarativespringanimation.pro index c3ceed0..327765d 100644 --- a/tests/auto/qtquick1/qdeclarativespringanimation/qdeclarativespringanimation.pro +++ b/tests/auto/qtquick1/qdeclarativespringanimation/qdeclarativespringanimation.pro @@ -14,4 +14,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativestates/qdeclarativestates.pro b/tests/auto/qtquick1/qdeclarativestates/qdeclarativestates.pro index bdf151a..ede4e8c 100644 --- a/tests/auto/qtquick1/qdeclarativestates/qdeclarativestates.pro +++ b/tests/auto/qtquick1/qdeclarativestates/qdeclarativestates.pro @@ -13,4 +13,4 @@ symbian: { } CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativesystempalette/qdeclarativesystempalette.pro b/tests/auto/qtquick1/qdeclarativesystempalette/qdeclarativesystempalette.pro index eb1ff6a..33effc7 100644 --- a/tests/auto/qtquick1/qdeclarativesystempalette/qdeclarativesystempalette.pro +++ b/tests/auto/qtquick1/qdeclarativesystempalette/qdeclarativesystempalette.pro @@ -10,4 +10,4 @@ SOURCES += tst_qdeclarativesystempalette.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro b/tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro index 6253806..63dfc49 100644 --- a/tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro +++ b/tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro @@ -19,4 +19,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro b/tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro index 4e18222..7eb558a 100644 --- a/tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro +++ b/tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro @@ -12,4 +12,4 @@ symbian: { } else { DEFINES += SRCDIR=\\\"$$PWD\\\" } -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index bcad637..ec48769 100644 --- a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -2069,7 +2069,7 @@ public: openInputPanelReceived = true; if (event->type() == QEvent::CloseSoftwareInputPanel) closeInputPanelReceived = true; - return QInputContext::filterEvent(event); + return false; //QInputContext::filterEvent(event); } void update() { updateReceived = true; } diff --git a/tests/auto/qtquick1/qdeclarativetextinput/qdeclarativetextinput.pro b/tests/auto/qtquick1/qdeclarativetextinput/qdeclarativetextinput.pro index f18c054..213c4d6 100644 --- a/tests/auto/qtquick1/qdeclarativetextinput/qdeclarativetextinput.pro +++ b/tests/auto/qtquick1/qdeclarativetextinput/qdeclarativetextinput.pro @@ -12,4 +12,4 @@ symbian: { DEFINES += SRCDIR=\\\"$$PWD\\\" } -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp index 633ab17..55c431f 100644 --- a/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp +++ b/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp @@ -2172,7 +2172,7 @@ public: openInputPanelReceived = true; if (event->type() == QEvent::CloseSoftwareInputPanel) closeInputPanelReceived = true; - return QInputContext::filterEvent(event); + return false; //QInputContext::filterEvent(event); } void update() { updateReceived = true; } diff --git a/tests/auto/qtquick1/qdeclarativetimer/qdeclarativetimer.pro b/tests/auto/qtquick1/qdeclarativetimer/qdeclarativetimer.pro index dfc3421..d0639dc 100644 --- a/tests/auto/qtquick1/qdeclarativetimer/qdeclarativetimer.pro +++ b/tests/auto/qtquick1/qdeclarativetimer/qdeclarativetimer.pro @@ -9,4 +9,4 @@ SOURCES += tst_qdeclarativetimer.cpp } CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro b/tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro index d2b157e..c81a4a7 100644 --- a/tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro +++ b/tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro @@ -11,4 +11,4 @@ symbian: { } else { DEFINES += SRCDIR=\\\"$$PWD\\\" } -QT += core-private gui-private declarative-private qtquick1-private widgets +QT += core-private gui-private widgets-private declarative-private qtquick1-private widgets diff --git a/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro b/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro index afccbcc..433eaf8 100644 --- a/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro +++ b/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro @@ -15,5 +15,5 @@ symbian: { DEFINES += SRCDIR=\\\"$$PWD\\\" } -CONFIG += parallel_test -QT += core-private gui-private declarative-private qtquick1-private widgets-private v8-private +CONFIG += parallel_test insignificant_test +QT += core-private gui-private widgets-private declarative-private qtquick1-private widgets-private v8-private diff --git a/tests/auto/qtquick1/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro b/tests/auto/qtquick1/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro index 3f116e1..0f7eec3 100644 --- a/tests/auto/qtquick1/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro +++ b/tests/auto/qtquick1/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro @@ -14,4 +14,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private diff --git a/tests/auto/qtquick1/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro b/tests/auto/qtquick1/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro index e8894a8..cb7b543 100644 --- a/tests/auto/qtquick1/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro +++ b/tests/auto/qtquick1/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro @@ -18,4 +18,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private -- 1.7.2.5