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 | |
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>
-rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 6 | ||||
-rw-r--r-- | tests/auto/qml/qqmllanguage/data/unregisteredValueTypeConversion.qml | 5 | ||||
-rw-r--r-- | tests/auto/qml/qqmllanguage/testtypes.cpp | 1 | ||||
-rw-r--r-- | tests/auto/qml/qqmllanguage/testtypes.h | 6 | ||||
-rw-r--r-- | tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 2 |
5 files changed, 17 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index f6a602fa20..4b6fc88606 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -2190,7 +2190,11 @@ bool CallArgument::fromValue(QMetaType metaType, ExecutionEngine *engine, const qvariantPtr = new (&allocData) QVariant(metaType); type = QVariantWrappedType; - return ExecutionEngine::metaTypeFromJS(value, metaType, qvariantPtr->data()); + if (ExecutionEngine::metaTypeFromJS(value, metaType, qvariantPtr->data())) + return true; + + const QVariant v = ExecutionEngine::toVariant(value, metaType); + return QMetaType::convert(v.metaType(), v.constData(), metaType, qvariantPtr->data()); } ReturnedValue CallArgument::toValue(ExecutionEngine *engine) diff --git a/tests/auto/qml/qqmllanguage/data/unregisteredValueTypeConversion.qml b/tests/auto/qml/qqmllanguage/data/unregisteredValueTypeConversion.qml index ecf2130f5a..e0cebe58fc 100644 --- a/tests/auto/qml/qqmllanguage/data/unregisteredValueTypeConversion.qml +++ b/tests/auto/qml/qqmllanguage/data/unregisteredValueTypeConversion.qml @@ -2,5 +2,8 @@ import QtQml import Test UnregisteredValueTypeHandler { - Component.onCompleted: consume(produce()) + Component.onCompleted: { + consume(produce()) + consume(produceDerived()) + } } diff --git a/tests/auto/qml/qqmllanguage/testtypes.cpp b/tests/auto/qml/qqmllanguage/testtypes.cpp index 87241921c9..3fc9fd7f16 100644 --- a/tests/auto/qml/qqmllanguage/testtypes.cpp +++ b/tests/auto/qml/qqmllanguage/testtypes.cpp @@ -150,6 +150,7 @@ void registerTypes() qmlRegisterTypesAndRevisions<DerivedValueType>("ValueTypes", 1); qmlRegisterTypesAndRevisions<GetterObject>("Test", 1); + QMetaType::registerConverter<UnregisteredValueDerivedType, UnregisteredValueBaseType>(); qmlRegisterTypesAndRevisions<UnregisteredValueTypeHandler>("Test", 1); } 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; } }; diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index ff5eeb9d7a..e1884dd87c 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -7920,7 +7920,7 @@ void tst_qqmllanguage::unregisteredValueTypeConversion() QVERIFY(!o.isNull()); UnregisteredValueTypeHandler *handler = qobject_cast<UnregisteredValueTypeHandler *>(o.data()); Q_ASSERT(handler); - QCOMPARE(handler->consumed, 1); + QCOMPARE(handler->consumed, 2); } QTEST_MAIN(tst_qqmllanguage) |