diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-09-03 01:34:48 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-09-03 01:34:48 (GMT) |
| commit | 1bd2eb8ecd6b2377132beaa789c8b3b8a6f544d9 (patch) | |
| tree | 907c4ad3add01e33b64778233839612d195f79f5 /src/declarative/qml/qdeclarativeengine.cpp | |
| parent | b22697903a004fa947bae916a152ac3311346510 (diff) | |
| download | Qt-1bd2eb8ecd6b2377132beaa789c8b3b8a6f544d9.zip Qt-1bd2eb8ecd6b2377132beaa789c8b3b8a6f544d9.tar.gz Qt-1bd2eb8ecd6b2377132beaa789c8b3b8a6f544d9.tar.bz2 | |
Support passing QObject derived types to QML methods
QTBUG-13047
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 8461368..e77a53e 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -2113,7 +2113,7 @@ bool QDeclarativeEnginePrivate::isQObject(int t) QObject *QDeclarativeEnginePrivate::toQObject(const QVariant &v, bool *ok) const { int t = v.userType(); - if (m_compositeTypes.contains(t)) { + if (t == QMetaType::QObjectStar || m_compositeTypes.contains(t)) { if (ok) *ok = true; return *(QObject **)(v.constData()); } else { |