summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-19 03:04:25 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-19 03:04:25 +0200
commit158b7dafcb21b6f8816841636afba13ebde1c62a (patch)
tree919b26a6018452dfaa318b39d0947353c2c08150
parentecaf7132fe47f3965cdf3e48a1c2d859f3911cd0 (diff)
parent21376d049d6542c2a66667bfea5371dd0868ede3 (diff)
downloadqtquickcontrols-158b7dafcb21b6f8816841636afba13ebde1c62a.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I4044a522b132a0045858311d5628409a3225f3d4
-rw-r--r--tests/auto/controls/BLACKLIST3
-rw-r--r--tests/auto/extras/data/tst_tumbler.qml35
2 files changed, 3 insertions, 35 deletions
diff --git a/tests/auto/controls/BLACKLIST b/tests/auto/controls/BLACKLIST
new file mode 100644
index 00000000..ddf33812
--- /dev/null
+++ b/tests/auto/controls/BLACKLIST
@@ -0,0 +1,3 @@
+# QTBUG-79161
+[Tests_TableView::test_headervisible]
+macos
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: {