diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-06-18 15:06:16 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-22 00:13:28 +0200 |
commit | fa457e593deca9fcffe2d6ec6ca0aa40d9fa7b76 (patch) | |
tree | a8e53434055544fcf3ebeb9ba5982b3d7f72cf38 /src/qml/qml/qqmlpropertycache_p.h | |
parent | 57e3325affbe8bbb8edcc2c6d072db28aee46438 (diff) |
Support enum return types in Q_INVOKABLE functions.
Handle enums correctly when used as the return type of a Q_INVOKABLE
function.
Task-number: QTBUG-23543
Change-Id: I14a506ffee08f5ba6aa0fdf27d6104a3ae5c48b3
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlpropertycache_p.h')
-rw-r--r-- | src/qml/qml/qqmlpropertycache_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h index 4641a8d60f..3e87fa3c7f 100644 --- a/src/qml/qml/qqmlpropertycache_p.h +++ b/src/qml/qml/qqmlpropertycache_p.h @@ -296,6 +296,8 @@ public: QQmlPropertyData &); static int *methodParameterTypes(QObject *, int index, QVarLengthArray<int, 9> &dummy, QByteArray *unknownTypeError); + static int methodReturnType(QObject *, const QQmlPropertyData &data, + QByteArray *unknownTypeError); static QList<QByteArray> signalParameterNames(QObject *, int index); const char *className() const; |