Merge "Merge remote-tracking branch 'origin/5.13' into dev"

3 files changed, 127 insertions, 0 deletions

diff --git a/sources/pyside2/tests/QtQml/CMakeLists.txt b/sources/pyside2/tests/QtQml/CMakeLists.txt
index 8460a8f0b..e2beb951e 100755
--- a/sources/pyside2/tests/QtQml/CMakeLists.txt
+++ b/sources/pyside2/tests/QtQml/CMakeLists.txt
@@ -18,3 +18,4 @@ PYSIDE_TEST(registertype.py)
 PYSIDE_TEST(javascript_exceptions.py)
 PYSIDE_TEST(qqmlincubator_incubateWhile.py)
 PYSIDE_TEST(qquickitem_grabToImage.py)
+PYSIDE_TEST(signal_arguments.py)
diff --git a/sources/pyside2/tests/QtQml/signal_arguments.py b/sources/pyside2/tests/QtQml/signal_arguments.py
new file mode 100755
index 000000000..096fa6882
--- /dev/null
+++ b/sources/pyside2/tests/QtQml/signal_arguments.py
@@ -0,0 +1,67 @@
+#############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the test suite of Qt for Python.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+import unittest
+from helper import adjust_filename, TimedQApplication
+from PySide2.QtQuick import QQuickView
+from PySide2.QtCore import QObject, Signal, Slot, QUrl, QTimer, Property
+
+class Obj(QObject):
+    def __init__(self):
+        QObject.__init__(self)
+        self.value = 0
+
+    sumResult = Signal(int, name="sumResult", arguments=['sum'])
+
+    @Slot(int, int)
+    def sum(self, arg1, arg2):
+        self.sumResult.emit(arg1 + arg2)
+
+    @Slot(str)
+    def sendValue(self, s):
+        self.value = int(s)
+
+
+class TestConnectionWithQml(TimedQApplication):
+
+    def testSignalArguments(self):
+        view = QQuickView()
+        obj = Obj()
+
+        context = view.rootContext()
+        context.setContextProperty("o", obj)
+        view.setSource(QUrl.fromLocalFile(adjust_filename('signal_arguments.qml', __file__)))
+        root = view.rootObject()
+        self.assertTrue(root)
+        button = root.findChild(QObject, "button")
+        view.show()
+        button.clicked.emit()
+        self.assertEqual(obj.value, 42)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/sources/pyside2/tests/QtQml/signal_arguments.qml b/sources/pyside2/tests/QtQml/signal_arguments.qml
new file mode 100644
index 000000000..0c65b947f
--- /dev/null
+++ b/sources/pyside2/tests/QtQml/signal_arguments.qml
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of Qt for Python.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import QtQuick.Layouts 1.2
+
+Rectangle {
+    visible: true
+    GridLayout {
+        Button {
+            id: "button"
+            objectName: "button"
+            text: "sum!"
+            onClicked: {
+                o.sum(40, 2)
+            }
+        }
+        Text {
+            id: sumResultText
+        }
+    }
+    Connections {
+        target: o
+        onSumResult: {
+            // set the value on the Qml side
+            sumResultText.text = sum
+            // set internal Python value from the already
+            // modified value
+            o.sendValue(sumResultText.text)
+        }
+    }
+}