diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2023-06-07 09:27:39 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2023-06-09 09:35:32 +0200 |
commit | 56a4c899225db8b8badc50a2553e1352c06893f0 (patch) | |
tree | 8e53f6b7ed9a8058a88cfd71582340de79c339e2 /tests/auto/qml/qqmllanguage/testtypes.h | |
parent | 1d482737860b22f7419d0e57d993bb3247f4a014 (diff) |
QML: Re-add QMetaType::convert() attempt for argument conversion
There are people who depend on QMetaType to convert their types. This is
not nice, but removing it breaks compatibility.
Fixes: QTBUG-114340
Change-Id: I0a7f54b8fd0f77b71e7e56f65ef7d6f91c876237
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 761b455d4741bdbef47845623d6f44bdc8a464b5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto/qml/qqmllanguage/testtypes.h')
-rw-r--r-- | tests/auto/qml/qqmllanguage/testtypes.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/testtypes.h b/tests/auto/qml/qqmllanguage/testtypes.h index 3b4f612127..1220f70b3f 100644 --- a/tests/auto/qml/qqmllanguage/testtypes.h +++ b/tests/auto/qml/qqmllanguage/testtypes.h @@ -2426,6 +2426,11 @@ struct UnregisteredValueBaseType int foo = 12; }; +struct UnregisteredValueDerivedType: public UnregisteredValueBaseType +{ + int bar = 13; +}; + class UnregisteredValueTypeHandler: public QObject { Q_OBJECT @@ -2435,6 +2440,7 @@ public: public slots: UnregisteredValueBaseType produce() { return UnregisteredValueBaseType(); } + UnregisteredValueDerivedType produceDerived() { return UnregisteredValueDerivedType(); } void consume(UnregisteredValueBaseType) { ++consumed; } }; |