diff options
Diffstat (limited to 'tests/auto/quick')
73 files changed, 342 insertions, 132 deletions
diff --git a/tests/auto/quick/examples/examples.pro b/tests/auto/quick/examples/examples.pro index 3d821fc13d..fd8cfd83c8 100644 --- a/tests/auto/quick/examples/examples.pro +++ b/tests/auto/quick/examples/examples.pro @@ -6,9 +6,7 @@ macx:CONFIG -= app_bundle SOURCES += tst_examples.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" -CONFIG += parallel_test #temporary QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 !qtHaveModule(xmlpatterns): DEFINES += QT_NO_XMLPATTERNS diff --git a/tests/auto/quick/geometry/geometry.pro b/tests/auto/quick/geometry/geometry.pro index 4a225c2546..0b7e64d038 100644 --- a/tests/auto/quick/geometry/geometry.pro +++ b/tests/auto/quick/geometry/geometry.pro @@ -7,4 +7,3 @@ SOURCES += tst_geometry.cpp CONFIG+=parallel_test QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/nodes/nodes.pro b/tests/auto/quick/nodes/nodes.pro index 256318a441..6cfcc43a98 100644 --- a/tests/auto/quick/nodes/nodes.pro +++ b/tests/auto/quick/nodes/nodes.pro @@ -7,4 +7,3 @@ SOURCES += tst_nodestest.cpp CONFIG+=parallel_test QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/nokeywords/nokeywords.pro b/tests/auto/quick/nokeywords/nokeywords.pro index 51fd490cb7..6872dac22a 100644 --- a/tests/auto/quick/nokeywords/nokeywords.pro +++ b/tests/auto/quick/nokeywords/nokeywords.pro @@ -7,4 +7,3 @@ SOURCES += tst_nokeywords.cpp CONFIG+=parallel_test QT += quick core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickaccessible/qquickaccessible.pro b/tests/auto/quick/qquickaccessible/qquickaccessible.pro index bdbe2e3fb4..02915e8e22 100644 --- a/tests/auto/quick/qquickaccessible/qquickaccessible.pro +++ b/tests/auto/quick/qquickaccessible/qquickaccessible.pro @@ -16,12 +16,9 @@ OTHER_FILES += data/checkbuttons.qml \ data/statictext.qml \ data/ignored.qml \ -CONFIG += parallel_test - wince*: { accessneeded.files = $$QT.widgets.plugins/accessible/*.dll accessneeded.path = accessible DEPLOYMENT += accessneeded } -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickanchors/qquickanchors.pro b/tests/auto/quick/qquickanchors/qquickanchors.pro index 184066753b..a5b47e3797 100644 --- a/tests/auto/quick/qquickanchors/qquickanchors.pro +++ b/tests/auto/quick/qquickanchors/qquickanchors.pro @@ -9,7 +9,4 @@ macx:CONFIG -= app_bundle TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickanimatedimage/qquickanimatedimage.pro b/tests/auto/quick/qquickanimatedimage/qquickanimatedimage.pro index 83607137e1..5792626720 100644 --- a/tests/auto/quick/qquickanimatedimage/qquickanimatedimage.pro +++ b/tests/auto/quick/qquickanimatedimage/qquickanimatedimage.pro @@ -11,4 +11,3 @@ macx:CONFIG -= app_bundle TESTDATA = data/* QT += core-private gui-private qml-private quick-private network testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickanimatedsprite/qquickanimatedsprite.pro b/tests/auto/quick/qquickanimatedsprite/qquickanimatedsprite.pro index 3e47844feb..81c73be831 100644 --- a/tests/auto/quick/qquickanimatedsprite/qquickanimatedsprite.pro +++ b/tests/auto/quick/qquickanimatedsprite/qquickanimatedsprite.pro @@ -8,10 +8,7 @@ macx:CONFIG -= app_bundle TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private network testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 OTHER_FILES += \ data/largeAnimation.qml diff --git a/tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro b/tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro index b5e03ee620..6909922cb1 100644 --- a/tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro +++ b/tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro @@ -3,8 +3,6 @@ TEMPLATE=app TARGET=tst_qquickanimationcontroller CONFIG += qmltestcase -CONFIG += parallel_test SOURCES += tst_qquickanimationcontroller.cpp TESTDATA = data/* -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickanimations/qquickanimations.pro b/tests/auto/quick/qquickanimations/qquickanimations.pro index dc8f471259..8bb1f47af5 100644 --- a/tests/auto/quick/qquickanimations/qquickanimations.pro +++ b/tests/auto/quick/qquickanimations/qquickanimations.pro @@ -8,7 +8,60 @@ macx:CONFIG -= app_bundle TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +OTHER_FILES += \ + data/attached.qml \ + data/badproperty1.qml \ + data/badproperty2.qml \ + data/badtype1.qml \ + data/badtype2.qml \ + data/badtype3.qml \ + data/badtype4.qml \ + data/disabledTransition.qml \ + data/dontAutoStart.qml \ + data/dontStart.qml \ + data/dontStart2.qml \ + data/dotproperty.qml \ + data/Double.qml \ + data/doubleRegistrationBug.qml \ + data/looping.qml \ + data/mixedtype1.qml \ + data/mixedtype2.qml \ + data/nonTransitionBug.qml \ + data/parallelAnimationNullChildBug.qml \ + data/pathAnimation.qml \ + data/pathAnimation2.qml \ + data/pathAnimationInOutBackCrash.qml \ + data/pathAnimationNoStart.qml \ + data/pathInterpolator.qml \ + data/pathInterpolatorBack.qml \ + data/pathInterpolatorBack2.qml \ + data/pathTransition.qml \ + data/pauseBindingBug.qml \ + data/pauseBug.qml \ + data/properties.qml \ + data/properties2.qml \ + data/properties3.qml \ + data/properties4.qml \ + data/properties5.qml \ + data/propertiesTransition.qml \ + data/propertiesTransition2.qml \ + data/propertiesTransition3.qml \ + data/propertiesTransition4.qml \ + data/propertiesTransition5.qml \ + data/propertiesTransition6.qml \ + data/propertiesTransition7.qml \ + data/reanchor.qml \ + data/registrationBug.qml \ + data/reparent.qml \ + data/rotation.qml \ + data/runningTrueBug.qml \ + data/scriptActionBug.qml \ + data/scriptActionCrash.qml \ + data/sequentialAnimationNullChildBug.qml \ + data/signals.qml \ + data/transitionAssignmentBug.qml \ + data/valuesource.qml \ + data/valuesource2.qml diff --git a/tests/auto/quick/qquickapplication/qquickapplication.pro b/tests/auto/quick/qquickapplication/qquickapplication.pro index 7079478628..59445a6c16 100644 --- a/tests/auto/quick/qquickapplication/qquickapplication.pro +++ b/tests/auto/quick/qquickapplication/qquickapplication.pro @@ -1,9 +1,7 @@ CONFIG += testcase -CONFIG += parallel_test TARGET = tst_qquickapplication macx:CONFIG -= app_bundle SOURCES += tst_qquickapplication.cpp QT += core-private gui-private qml quick qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro b/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro index f005c03a82..51bc42c390 100644 --- a/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro +++ b/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro @@ -8,7 +8,4 @@ macx:CONFIG -= app_bundle TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickborderimage/qquickborderimage.pro b/tests/auto/quick/qquickborderimage/qquickborderimage.pro index ac213f0265..3e16063559 100644 --- a/tests/auto/quick/qquickborderimage/qquickborderimage.pro +++ b/tests/auto/quick/qquickborderimage/qquickborderimage.pro @@ -11,4 +11,3 @@ include (../../shared/util.pri) TESTDATA = data/* QT += core-private gui-private qml-private quick-private network testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro b/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro index c770dbb488..3c41d498e5 100644 --- a/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro +++ b/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro @@ -8,7 +8,6 @@ SOURCES += tst_qquickcanvasitem.cpp TESTDATA = data/* OTHER_FILES += \ - data/testhelper.js \ data/tst_transform.qml \ data/tst_text.qml \ data/tst_strokeStyle.qml \ @@ -19,15 +18,38 @@ OTHER_FILES += \ data/tst_line.qml \ data/tst_fillStyle.qml \ data/tst_fillrect.qml \ - data/tst_drawimage.qml \ data/tst_composite.qml \ data/tst_canvas.qml \ data/tst_pixel.qml \ data/tst_gradient.qml \ data/tst_arcto.qml \ data/tst_arc.qml \ - data/tst_context.qml + data/tst_context.qml \ + data/CanvasTestCase.qml \ + data/CanvasComponent.qml \ + data/tst_image.qml \ + data/tst_svgpath.qml \ + data/anim-gr.gif \ + data/anim-gr.png \ + data/anim-poster-gr.png \ + data/background.png \ + data/broken.png \ + data/ggrr-256x256.png \ + data/green-1x1.png \ + data/green-2x2.png \ + data/green-16x16.png \ + data/green-256x256.png \ + data/green.png \ + data/grgr-256x256.png \ + data/red-16x16.png \ + data/red.png \ + data/redtransparent.png \ + data/rgrg-256x256.png \ + data/rrgg-256x256.png \ + data/transparent.png \ + data/transparent50.png \ + data/yellow.png \ + data/yellow75.png -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 CONFIG += insignificant_test # QTBUG-41043 diff --git a/tests/auto/quick/qquickdesignersupport/qquickdesignersupport.pro b/tests/auto/quick/qquickdesignersupport/qquickdesignersupport.pro index af932d834b..6e1ad6b95e 100644 --- a/tests/auto/quick/qquickdesignersupport/qquickdesignersupport.pro +++ b/tests/auto/quick/qquickdesignersupport/qquickdesignersupport.pro @@ -10,7 +10,6 @@ osx:CONFIG -= app_bundle TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 DISTFILES += \ data/TestComponent.qml diff --git a/tests/auto/quick/qquickdrag/qquickdrag.pro b/tests/auto/quick/qquickdrag/qquickdrag.pro index 6e02a4d443..4bc6b2b2f6 100644 --- a/tests/auto/quick/qquickdrag/qquickdrag.pro +++ b/tests/auto/quick/qquickdrag/qquickdrag.pro @@ -4,7 +4,4 @@ macx:CONFIG -= app_bundle SOURCES += tst_qquickdrag.cpp -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private network testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickdroparea/qquickdroparea.pro b/tests/auto/quick/qquickdroparea/qquickdroparea.pro index c7ffbfd427..a34d5ad009 100644 --- a/tests/auto/quick/qquickdroparea/qquickdroparea.pro +++ b/tests/auto/quick/qquickdroparea/qquickdroparea.pro @@ -4,7 +4,4 @@ macx:CONFIG -= app_bundle SOURCES += tst_qquickdroparea.cpp -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private network testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickdynamicpropertyanimation/qquickdynamicpropertyanimation.pro b/tests/auto/quick/qquickdynamicpropertyanimation/qquickdynamicpropertyanimation.pro index a67daa91ba..33fa9aff7a 100644 --- a/tests/auto/quick/qquickdynamicpropertyanimation/qquickdynamicpropertyanimation.pro +++ b/tests/auto/quick/qquickdynamicpropertyanimation/qquickdynamicpropertyanimation.pro @@ -8,7 +8,4 @@ macx:CONFIG -= app_bundle TESTDATA = data/* -CONFIG += parallel_test - QT += core gui qml quick testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickflickable/qquickflickable.pro b/tests/auto/quick/qquickflickable/qquickflickable.pro index 88dc2fbc2a..99a840218d 100644 --- a/tests/auto/quick/qquickflickable/qquickflickable.pro +++ b/tests/auto/quick/qquickflickable/qquickflickable.pro @@ -10,4 +10,3 @@ include (../shared/util.pri) TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickflipable/qquickflipable.pro b/tests/auto/quick/qquickflipable/qquickflipable.pro index 3e4d04a401..5a1fb6e816 100644 --- a/tests/auto/quick/qquickflipable/qquickflipable.pro +++ b/tests/auto/quick/qquickflipable/qquickflipable.pro @@ -8,7 +8,4 @@ include (../../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickfocusscope/qquickfocusscope.pro b/tests/auto/quick/qquickfocusscope/qquickfocusscope.pro index 9ec643dc4d..7a4b7302d0 100644 --- a/tests/auto/quick/qquickfocusscope/qquickfocusscope.pro +++ b/tests/auto/quick/qquickfocusscope/qquickfocusscope.pro @@ -10,4 +10,3 @@ macx:CONFIG -= app_bundle TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickfontloader/qquickfontloader.pro b/tests/auto/quick/qquickfontloader/qquickfontloader.pro index 2e7300564e..cea5b55bdf 100644 --- a/tests/auto/quick/qquickfontloader/qquickfontloader.pro +++ b/tests/auto/quick/qquickfontloader/qquickfontloader.pro @@ -11,4 +11,3 @@ include (../../shared/util.pri) TESTDATA = data/* QT += core-private gui-private qml-private quick-private network testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickfontmetrics/qquickfontmetrics.pro b/tests/auto/quick/qquickfontmetrics/qquickfontmetrics.pro index 452dd70bd3..15e3bb00c1 100644 --- a/tests/auto/quick/qquickfontmetrics/qquickfontmetrics.pro +++ b/tests/auto/quick/qquickfontmetrics/qquickfontmetrics.pro @@ -4,7 +4,4 @@ osx:CONFIG -= app_bundle SOURCES += tst_quickfontmetrics.cpp -CONFIG += parallel_test - QT += core gui qml quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickframebufferobject/qquickframebufferobject.pro b/tests/auto/quick/qquickframebufferobject/qquickframebufferobject.pro index 612b6f7283..f4e9e1f890 100644 --- a/tests/auto/quick/qquickframebufferobject/qquickframebufferobject.pro +++ b/tests/auto/quick/qquickframebufferobject/qquickframebufferobject.pro @@ -7,7 +7,6 @@ include(../../shared/util.pri) macx:CONFIG -= app_bundle -CONFIG += parallel_test QT += quick testlib OTHER_FILES += \ diff --git a/tests/auto/quick/qquickgridview/qquickgridview.pro b/tests/auto/quick/qquickgridview/qquickgridview.pro index 3b98ed4dea..3c33cc78fb 100644 --- a/tests/auto/quick/qquickgridview/qquickgridview.pro +++ b/tests/auto/quick/qquickgridview/qquickgridview.pro @@ -12,4 +12,3 @@ TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp index 3699bef56d..e8261be675 100644 --- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp @@ -211,6 +211,8 @@ private slots: void QTBUG_45640(); + void keyNavigationEnabled(); + private: QList<int> toIntList(const QVariantList &list); void matchIndexLists(const QVariantList &indexLists, const QList<int> &expectedIndexes); @@ -6566,6 +6568,71 @@ void tst_QQuickGridView::QTBUG_45640() delete window; } +void tst_QQuickGridView::keyNavigationEnabled() +{ + QScopedPointer<QQuickView> window(createView()); + window->setSource(testFileUrl("gridview4.qml")); + window->show(); + window->requestActivate(); + QVERIFY(QTest::qWaitForWindowActive(window.data())); + + QQuickGridView *gridView = qobject_cast<QQuickGridView *>(window->rootObject()); + QVERIFY(gridView); + QCOMPARE(gridView->isKeyNavigationEnabled(), true); + + gridView->setFocus(true); + QVERIFY(gridView->hasActiveFocus()); + + gridView->setHighlightMoveDuration(0); + + // If keyNavigationEnabled is not explicitly set to true, respect the original behavior + // of disabling both mouse and keyboard interaction. + QSignalSpy enabledSpy(gridView, SIGNAL(keyNavigationEnabledChanged())); + gridView->setInteractive(false); + QCOMPARE(enabledSpy.count(), 1); + QCOMPARE(gridView->isKeyNavigationEnabled(), false); + + flick(window.data(), QPoint(200, 175), QPoint(200, 50), 100); + QVERIFY(!gridView->isMoving()); + QCOMPARE(gridView->contentY(), 0.0); + QCOMPARE(gridView->currentIndex(), 0); + + QTest::keyClick(window.data(), Qt::Key_Right); + QCOMPARE(gridView->currentIndex(), 0); + + // Check that isKeyNavigationEnabled implicitly follows the value of interactive. + gridView->setInteractive(true); + QCOMPARE(enabledSpy.count(), 2); + QCOMPARE(gridView->isKeyNavigationEnabled(), true); + + // Change it back again for the next check. + gridView->setInteractive(false); + QCOMPARE(enabledSpy.count(), 3); + QCOMPARE(gridView->isKeyNavigationEnabled(), false); + + // Setting keyNavigationEnabled to true shouldn't enable mouse interaction. + gridView->setKeyNavigationEnabled(true); + QCOMPARE(enabledSpy.count(), 4); + flick(window.data(), QPoint(200, 175), QPoint(200, 50), 100); + QVERIFY(!gridView->isMoving()); + QCOMPARE(gridView->contentY(), 0.0); + QCOMPARE(gridView->currentIndex(), 0); + + // Should now work. + QTest::keyClick(window.data(), Qt::Key_Right); + QCOMPARE(gridView->currentIndex(), 1); + + // Changing interactive now shouldn't result in keyNavigationEnabled changing, + // since we broke the "binding". + gridView->setInteractive(true); + QCOMPARE(enabledSpy.count(), 4); + + // Keyboard interaction shouldn't work now. + gridView->setKeyNavigationEnabled(false); + QTest::keyClick(window.data(), Qt::Key_Right); + QCOMPARE(gridView->currentIndex(), 1); +} + QTEST_MAIN(tst_QQuickGridView) #include "tst_qquickgridview.moc" diff --git a/tests/auto/quick/qquickimage/qquickimage.pro b/tests/auto/quick/qquickimage/qquickimage.pro index 9581ae02d1..5b1059bd24 100644 --- a/tests/auto/quick/qquickimage/qquickimage.pro +++ b/tests/auto/quick/qquickimage/qquickimage.pro @@ -12,4 +12,3 @@ include (../shared/util.pri) TESTDATA = data/* QT += core-private gui-private qml-private quick-private network testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickimageprovider/qquickimageprovider.pro b/tests/auto/quick/qquickimageprovider/qquickimageprovider.pro index 496dc31d30..f67b697c0f 100644 --- a/tests/auto/quick/qquickimageprovider/qquickimageprovider.pro +++ b/tests/auto/quick/qquickimageprovider/qquickimageprovider.pro @@ -4,7 +4,4 @@ macx:CONFIG -= app_bundle SOURCES += tst_qquickimageprovider.cpp -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private network testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickitem/qquickitem.pro b/tests/auto/quick/qquickitem/qquickitem.pro index 1d8ae0148b..9aca5926f2 100644 --- a/tests/auto/quick/qquickitem/qquickitem.pro +++ b/tests/auto/quick/qquickitem/qquickitem.pro @@ -11,4 +11,3 @@ TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickitem2/qquickitem2.pro b/tests/auto/quick/qquickitem2/qquickitem2.pro index ac4200a8a3..37bfb68f1c 100644 --- a/tests/auto/quick/qquickitem2/qquickitem2.pro +++ b/tests/auto/quick/qquickitem2/qquickitem2.pro @@ -9,4 +9,3 @@ include (../../shared/util.pri) TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp index c7717b9cca..518e248207 100644 --- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp @@ -117,6 +117,7 @@ private slots: void contains_data(); void contains(); void childAt(); + void isAncestorOf(); void grab(); @@ -2959,6 +2960,43 @@ void tst_QQuickItem::grab() } +void tst_QQuickItem::isAncestorOf() +{ + QQuickItem parent; + + QQuickItem sub1; + sub1.setParentItem(&parent); + + QQuickItem child1; + child1.setParentItem(&sub1); + QQuickItem child2; + child2.setParentItem(&sub1); + + QQuickItem sub2; + sub2.setParentItem(&parent); + + QQuickItem child3; + child3.setParentItem(&sub2); + QQuickItem child4; + child4.setParentItem(&sub2); + + QVERIFY(parent.isAncestorOf(&sub1)); + QVERIFY(parent.isAncestorOf(&sub2)); + QVERIFY(parent.isAncestorOf(&child1)); + QVERIFY(parent.isAncestorOf(&child2)); + QVERIFY(parent.isAncestorOf(&child3)); + QVERIFY(parent.isAncestorOf(&child4)); + QVERIFY(sub1.isAncestorOf(&child1)); + QVERIFY(sub1.isAncestorOf(&child2)); + QVERIFY(!sub1.isAncestorOf(&child3)); + QVERIFY(!sub1.isAncestorOf(&child4)); + QVERIFY(sub2.isAncestorOf(&child3)); + QVERIFY(sub2.isAncestorOf(&child4)); + QVERIFY(!sub2.isAncestorOf(&child1)); + QVERIFY(!sub2.isAncestorOf(&child2)); + QVERIFY(!sub1.isAncestorOf(&sub1)); + QVERIFY(!sub2.isAncestorOf(&sub2)); +} QTEST_MAIN(tst_QQuickItem) diff --git a/tests/auto/quick/qquickitemlayer/qquickitemlayer.pro b/tests/auto/quick/qquickitemlayer/qquickitemlayer.pro index a087948f6d..ec890b99b4 100644 --- a/tests/auto/quick/qquickitemlayer/qquickitemlayer.pro +++ b/tests/auto/quick/qquickitemlayer/qquickitemlayer.pro @@ -8,7 +8,6 @@ TESTDATA = data/* include(../../shared/util.pri) -CONFIG += parallel_test QT += core-private gui-private qml-private quick-private testlib OTHER_FILES += \ @@ -27,4 +26,3 @@ OTHER_FILES += \ data/ItemEffect.qml \ data/RectangleEffect.qml \ data/TextureMirroring.qml -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquicklistview/qquicklistview.pro b/tests/auto/quick/qquicklistview/qquicklistview.pro index c9b634b9e8..a95b6fdf33 100644 --- a/tests/auto/quick/qquicklistview/qquicklistview.pro +++ b/tests/auto/quick/qquicklistview/qquicklistview.pro @@ -18,5 +18,4 @@ include (../shared/util.pri) TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp index 1fec04d08a..c50559fcc3 100644 --- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp @@ -253,6 +253,7 @@ private slots: void QTBUG_48870_fastModelUpdates(); void QTBUG_50105(); + void keyNavigationEnabled(); private: template <class T> void items(const QUrl &source); @@ -8309,6 +8310,72 @@ void tst_QQuickListView::QTBUG_48044_currentItemNotVisibleAfterTransition() QVERIFY(!currentPriv->culled); } +void tst_QQuickListView::keyNavigationEnabled() +{ + QScopedPointer<QQuickView> window(createView()); + window->setSource(testFileUrl("simplelistview.qml")); + window->show(); + window->requestActivate(); + QVERIFY(QTest::qWaitForWindowActive(window.data())); + + QQuickListView *listView = qobject_cast<QQuickListView *>(window->rootObject()); + QVERIFY(listView); + QCOMPARE(listView->isKeyNavigationEnabled(), true); + + listView->setFocus(true); + QVERIFY(listView->hasActiveFocus()); + + listView->setHighlightMoveDuration(0); + + // If keyNavigationEnabled is not explicitly set to true, respect the original behavior + // of disabling both mouse and keyboard interaction. + QSignalSpy enabledSpy(listView, SIGNAL(keyNavigationEnabledChanged())); + listView->setInteractive(false); + QCOMPARE(enabledSpy.count(), 1); + QCOMPARE(listView->isKeyNavigationEnabled(), false); + + flick(window.data(), QPoint(200, 200), QPoint(200, 50), 100); + QVERIFY(!listView->isMoving()); + QCOMPARE(listView->contentY(), 0.0); + QCOMPARE(listView->currentIndex(), 0); + + QTest::keyClick(window.data(), Qt::Key_Down); + QCOMPARE(listView->currentIndex(), 0); + + // Check that isKeyNavigationEnabled implicitly follows the value of interactive. + listView->setInteractive(true); + QCOMPARE(enabledSpy.count(), 2); + QCOMPARE(listView->isKeyNavigationEnabled(), true); + + // Change it back again for the next check. + listView->setInteractive(false); + QCOMPARE(enabledSpy.count(), 3); + QCOMPARE(listView->isKeyNavigationEnabled(), false); + + // Setting keyNavigationEnabled to true shouldn't enable mouse interaction. + listView->setKeyNavigationEnabled(true); + QCOMPARE(enabledSpy.count(), 4); + flick(window.data(), QPoint(200, 200), QPoint(200, 50), 100); + QVERIFY(!listView->isMoving()); + QCOMPARE(listView->contentY(), 0.0); + QCOMPARE(listView->currentIndex(), 0); + + // Should now work. + QTest::keyClick(window.data(), Qt::Key_Down); + QCOMPARE(listView->currentIndex(), 1); + // contentY won't change for one index change in a view this high. + + // Changing interactive now shouldn't result in keyNavigationEnabled changing, + // since we broke the "binding". + listView->setInteractive(true); + QCOMPARE(enabledSpy.count(), 4); + + // Keyboard interaction shouldn't work now. + listView->setKeyNavigationEnabled(false); + QTest::keyClick(window.data(), Qt::Key_Down); + QCOMPARE(listView->currentIndex(), 1); +} + static bool testVisibleItems(const QQuickItemViewPrivate *priv, bool *nonUnique, FxViewItem **failItem, int *expectedIdx) { QHash<QQuickItem*, int> uniqueItems; diff --git a/tests/auto/quick/qquickloader/qquickloader.pro b/tests/auto/quick/qquickloader/qquickloader.pro index 567917877c..32350388e8 100644 --- a/tests/auto/quick/qquickloader/qquickloader.pro +++ b/tests/auto/quick/qquickloader/qquickloader.pro @@ -13,4 +13,3 @@ include (../../shared/util.pri) TESTDATA = data/* QT += core-private gui-private qml-private quick-private network testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickloader/tst_qquickloader.cpp b/tests/auto/quick/qquickloader/tst_qquickloader.cpp index f4fab1d79f..b9d058ab80 100644 --- a/tests/auto/quick/qquickloader/tst_qquickloader.cpp +++ b/tests/auto/quick/qquickloader/tst_qquickloader.cpp @@ -111,6 +111,8 @@ private slots: void asynchronous(); void asynchronous_clear(); void simultaneousSyncAsync(); + void asyncToSync1(); + void asyncToSync2(); void loadedSignal(); void parented(); @@ -1035,6 +1037,73 @@ void tst_QQuickLoader::simultaneousSyncAsync() delete root; } +void tst_QQuickLoader::asyncToSync1() +{ + QQmlEngine engine; + PeriodicIncubationController *controller = new PeriodicIncubationController; + QQmlIncubationController *previous = engine.incubationController(); + engine.setIncubationController(controller); + delete previous; + + QQmlComponent component(&engine, testFileUrl("asynchronous.qml")); + QQuickItem *root = qobject_cast<QQuickItem*>(component.create()); + QVERIFY(root); + + QQuickLoader *loader = root->findChild<QQuickLoader*>("loader"); + QVERIFY(loader); + + QVERIFY(!loader->item()); + root->setProperty("comp", "BigComponent.qml"); + QMetaObject::invokeMethod(root, "loadComponent"); + QVERIFY(!loader->item()); + + controller->start(); + QCOMPARE(loader->status(), QQuickLoader::Loading); + QCOMPARE(engine.incubationController()->incubatingObjectCount(), 0); + + // force completion before component created + loader->setAsynchronous(false); + QVERIFY(loader->item()); + QCOMPARE(loader->progress(), 1.0); + QCOMPARE(loader->status(), QQuickLoader::Ready); + QCOMPARE(static_cast<QQuickItem*>(loader)->childItems().count(), 1); + + delete root; +} + +void tst_QQuickLoader::asyncToSync2() +{ + PeriodicIncubationController *controller = new PeriodicIncubationController; + QQmlIncubationController *previous = engine.incubationController(); + engine.setIncubationController(controller); + delete previous; + + QQmlComponent component(&engine, testFileUrl("asynchronous.qml")); + QQuickItem *root = qobject_cast<QQuickItem*>(component.create()); + QVERIFY(root); + + QQuickLoader *loader = root->findChild<QQuickLoader*>("loader"); + QVERIFY(loader); + + QVERIFY(!loader->item()); + root->setProperty("comp", "BigComponent.qml"); + QMetaObject::invokeMethod(root, "loadComponent"); + QVERIFY(!loader->item()); + + controller->start(); + QCOMPARE(loader->status(), QQuickLoader::Loading); + QTRY_COMPARE(engine.incubationController()->incubatingObjectCount(), 1); + + // force completion after component created but before incubation complete + loader->setAsynchronous(false); + QVERIFY(loader->item()); + QCOMPARE(loader->progress(), 1.0); + QCOMPARE(loader->status(), QQuickLoader::Ready); + QCOMPARE(static_cast<QQuickItem*>(loader)->childItems().count(), 1); + + delete root; +} + void tst_QQuickLoader::loadedSignal() { PeriodicIncubationController *controller = new PeriodicIncubationController; diff --git a/tests/auto/quick/qquickmousearea/qquickmousearea.pro b/tests/auto/quick/qquickmousearea/qquickmousearea.pro index dd7b434898..15a080aa3e 100644 --- a/tests/auto/quick/qquickmousearea/qquickmousearea.pro +++ b/tests/auto/quick/qquickmousearea/qquickmousearea.pro @@ -11,4 +11,3 @@ include (../../shared/util.pri) TESTDATA = data/* QT += core-private gui-private qml-private quick-private network testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickmultipointtoucharea/qquickmultipointtoucharea.pro b/tests/auto/quick/qquickmultipointtoucharea/qquickmultipointtoucharea.pro index 5724a7179e..e5a2bae840 100644 --- a/tests/auto/quick/qquickmultipointtoucharea/qquickmultipointtoucharea.pro +++ b/tests/auto/quick/qquickmultipointtoucharea/qquickmultipointtoucharea.pro @@ -1,6 +1,5 @@ TARGET = tst_qquickmultipointtoucharea CONFIG += testcase -CONFIG += parallel_test macx:CONFIG -= app_bundle SOURCES += tst_qquickmultipointtoucharea.cpp @@ -11,4 +10,3 @@ include(../../shared/util.pri) include(../shared/util.pri) QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickopenglinfo/qquickopenglinfo.pro b/tests/auto/quick/qquickopenglinfo/qquickopenglinfo.pro index 8489dfffd2..650ec04029 100644 --- a/tests/auto/quick/qquickopenglinfo/qquickopenglinfo.pro +++ b/tests/auto/quick/qquickopenglinfo/qquickopenglinfo.pro @@ -7,7 +7,6 @@ include(../../shared/util.pri) osx:CONFIG -= app_bundle -CONFIG += parallel_test QT += quick testlib OTHER_FILES += \ diff --git a/tests/auto/quick/qquickpainteditem/qquickpainteditem.pro b/tests/auto/quick/qquickpainteditem/qquickpainteditem.pro index 381167cd09..a188001bd4 100644 --- a/tests/auto/quick/qquickpainteditem/qquickpainteditem.pro +++ b/tests/auto/quick/qquickpainteditem/qquickpainteditem.pro @@ -4,7 +4,4 @@ macx:CONFIG -= app_bundle SOURCES += tst_qquickpainteditem.cpp -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private network testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickpath/qquickpath.pro b/tests/auto/quick/qquickpath/qquickpath.pro index 4898f28c14..492f82f53d 100644 --- a/tests/auto/quick/qquickpath/qquickpath.pro +++ b/tests/auto/quick/qquickpath/qquickpath.pro @@ -8,7 +8,4 @@ include (../../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickpathview/qquickpathview.pro b/tests/auto/quick/qquickpathview/qquickpathview.pro index e6cf9a488f..90c1eb0c67 100644 --- a/tests/auto/quick/qquickpathview/qquickpathview.pro +++ b/tests/auto/quick/qquickpathview/qquickpathview.pro @@ -11,4 +11,3 @@ TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib qtHaveModule(widgets): QT += widgets -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickpincharea/qquickpincharea.pro b/tests/auto/quick/qquickpincharea/qquickpincharea.pro index fa14afa261..d37b37309d 100644 --- a/tests/auto/quick/qquickpincharea/qquickpincharea.pro +++ b/tests/auto/quick/qquickpincharea/qquickpincharea.pro @@ -1,5 +1,4 @@ CONFIG += testcase -CONFIG += parallel_test TARGET = tst_qquickpincharea macx:CONFIG -= app_bundle @@ -11,4 +10,3 @@ include (../shared/util.pri) TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro b/tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro index 62678dc660..185eb2c213 100644 --- a/tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro +++ b/tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro @@ -15,4 +15,3 @@ TESTDATA = data/* # LIBS += -lgcov QT += core-private gui-private qml-private quick-private network testlib concurrent -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickpositioners/qquickpositioners.pro b/tests/auto/quick/qquickpositioners/qquickpositioners.pro index f6a046e622..6e85ba9db8 100644 --- a/tests/auto/quick/qquickpositioners/qquickpositioners.pro +++ b/tests/auto/quick/qquickpositioners/qquickpositioners.pro @@ -10,4 +10,3 @@ macx:CONFIG -= app_bundle TESTDATA = data/* QT += testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickrectangle/qquickrectangle.pro b/tests/auto/quick/qquickrectangle/qquickrectangle.pro index e881926c80..daefb5fe75 100644 --- a/tests/auto/quick/qquickrectangle/qquickrectangle.pro +++ b/tests/auto/quick/qquickrectangle/qquickrectangle.pro @@ -10,4 +10,3 @@ include (../shared/util.pri) TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickrepeater/qquickrepeater.pro b/tests/auto/quick/qquickrepeater/qquickrepeater.pro index a27c34c84b..5554342943 100644 --- a/tests/auto/quick/qquickrepeater/qquickrepeater.pro +++ b/tests/auto/quick/qquickrepeater/qquickrepeater.pro @@ -9,6 +9,4 @@ include (../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickscreen/qquickscreen.pro b/tests/auto/quick/qquickscreen/qquickscreen.pro index fa64556a69..145ae0f04e 100644 --- a/tests/auto/quick/qquickscreen/qquickscreen.pro +++ b/tests/auto/quick/qquickscreen/qquickscreen.pro @@ -6,6 +6,4 @@ include (../../shared/util.pri) macx:CONFIG -= app_bundle -CONFIG += parallel_test QT += core-private gui-private qml-private testlib quick-private -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickshadereffect/qquickshadereffect.pro b/tests/auto/quick/qquickshadereffect/qquickshadereffect.pro index 0af54f83f6..437a548a90 100644 --- a/tests/auto/quick/qquickshadereffect/qquickshadereffect.pro +++ b/tests/auto/quick/qquickshadereffect/qquickshadereffect.pro @@ -5,6 +5,4 @@ SOURCES += tst_qquickshadereffect.cpp include (../../shared/util.pri) macx:CONFIG -= app_bundle -CONFIG += parallel_test QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickshortcut/qquickshortcut.pro b/tests/auto/quick/qquickshortcut/qquickshortcut.pro index 917a7605e6..d780d9061a 100644 --- a/tests/auto/quick/qquickshortcut/qquickshortcut.pro +++ b/tests/auto/quick/qquickshortcut/qquickshortcut.pro @@ -8,4 +8,3 @@ include (../../shared/util.pri) TESTDATA = data/* QT += core gui qml quick testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro b/tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro index 4694172ac4..3d71ef4c62 100644 --- a/tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro +++ b/tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro @@ -8,7 +8,4 @@ include (../../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro b/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro index 2f0395d3ea..bf8ddfe8ae 100644 --- a/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro +++ b/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro @@ -8,7 +8,4 @@ include (../../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickspritesequence/qquickspritesequence.pro b/tests/auto/quick/qquickspritesequence/qquickspritesequence.pro index ee5cb5d25b..a61396bd0e 100644 --- a/tests/auto/quick/qquickspritesequence/qquickspritesequence.pro +++ b/tests/auto/quick/qquickspritesequence/qquickspritesequence.pro @@ -8,7 +8,4 @@ macx:CONFIG -= app_bundle TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private network testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickstates/qquickstates.pro b/tests/auto/quick/qquickstates/qquickstates.pro index 1b638dfa67..85fdebff96 100644 --- a/tests/auto/quick/qquickstates/qquickstates.pro +++ b/tests/auto/quick/qquickstates/qquickstates.pro @@ -8,6 +8,4 @@ include (../../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickstyledtext/qquickstyledtext.pro b/tests/auto/quick/qquickstyledtext/qquickstyledtext.pro index e9a8ffe8ee..def2a27bf7 100644 --- a/tests/auto/quick/qquickstyledtext/qquickstyledtext.pro +++ b/tests/auto/quick/qquickstyledtext/qquickstyledtext.pro @@ -4,6 +4,4 @@ macx:CONFIG -= app_bundle SOURCES += tst_qquickstyledtext.cpp -CONFIG += parallel_test QT += core-private gui-private qml-private quick-private network testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquicksystempalette/qquicksystempalette.pro b/tests/auto/quick/qquicksystempalette/qquicksystempalette.pro index 48fd7e8e9a..9aa57b146b 100644 --- a/tests/auto/quick/qquicksystempalette/qquicksystempalette.pro +++ b/tests/auto/quick/qquicksystempalette/qquicksystempalette.pro @@ -4,7 +4,5 @@ macx:CONFIG -= app_bundle SOURCES += tst_qquicksystempalette.cpp -CONFIG += parallel_test QT += core-private gui-private qml-private quick-private testlib qtHaveModule(widgets): QT += widgets -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquicktext/qquicktext.pro b/tests/auto/quick/qquicktext/qquicktext.pro index ee0a9be776..4f4b77ed7b 100644 --- a/tests/auto/quick/qquicktext/qquicktext.pro +++ b/tests/auto/quick/qquicktext/qquicktext.pro @@ -13,4 +13,3 @@ include (../../shared/util.pri) TESTDATA = data/* QT += core-private gui-private qml-private quick-private network testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquicktextdocument/qquicktextdocument.pro b/tests/auto/quick/qquicktextdocument/qquicktextdocument.pro index e6bfdbd099..b5866e9e89 100644 --- a/tests/auto/quick/qquicktextdocument/qquicktextdocument.pro +++ b/tests/auto/quick/qquicktextdocument/qquicktextdocument.pro @@ -8,8 +8,5 @@ include (../../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquicktextedit/qquicktextedit.pro b/tests/auto/quick/qquicktextedit/qquicktextedit.pro index c6f2bb91a8..ea6e8bc60d 100644 --- a/tests/auto/quick/qquicktextedit/qquicktextedit.pro +++ b/tests/auto/quick/qquicktextedit/qquicktextedit.pro @@ -14,5 +14,3 @@ TESTDATA = data/* QT += core-private gui-private qml-private quick-private network-private testlib osx: LIBS += -framework AppKit - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquicktextinput/qquicktextinput.pro b/tests/auto/quick/qquicktextinput/qquicktextinput.pro index 4929289920..7868b60d1b 100644 --- a/tests/auto/quick/qquicktextinput/qquicktextinput.pro +++ b/tests/auto/quick/qquicktextinput/qquicktextinput.pro @@ -14,5 +14,3 @@ TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib osx: LIBS += -framework AppKit - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquicktextmetrics/qquicktextmetrics.pro b/tests/auto/quick/qquicktextmetrics/qquicktextmetrics.pro index 6ef68db8e2..a5c088d454 100644 --- a/tests/auto/quick/qquicktextmetrics/qquicktextmetrics.pro +++ b/tests/auto/quick/qquicktextmetrics/qquicktextmetrics.pro @@ -4,7 +4,4 @@ osx:CONFIG -= app_bundle SOURCES += tst_qquicktextmetrics.cpp -CONFIG += parallel_test - QT += core gui qml quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquicktimeline/qquicktimeline.pro b/tests/auto/quick/qquicktimeline/qquicktimeline.pro index 3fafc33505..489fc7e081 100644 --- a/tests/auto/quick/qquicktimeline/qquicktimeline.pro +++ b/tests/auto/quick/qquicktimeline/qquicktimeline.pro @@ -1,9 +1,7 @@ CONFIG += testcase -CONFIG += parallel_test TARGET = tst_qquicktimeline macx:CONFIG -= app_bundle SOURCES += tst_qquicktimeline.cpp QT += core-private gui-private qml quick qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickview/qquickview.pro b/tests/auto/quick/qquickview/qquickview.pro index 3e9c39e2ce..1302908bf7 100644 --- a/tests/auto/quick/qquickview/qquickview.pro +++ b/tests/auto/quick/qquickview/qquickview.pro @@ -1,5 +1,4 @@ CONFIG += testcase -CONFIG += parallel_test TARGET = tst_qquickview macx:CONFIG -= app_bundle @@ -10,4 +9,3 @@ include (../../shared/util.pri) TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro index d9aff688ab..9222e39477 100644 --- a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro +++ b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro @@ -11,4 +11,3 @@ TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib qtHaveModule(widgets): QT += widgets -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp index d578a0900c..a1d8779555 100644 --- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp +++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp @@ -102,15 +102,20 @@ public: }; SingleRoleModel(const QStringList &list = QStringList(), const QByteArray &role = "name", QObject *parent = 0) - : QAbstractItemModel(parent) { - QHash<int, QByteArray> roles; - roles.insert(Qt::DisplayRole , role); - setRoleNames(roles); + : QAbstractItemModel(parent), m_role(role) + { foreach (const QString &string, list) trunk.children.append(Node(string)); } ~SingleRoleModel() {} + QHash<int,QByteArray> roleNames() const + { + QHash<int,QByteArray> roles; + roles.insert(Qt::DisplayRole, m_role); + return roles; + } + Branch *branchForIndex(const QModelIndex &index) const { return index.isValid() ? static_cast<Branch *>(index.internalPointer())->children.at(index.row()).branch @@ -235,6 +240,7 @@ public slots: } private: + const QByteArray m_role; Branch trunk; }; diff --git a/tests/auto/quick/qquickwindow/qquickwindow.pro b/tests/auto/quick/qquickwindow/qquickwindow.pro index e95b7dbb10..f0d287f30f 100644 --- a/tests/auto/quick/qquickwindow/qquickwindow.pro +++ b/tests/auto/quick/qquickwindow/qquickwindow.pro @@ -17,5 +17,3 @@ OTHER_FILES += \ data/Headless.qml \ data/showHideAnimate.qml \ data/windoworder.qml - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index f53ade9541..b16b7b3686 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -397,7 +397,7 @@ void tst_qquickwindow::openglContextCreatedSignal() QVERIFY(spy.size() > 0); QVariant ctx = spy.at(0).at(0); - QCOMPARE(qVariantValue<QOpenGLContext *>(ctx), window.openglContext()); + QCOMPARE(qvariant_cast<QOpenGLContext *>(ctx), window.openglContext()); } void tst_qquickwindow::aboutToStopSignal() diff --git a/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro b/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro index 574481c456..642345a4bb 100644 --- a/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro +++ b/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro @@ -8,10 +8,7 @@ include (../../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private qml-private network testlib xmlpatterns -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 OTHER_FILES += \ data/groups.qml diff --git a/tests/auto/quick/rendernode/rendernode.pro b/tests/auto/quick/rendernode/rendernode.pro index bedcefde86..e4397713d9 100644 --- a/tests/auto/quick/rendernode/rendernode.pro +++ b/tests/auto/quick/rendernode/rendernode.pro @@ -8,7 +8,6 @@ TESTDATA = data/* include(../../shared/util.pri) -CONFIG += parallel_test QT += core-private gui-private qml-private quick-private testlib OTHER_FILES += \ @@ -16,4 +15,3 @@ OTHER_FILES += \ data/MessUpState.qml \ data/matrix.qml -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/scenegraph/scenegraph.pro b/tests/auto/quick/scenegraph/scenegraph.pro index 0ad13a086f..320228bd08 100644 --- a/tests/auto/quick/scenegraph/scenegraph.pro +++ b/tests/auto/quick/scenegraph/scenegraph.pro @@ -8,7 +8,6 @@ macx:CONFIG -= app_bundle QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 OTHER_FILES += \ data/render_OutOfFloatRange.qml \ diff --git a/tests/auto/quick/shared/viewtestutil.cpp b/tests/auto/quick/shared/viewtestutil.cpp index 1330cbccc9..9121314420 100644 --- a/tests/auto/quick/shared/viewtestutil.cpp +++ b/tests/auto/quick/shared/viewtestutil.cpp @@ -148,10 +148,6 @@ QList<int> QQuickViewTestUtil::adjustIndexesForRemoveDisplaced(const QList<int> QQuickViewTestUtil::QaimModel::QaimModel(QObject *parent) : QAbstractListModel(parent) { - QHash<int, QByteArray> roles; - roles[Name] = "name"; - roles[Number] = "number"; - setRoleNames(roles); } int QQuickViewTestUtil::QaimModel::rowCount(const QModelIndex &parent) const @@ -160,6 +156,14 @@ int QQuickViewTestUtil::QaimModel::rowCount(const QModelIndex &parent) const return list.count(); } +QHash<int,QByteArray> QQuickViewTestUtil::QaimModel::roleNames() const +{ + QHash<int,QByteArray> roles = QAbstractListModel::roleNames(); + roles.insert(Name, "name"); + roles.insert(Number, "number"); + return roles; +} + QVariant QQuickViewTestUtil::QaimModel::data(const QModelIndex &index, int role) const { QVariant rv; diff --git a/tests/auto/quick/shared/viewtestutil.h b/tests/auto/quick/shared/viewtestutil.h index 1643eca979..1de2f54d8a 100644 --- a/tests/auto/quick/shared/viewtestutil.h +++ b/tests/auto/quick/shared/viewtestutil.h @@ -80,6 +80,7 @@ namespace QQuickViewTestUtil int rowCount(const QModelIndex &parent=QModelIndex()) const; QVariant data(const QModelIndex &index, int role=Qt::DisplayRole) const; + QHash<int,QByteArray> roleNames() const; int count() const; QString name(int index) const; diff --git a/tests/auto/quick/touchmouse/touchmouse.pro b/tests/auto/quick/touchmouse/touchmouse.pro index 7d23dfc0ae..0df9bc53d3 100644 --- a/tests/auto/quick/touchmouse/touchmouse.pro +++ b/tests/auto/quick/touchmouse/touchmouse.pro @@ -14,4 +14,3 @@ TESTDATA = data/* # OTHER_FILES += data/foo.qml -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |