Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I4b1a4ebf258c9d31e537f42c8d0219c4294628bb

21 files changed, 319 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_calendar.qml b/tests/auto/controls/data/tst_calendar.qml
index 55283b021..17b2b9b41 100644
--- a/tests/auto/controls/data/tst_calendar.qml
+++ b/tests/auto/controls/data/tst_calendar.qml
@@ -414,6 +414,9 @@ Item {
                     compare(calendar.selectedDate.getDate(), expectedDate.getDate());
                     compare(calendar.__panel.pressedCellIndex, cellIndex);
                     compare(pressedSignalSpy.count, 1);
+                    compare(pressedSignalSpy.signalArguments[0][0].getFullYear(), expectedDate.getFullYear());
+                    compare(pressedSignalSpy.signalArguments[0][0].getMonth(), expectedDate.getMonth());
+                    compare(pressedSignalSpy.signalArguments[0][0].getDate(), expectedDate.getDate());
                     compare(releasedSignalSpy.count, 0);
                     compare(clickedSignalSpy.count, 0);
 
@@ -421,7 +424,14 @@ Item {
                     compare(calendar.__panel.pressedCellIndex, -1);
                     compare(pressedSignalSpy.count, 1);
                     compare(releasedSignalSpy.count, 1);
+                    // Will fail
+//                    compare(releasedSignalSpy.signalArguments[0][0].getFullYear(), expectedDate.getFullYear());
+//                    compare(releasedSignalSpy.signalArguments[0][0].getMonth(), expectedDate.getMonth());
+//                    compare(releasedSignalSpy.signalArguments[0][0].getDate(), expectedDate.getDate());
                     compare(clickedSignalSpy.count, 1);
+                    compare(clickedSignalSpy.signalArguments[0][0].getFullYear(), expectedDate.getFullYear());
+                    compare(clickedSignalSpy.signalArguments[0][0].getMonth(), expectedDate.getMonth());
+                    compare(clickedSignalSpy.signalArguments[0][0].getDate(), expectedDate.getDate());
 
                     pressedSignalSpy.clear();
                     releasedSignalSpy.clear();
diff --git a/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml b/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml
new file mode 100644
index 000000000..436b959a7
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 1000
+    delegate: BusyIndicator {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        running: index % 2
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_button.qml b/tests/benchmarks/qmlbench/creation/delegates_button.qml
new file mode 100644
index 000000000..b12fe65c4
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_button.qml
@@ -0,0 +1,15 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 1000
+    delegate: Button {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        text: "Button"
+        __effectivePressed: index % 2
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml b/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml
new file mode 100644
index 000000000..be0d79c8f
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml
@@ -0,0 +1,15 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 1000
+    delegate: CheckBox {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        text: "CheckBox"
+        checked: index % 2
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_combobox.qml b/tests/benchmarks/qmlbench/creation/delegates_combobox.qml
new file mode 100644
index 000000000..0cec266f6
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_combobox.qml
@@ -0,0 +1,15 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 250
+    delegate: ComboBox {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        model: 5
+        currentIndex: index % count
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml b/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml
new file mode 100644
index 000000000..2110a0553
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml
@@ -0,0 +1,15 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Extras 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 1000
+    delegate: DelayButton {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        text: "DelayButton"
+        __effectivePressed: index % 2
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_dial.qml b/tests/benchmarks/qmlbench/creation/delegates_dial.qml
new file mode 100644
index 000000000..50c685f32
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_dial.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Extras 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 500
+    delegate: Dial {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        value: index / root.staticCount
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml b/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml
new file mode 100644
index 000000000..305140431
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml
@@ -0,0 +1,18 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 1000
+    delegate: GroupBox {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        title: "GroupBox"
+        Item {
+            implicitWidth: 100
+            implicitHeight: 100
+        }
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_label.qml b/tests/benchmarks/qmlbench/creation/delegates_label.qml
new file mode 100644
index 000000000..70f9934ad
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_label.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 1000
+    delegate: Label {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        text: "Label"
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_menu.qml b/tests/benchmarks/qmlbench/creation/delegates_menu.qml
new file mode 100644
index 000000000..62878ce3f
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_menu.qml
@@ -0,0 +1,22 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 200
+    delegate: Item {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        width: menu.width
+        height: menu.height
+        Menu {
+            id: menu
+            visible: true
+            MenuItem { text: "MenuItem1" }
+            MenuItem { text: "MenuItem2" }
+            MenuItem { text: "MenuItem3" }
+        }
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml b/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml
new file mode 100644
index 000000000..64dbd5c1f
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 1000
+    delegate: ProgressBar {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        value: index / root.staticCount
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml b/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml
new file mode 100644
index 000000000..2a79754d4
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml
@@ -0,0 +1,15 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 1000
+    delegate: RadioButton {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        text: "RadioButton"
+        checked: index % 2
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml b/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml
new file mode 100644
index 000000000..57d596677
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml
@@ -0,0 +1,19 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 250
+    delegate: ScrollView {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        width: 100
+        height: 100
+        Item {
+            implicitWidth: 200
+            implicitHeight: 200
+        }
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_slider.qml b/tests/benchmarks/qmlbench/creation/delegates_slider.qml
new file mode 100644
index 000000000..a036d26d5
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_slider.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 1000
+    delegate: Slider {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        value: index / root.staticCount
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml b/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml
new file mode 100644
index 000000000..b5af86e1f
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 250
+    delegate: SpinBox {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        value: index / root.staticCount * maximumValue
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_stackview.qml b/tests/benchmarks/qmlbench/creation/delegates_stackview.qml
new file mode 100644
index 000000000..7e551028e
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_stackview.qml
@@ -0,0 +1,18 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 2000
+    delegate: StackView {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        width: 100
+        height: 100
+        initialItem: Item {
+            focus: StackView.status === StackView.Active
+        }
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_switch.qml b/tests/benchmarks/qmlbench/creation/delegates_switch.qml
new file mode 100644
index 000000000..88c871291
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_switch.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 1000
+    delegate: Switch {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        checked: index % 2
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_textarea.qml b/tests/benchmarks/qmlbench/creation/delegates_textarea.qml
new file mode 100644
index 000000000..6801ffba0
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_textarea.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 500
+    delegate: TextArea {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        text: "Text\nArea"
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_textfield.qml b/tests/benchmarks/qmlbench/creation/delegates_textfield.qml
new file mode 100644
index 000000000..10b990a7d
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_textfield.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 1000
+    delegate: TextField {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        text: "TextField"
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml
new file mode 100644
index 000000000..075283bb3
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml
@@ -0,0 +1,15 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Controls 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 1000
+    delegate: ToolButton {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        text: "ToolButton"
+        __effectivePressed: index % 2
+    }
+}
diff --git a/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml b/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml
new file mode 100644
index 000000000..8a41d42ee
--- /dev/null
+++ b/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml
@@ -0,0 +1,16 @@
+import QtQuick 2.0
+import QmlBench 1.0
+import QtQuick.Extras 1.4
+
+CreationBenchmark {
+    id: root
+    count: 20
+    staticCount: 250
+    delegate: Tumbler {
+        x: QmlBench.getRandom() * root.width - width
+        y: QmlBench.getRandom() * root.height - height
+        TumblerColumn {
+            model: 5
+        }
+    }
+}