projects / pyqt5.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6702e8b) | patch
upstream fixes related to Qt Quick support
authorPhil Thompson <phil@riverbankcomputing.com>
Thu, 10 May 2018 12:38:28 +0000 (15:38 +0300)
committerDmitry Shachnev <mitya57@debian.org>
Thu, 10 May 2018 14:09:00 +0000 (15:09 +0100)
commita4d4a9273a2bb9db51e7c3f1ed6fefe871682722
treea6ac008ef9fd48d71643cd82d7dd31acd1f195a4tree | snapshot
parent6702e8be3ad470a6acb39b2e853b360d05461b1ecommit | diff
upstream fixes related to Qt Quick support

- Handle QQuickWindow and QQuickView as special cases (cf. QQuickItem)
  when exposing sub-classes to QML.
- Fixed the handling of QQuickItem and similar classes so that the
  correct meta-object is returned by metaObject().
- Improved the fix for QtQuick meta-objects so that the
  customgeometry.py example works again.

Origin: upstream, changesets 78085eee5e7e, 8bf883e1619f and 7facd5e24cbb

Gbp-Pq: Name cura_crash.diff
13 files changed:
qpy/QtQuick/qpyquick_register_type.cpp diff | blob | history
qpy/QtQuick/qpyquickframebufferobject.cpp diff | blob | history
qpy/QtQuick/qpyquickframebufferobject.h diff | blob | history
qpy/QtQuick/qpyquickitem.cpp diff | blob | history
qpy/QtQuick/qpyquickitem.h diff | blob | history
qpy/QtQuick/qpyquickpainteditem.cpp diff | blob | history
qpy/QtQuick/qpyquickpainteditem.h diff | blob | history
qpy/QtQuick/qpyquickview.cpp [new file with mode: 0644] blob
qpy/QtQuick/qpyquickview.h [new file with mode: 0644] blob
qpy/QtQuick/qpyquickwindow.cpp [new file with mode: 0644] blob
qpy/QtQuick/qpyquickwindow.h [new file with mode: 0644] blob
sip/QtQuick/qquickview.sip diff | blob | history
sip/QtQuick/qquickwindow.sip diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.