aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsapi/qjsengine.cpp
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2022-11-15 10:53:36 +0100
committerUlf Hermann <ulf.hermann@qt.io>2022-11-16 17:27:34 +0100
commit1935f13b1d3fb681454bb9be4f029f2b014c309f (patch)
treeb9f175728a94c7b91a09a20eaf94e9db58eaa086 /src/qml/jsapi/qjsengine.cpp
parent8404a6a5d426587c99dfe1ddb773153566ed68e0 (diff)
QJSEngine: Mark convertV2 variant with int parameter as BC-only
We won't need it anymore in Qt7. Change-Id: Iff8bfd5192d80d7603aaa66da8cb00ab23e60f99 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsapi/qjsengine.cpp')
-rw-r--r--src/qml/jsapi/qjsengine.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp
index 98df83fd99..c15b5c1ccd 100644
--- a/src/qml/jsapi/qjsengine.cpp
+++ b/src/qml/jsapi/qjsengine.cpp
@@ -828,10 +828,12 @@ bool QJSEngine::convertManaged(const QJSManagedValue &value, QMetaType type, voi
return QV4::ExecutionEngine::metaTypeFromJS(*value.d, type, ptr);
}
+#if QT_VERSION < QT_VERSION_CHECK(7,0,0)
bool QJSEngine::convertV2(const QJSValue &value, int type, void *ptr)
{
return convertV2(value, QMetaType(type), ptr);
}
+#endif
bool QJSEngine::convertString(const QString &string, QMetaType metaType, void *ptr)
{