summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-29 03:01:55 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-29 03:02:03 +0200
commit81c5d9cde21df4ef894f8136f1e061e65ac37cfd (patch)
treeb3995d0fa53484493854dc150153265bc2765a63
parentaa3048bf531f6dd3a33fb911886b64e9371bf853 (diff)
parent4817d5c80c9b0136ef10cfbf008c0f921f9feb72 (diff)
downloadqtquickcontrols-81c5d9cde21df4ef894f8136f1e061e65ac37cfd.tar.gz
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
-rw-r--r--dist/changes-5.12.420
-rw-r--r--tests/auto/controls/data/tst_treeview.qml57
2 files changed, 52 insertions, 25 deletions
diff --git a/dist/changes-5.12.4 b/dist/changes-5.12.4
new file mode 100644
index 00000000..a285cd8e
--- /dev/null
+++ b/dist/changes-5.12.4
@@ -0,0 +1,20 @@
+Qt 5.12.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.3.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/tests/auto/controls/data/tst_treeview.qml b/tests/auto/controls/data/tst_treeview.qml
index 139be338..902d2178 100644
--- a/tests/auto/controls/data/tst_treeview.qml
+++ b/tests/auto/controls/data/tst_treeview.qml
@@ -127,7 +127,7 @@ Item {
spy.target = tree
spy.signalName = "clicked"
compare(spy.count, 0)
- mouseClick(tree, semiIndent + 50, 120, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 120, Qt.LeftButton, Qt.NoModifier, 10)
compare(spy.count, 1)
var clickedItem = spy.signalArguments[0][0]
verify(clickedItem.valid)
@@ -201,7 +201,7 @@ Item {
// expanded on click
compare(spy.count, 0)
- mouseClick(tree, semiIndent, 70, Qt.LeftButton)
+ mouseClick(tree, semiIndent, 70, Qt.LeftButton, Qt.NoModifier, 10)
compare(spy.count, 1)
var expandedIndex = spy.signalArguments[0][0]
verify(expandedIndex.valid)
@@ -268,8 +268,9 @@ Item {
spy.target = tree
spy.signalName = "pressAndHold"
compare(spy.count, 0)
- mousePress(tree, styleIndent + 50, 70, Qt.LeftButton)
+ mousePress(tree, styleIndent + 50, 70, Qt.LeftButton, Qt.NoModifier, 10)
mouseRelease(tree, styleIndent + 50, 70, Qt.LeftButton, Qt.NoModifier, 1000)
+ wait(20)
compare(spy.count, 1)
verify(spy.signalArguments[0][0].valid)
compare(spy.signalArguments[0][0].row, 0)
@@ -288,7 +289,7 @@ Item {
// select second item with no children
verify(!tree.currentIndex.valid)
- mouseClick(tree, semiIndent + 50, 120, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 120, Qt.LeftButton, Qt.NoModifier, 10)
var secondTopItem = tree.currentIndex
verify(secondTopItem.valid)
verify(!secondTopItem.parent.valid)
@@ -342,27 +343,27 @@ Item {
selectionModel.model = tree.model
// Collect some model index
- mouseClick(tree, semiIndent + 50, 20 + 50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 50, Qt.LeftButton, Qt.NoModifier, 30)
var firstItem = tree.currentIndex
verify(firstItem.valid)
compare(firstItem.row, 0)
- mouseClick(tree, semiIndent + 50, 20 + 2*50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 2*50, Qt.LeftButton, Qt.NoModifier, 10)
var secondItem = tree.currentIndex
verify(secondItem.valid)
compare(secondItem.row, 1)
- mouseClick(tree, semiIndent + 50, 20 + 3*50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 3*50, Qt.LeftButton, Qt.NoModifier, 10)
var thirdItem = tree.currentIndex
verify(thirdItem.valid)
compare(thirdItem.row, 2)
- mouseClick(tree, semiIndent + 50, 20 + 4*50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 4*50, Qt.LeftButton, Qt.NoModifier, 10)
var fourthItem = tree.currentIndex
verify(fourthItem.valid)
compare(fourthItem.row, 3)
- mouseClick(tree, semiIndent + 50, 20 + 5*50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 5*50, Qt.LeftButton, Qt.NoModifier, 10)
var fifthItem = tree.currentIndex
verify(fifthItem.valid)
compare(fifthItem.row, 4)
- mouseClick(tree, semiIndent + 50, 20 + 6*50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 6*50, Qt.LeftButton, Qt.NoModifier, 10)
var sixthItem = tree.currentIndex
verify(sixthItem.valid)
compare(sixthItem.row, 5)
@@ -377,7 +378,7 @@ Item {
compare(tree.selectionMode, SelectionMode.SingleSelection)
verify(!tree.selection.currentIndex.valid)
- mouseClick(tree, semiIndent + 50, 20 + 2*50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 2*50, Qt.LeftButton, Qt.NoModifier, 10)
verify(tree.selection.currentIndex.valid)
compare(secondItem.internalId, tree.currentIndex.internalId)
@@ -467,17 +468,17 @@ Item {
selectionModel.model = tree.model
// Collect some model index
- mouseClick(tree, semiIndent + 50, 20 + 50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 50, Qt.LeftButton, Qt.NoModifier0, 10)
var firstItem = tree.currentIndex
- mouseClick(tree, semiIndent + 50, 20 + 2*50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 2*50, Qt.LeftButton, Qt.NoModifier, 10)
var secondItem = tree.currentIndex
- mouseClick(tree, semiIndent + 50, 20 + 3*50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 3*50, Qt.LeftButton, Qt.NoModifier, 10)
var thirdItem = tree.currentIndex
- mouseClick(tree, semiIndent + 50, 20 + 4*50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 4*50, Qt.LeftButton, Qt.NoModifier, 10)
var fourthItem = tree.currentIndex
- mouseClick(tree, semiIndent + 50, 20 + 5*50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 5*50, Qt.LeftButton, Qt.NoModifier, 10)
var fifthItem = tree.currentIndex
- mouseClick(tree, semiIndent + 50, 20 + 6*50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 6*50, Qt.LeftButton, Qt.NoModifier, 10)
var sixthItem = tree.currentIndex
compare(tree.selection, null)
@@ -490,7 +491,7 @@ Item {
tree.selectionMode = SelectionMode.MultiSelection
compare(tree.selectionMode, SelectionMode.MultiSelection)
- mouseClick(tree, semiIndent + 50, 70+50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 70+50, Qt.LeftButton, Qt.NoModifier, 10)
compare(secondItem.internalId, tree.currentIndex.internalId)
compare(tree.selection.hasSelection, true)
@@ -576,17 +577,17 @@ Item {
selectionModel.model = tree.model
// Collect some model index
- mouseClick(tree, semiIndent + 50, 20 + 50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 50, Qt.LeftButton, Qt.NoModifier, 10)
var firstItem = tree.currentIndex
- mouseClick(tree, semiIndent + 50, 20 + 2*50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 2*50, Qt.LeftButton, Qt.NoModifier, 10)
var secondItem = tree.currentIndex
- mouseClick(tree, semiIndent + 50, 20 + 3*50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 3*50, Qt.LeftButton, Qt.NoModifier, 10)
var thirdItem = tree.currentIndex
- mouseClick(tree, semiIndent + 50, 20 + 4*50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 4*50, Qt.LeftButton, Qt.NoModifier, 10)
var fourthItem = tree.currentIndex
- mouseClick(tree, semiIndent + 50, 20 + 5*50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 5*50, Qt.LeftButton, Qt.NoModifier, 10)
var fifthItem = tree.currentIndex
- mouseClick(tree, semiIndent + 50, 20 + 6*50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 20 + 6*50, Qt.LeftButton, Qt.NoModifier, 10)
var sixthItem = tree.currentIndex
compare(tree.selection, null)
@@ -599,7 +600,7 @@ Item {
tree.selectionMode = SelectionMode.ExtendedSelection
compare(tree.selectionMode, SelectionMode.ExtendedSelection)
- mouseClick(tree, semiIndent + 50, 70+50, Qt.LeftButton)
+ mouseClick(tree, semiIndent + 50, 70+50, Qt.LeftButton, Qt.NoModifier, 10)
compare(secondItem.internalId, tree.currentIndex.internalId)
compare(tree.selection.hasSelection, true)
@@ -753,6 +754,7 @@ Item {
verify(tree !== null, "tree created is null")
verify(waitForRendering(tree), "TreeView did not render on time")
var model = tree.model
+ wait(50)
// Sample each row and test
for (var row = 0; row < tree.__listView.count; row++) {
@@ -764,7 +766,12 @@ Item {
|| treeIndex.internalId !== modelIndex.internalId) {
console.log("Test about to fail: row = " + row + ", __listView.count =" + tree.__listView.count)
console.log(" . . . . . . . . . x =" + x + ", getColumn(0).width =" + tree.getColumn(0).width)
+ console.log("pairs of should-be-equal values: ",
+ treeIndex.row, modelIndex.row,
+ treeIndex.column, modelIndex.column,
+ treeIndex.internalId, modelIndex.internalId)
}
+
compare(treeIndex.row, modelIndex.row)
compare(treeIndex.column, modelIndex.column)
compare(treeIndex.internalId, modelIndex.internalId)