diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-06-23 08:19:10 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-06-23 17:44:03 +0200 |
| commit | 3a95dd4df359750254eab4f46b69d1133b071b72 (patch) | |
| tree | 7304e6d5df09e0528fe275eadee7f7bdecc5ee8d /tests/auto/qml/qqmlecmascript | |
| parent | 15d9940ac261709a0bea9b42ae8ce72eabdd3c3a (diff) | |
qqmlecmascript: modify test to return type which is actually unknown
This is necessary after the change to QMetaMethod, which now uses
compile time information to return the (meta) return type.
Change-Id: I9f0bf4fd174c7000273b6d3c65ec3ebf8f2c46f8
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlecmascript')
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/testtypes.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h index b999c670a8..0d92288148 100644 --- a/tests/auto/qml/qqmlecmascript/testtypes.h +++ b/tests/auto/qml/qqmlecmascript/testtypes.h @@ -761,6 +761,8 @@ struct NonRegisteredType }; +struct CompletelyUnknown; + class MyInvokableObject : public MyInvokableBaseObject { Q_OBJECT @@ -782,7 +784,7 @@ public: Q_INVOKABLE qreal method_NoArgs_real() { invoke(2); return 19.75; } Q_INVOKABLE QPointF method_NoArgs_QPointF() { invoke(3); return QPointF(123, 4.5); } Q_INVOKABLE QObject *method_NoArgs_QObject() { invoke(4); return this; } - Q_INVOKABLE MyInvokableObject *method_NoArgs_unknown() { invoke(5); return this; } + Q_INVOKABLE CompletelyUnknown *method_NoArgs_unknown() { invoke(5); return nullptr; } Q_INVOKABLE QJSValue method_NoArgs_QScriptValue() { invoke(6); return QJSValue("Hello world"); } Q_INVOKABLE QVariant method_NoArgs_QVariant() { invoke(7); return QVariant("QML rocks"); } |