summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-10-14 14:09:22 +0200
committerLiang Qi <liang.qi@qt.io>2019-10-14 14:09:22 +0200
commit70d02504f7215d46d8244f84a8192609c53c8b63 (patch)
tree3c083c3788263ada30fbe2e7b3432f1c3ae76747
parent59264fc24e3806a7e43379a2b8c610148f89cccb (diff)
parent7f61a351148c7d67f8f4ee6f2d2c4a9c53766297 (diff)
downloadqtquickcontrols-70d02504f7215d46d8244f84a8192609c53c8b63.tar.gz
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts: tests/auto/extras/data/tst_tumbler.qml Change-Id: Ia8b373767a311e973e3b171109b6b8b6c33f82b0
-rw-r--r--tests/auto/extras/data/tst_tumbler.qml35
1 files changed, 0 insertions, 35 deletions
diff --git a/tests/auto/extras/data/tst_tumbler.qml b/tests/auto/extras/data/tst_tumbler.qml
index 54365f14..6f207b4b 100644
--- a/tests/auto/extras/data/tst_tumbler.qml
+++ b/tests/auto/extras/data/tst_tumbler.qml
@@ -326,41 +326,6 @@ Item {
verify(secondItem.y < thirdItem.y);
}
- property Component oneHundredItemColumn: TumblerColumn {
- model: ListModel {
- Component.onCompleted: {
- for (var i = 0; i < 100; ++i) {
- append({value: i.toString()});
- }
- }
- }
- }
-
- function test_resizeAfterFlicking() {
- var tumbler = createTemporaryObject(tumblerComponent, container);
- verify(tumbler);
-
- // Test QTBUG-40367 (which is actually invalid because it was my fault :)).
- var column = oneHundredItemColumn.createObject(tumbler);
- compare(tumbler.addColumn(column), column);
- waitForRendering(tumbler);
-
- // Flick in some direction.
- var pos = Qt.point(columnXCenter(tumbler, 0), tumbler.__style.padding.top);
- mouseDrag(tumbler, pos.x, pos.y, 0, tumbler.height - tumbler.__style.padding.bottom,
- Qt.LeftButton, Qt.NoModifier, 300);
- tryCompare(tumbler.__viewAt(0), "offset", Settings.styleName === "Flat" ? 5.0 : 3.0);
-
- tumbler.height += 100;
- var padding = tumbler.__style.padding;
- compare(tumbler.__style.__delegateHeight,
- (tumbler.height - padding.top - padding.bottom) / tumbler.__style.visibleItemCount);
- waitForRendering(tumbler);
- pos = itemCenterPos(tumbler, 0, 1);
- var ninetyEighthItem = tumbler.__viewAt(0).itemAt(pos.x, pos.y);
- verify(ninetyEighthItem);
- }
-
property Component dayOfMonthColumn: TumblerColumn {
model: ListModel {
Component.onCompleted: {