diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-03 08:24:42 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-03 13:42:12 +0200 |
| commit | 3dd32863337ea2f6308ebf2f7656795d3fd488c9 (patch) | |
| tree | 08a3b35607dee19536ccb5f21b2ede0fdc41cc79 /sources/pyside2/tests/QtQml | |
| parent | 4f4f1be9f46e02e87357aeee613cfd5ea0be8220 (diff) | |
| parent | 67d635fe2cc2c89c30486a2e26dea4106a9d9c16 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'sources/pyside2/tests/QtQml')
| -rwxr-xr-x | sources/pyside2/tests/QtQml/bug_726.py | 2 | ||||
| -rwxr-xr-x | sources/pyside2/tests/QtQml/bug_997.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/tests/QtQml/bug_726.py b/sources/pyside2/tests/QtQml/bug_726.py index 310153421..20fa4d196 100755 --- a/sources/pyside2/tests/QtQml/bug_726.py +++ b/sources/pyside2/tests/QtQml/bug_726.py @@ -50,7 +50,7 @@ class ProxyObject(QtCore.QObject): @QtCore.Slot(str) def receivedObject(self, name): self._receivedName = name - + class TestConnectionWithInvalidSignature(TimedQApplication): diff --git a/sources/pyside2/tests/QtQml/bug_997.qml b/sources/pyside2/tests/QtQml/bug_997.qml index 7d2b7fcc0..f36a7e8f8 100755 --- a/sources/pyside2/tests/QtQml/bug_997.qml +++ b/sources/pyside2/tests/QtQml/bug_997.qml @@ -29,6 +29,6 @@ import QtQuick 2.0 Text { - text: owner.name + " " + owner.phone + text: owner.name + " " + owner.phone Component.onCompleted: { owner.newName = owner.name } } |