diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-06 21:19:07 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-06 21:19:07 +0200 |
commit | 91b93e1021ccc06d13e0d66a43bf7f9063faeff3 (patch) | |
tree | f5270164466b42367d4df63d723b3a4db4d7d0fe /sources/pyside2/doc/tutorials/qmlintegration/textproperties_material.png | |
parent | edae6185cef9c0ddd7c7c88bfa97c5043ba0d78a (diff) | |
parent | 06f97eca45ddadf4f04229cf14d5dc0bbd867316 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ia87a2e46bb051f1cccf3b7ba988aeb5eb32c0f0e
Diffstat (limited to 'sources/pyside2/doc/tutorials/qmlintegration/textproperties_material.png')
0 files changed, 0 insertions, 0 deletions