diff options
author | Alex Blasche <alexander.blasche@qt.io> | 2019-07-18 10:18:43 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@qt.io> | 2019-07-18 10:21:51 +0200 |
commit | 4646b8660721e5b8d06b06d714b4562e375f8c34 (patch) | |
tree | d12f0c1af2b6cdf486ff389607844a657a1b67c1 /sources/pyside2/tests/QtQml/registertype.qml | |
parent | 97718de50e14f69048993df4e87dda1cadcc599a (diff) | |
parent | 295d9d7fb52505666a6dc9ac7b6fba2323814c48 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ic2c43ef80769e3063dac771518c803861510f72e
Diffstat (limited to 'sources/pyside2/tests/QtQml/registertype.qml')
-rw-r--r--[-rwxr-xr-x] | sources/pyside2/tests/QtQml/registertype.qml | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/sources/pyside2/tests/QtQml/registertype.qml b/sources/pyside2/tests/QtQml/registertype.qml index c41226016..c41226016 100755..100644 --- a/sources/pyside2/tests/QtQml/registertype.qml +++ b/sources/pyside2/tests/QtQml/registertype.qml |