diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-07 10:39:07 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-07 10:39:11 +0200 |
| commit | 98a70cea3c1e996c341382834f8396794b2d67f1 (patch) | |
| tree | 0bd1cd8faad15664f195c37b1c987d85a2281a4a /sources/pyside2/PySide2/QtQml | |
| parent | 4f4716ace2c114e1565359f5eeacd1cf19542b2d (diff) | |
| parent | 700727855c8f5337a0901536b0a65cd608b40b28 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I81270510e3a27915781a50769bb627e666970142
Diffstat (limited to 'sources/pyside2/PySide2/QtQml')
| -rw-r--r-- | sources/pyside2/PySide2/QtQml/typesystem_qml.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/QtQml/typesystem_qml.xml b/sources/pyside2/PySide2/QtQml/typesystem_qml.xml index 4a346f232..f5e3d36fc 100644 --- a/sources/pyside2/PySide2/QtQml/typesystem_qml.xml +++ b/sources/pyside2/PySide2/QtQml/typesystem_qml.xml @@ -149,7 +149,6 @@ </object-type> <object-type name="QQmlFileSelector" /> <object-type name="QQmlImageProviderBase"> - <modify-function signature="QQmlImageProviderBase()" remove="all"/> <enum-type name="Flag" flags="Flags" /> <enum-type name="ImageType" /> </object-type> |