Merge remote-tracking branch 'origin/5.9' into 5.10

Change-Id: Ide4b85626dd153b534c39a3afa2f3b9e732badf5

3 files changed, 78 insertions, 2 deletions

diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index b70aeaab..a831e402 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -776,12 +776,14 @@ TestCase {
         return [
             { tag: "0.0..1.0", from: 0.0, to: 1.0, values: [0.0, 0.2, 0.5, 1.0] },
             { tag: "0..100", from: 0, to: 100, values: [0, 20, 50, 100] },
-            { tag: "100..-100", from: 100, to: -100, values: [100, 60, 0, -100] }
+            { tag: "100..-100", from: 100, to: -100, values: [100, 60, 0, -100] },
+            { tag: "-7..7", from: -7, to: 7, stepSize: 1.0, values: [-7.0, -4.0, 0.0, 7.0] },
+            { tag: "-3..7", from: -3, to: 7, stepSize: 5.0, values: [-3.0, -3.0, 2.0, 7.0] },
         ]
     }
 
     function test_valueAt(data) {
-        var control = createTemporaryObject(slider, testCase, {from: data.from, to: data.to})
+        var control = createTemporaryObject(slider, testCase, {from: data.from, to: data.to, stepSize: data.stepSize})
         verify(control)
 
         compare(control.valueAt(0.0), data.values[0])
diff --git a/tests/auto/platform/data/tst_messagedialog.qml b/tests/auto/platform/data/tst_messagedialog.qml
index 8415f429..cf51c27d 100644
--- a/tests/auto/platform/data/tst_messagedialog.qml
+++ b/tests/auto/platform/data/tst_messagedialog.qml
@@ -63,9 +63,51 @@ TestCase {
         MessageDialog { }
     }
 
+    SignalSpy {
+        id: spy
+    }
+
     function test_instance() {
         var dialog = messageDialog.createObject(testCase)
         verify(dialog)
         dialog.destroy()
     }
+
+    function test_standardButtons() {
+        // Q_FLAGS(QPlatformDialogHelper::StandardButtons)
+        compare(MessageDialog.NoButton       , 0x00000000)
+        compare(MessageDialog.Ok             , 0x00000400)
+        compare(MessageDialog.Save           , 0x00000800)
+        compare(MessageDialog.SaveAll        , 0x00001000)
+        compare(MessageDialog.Open           , 0x00002000)
+        compare(MessageDialog.Yes            , 0x00004000)
+        compare(MessageDialog.YesToAll       , 0x00008000)
+        compare(MessageDialog.No             , 0x00010000)
+        compare(MessageDialog.NoToAll        , 0x00020000)
+        compare(MessageDialog.Abort          , 0x00040000)
+        compare(MessageDialog.Retry          , 0x00080000)
+        compare(MessageDialog.Ignore         , 0x00100000)
+        compare(MessageDialog.Close          , 0x00200000)
+        compare(MessageDialog.Cancel         , 0x00400000)
+        compare(MessageDialog.Discard        , 0x00800000)
+        compare(MessageDialog.Help           , 0x01000000)
+        compare(MessageDialog.Apply          , 0x02000000)
+        compare(MessageDialog.Reset          , 0x04000000)
+        compare(MessageDialog.RestoreDefaults, 0x08000000)
+    }
+
+    function test_clicked() {
+        var dialog = messageDialog.createObject(testCase)
+        verify(dialog)
+
+        spy.target = dialog
+        spy.signalName = "clicked"
+
+        dialog.clicked(MessageDialog.Yes)
+        compare(spy.count, 1)
+        compare(spy.signalArguments[0][0], MessageDialog.Yes)
+
+        spy.clear()
+        dialog.destroy()
+    }
 }
diff --git a/tests/auto/platform/data/tst_systemtrayicon.qml b/tests/auto/platform/data/tst_systemtrayicon.qml
index 62e231c0..ea6f731a 100644
--- a/tests/auto/platform/data/tst_systemtrayicon.qml
+++ b/tests/auto/platform/data/tst_systemtrayicon.qml
@@ -97,4 +97,36 @@ TestCase {
         spy.clear()
         icon.destroy()
     }
+
+    function test_messageIcon() {
+        // Q_ENUMS(QPlatformSystemTrayIcon::ActivationReason)
+        compare(SystemTrayIcon.NoIcon, 0)
+        compare(SystemTrayIcon.Information, 1)
+        compare(SystemTrayIcon.Warning, 2)
+        compare(SystemTrayIcon.Critical, 3)
+    }
+
+    function test_activationReason() {
+        // Q_ENUMS(QPlatformSystemTrayIcon::ActivationReason)
+        compare(SystemTrayIcon.Unknown, 0)
+        compare(SystemTrayIcon.Context, 1)
+        compare(SystemTrayIcon.DoubleClick, 2)
+        compare(SystemTrayIcon.Trigger, 3)
+        compare(SystemTrayIcon.MiddleClick, 4)
+    }
+
+    function test_activated() {
+        var icon = systemTrayIcon.createObject(testCase)
+        verify(icon)
+
+        spy.target = icon
+        spy.signalName = "activated"
+
+        icon.activated(SystemTrayIcon.Trigger)
+        compare(spy.count, 1)
+        compare(spy.signalArguments[0][0], SystemTrayIcon.Trigger)
+
+        spy.clear()
+        icon.destroy()
+    }
 }