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) { diff --git a/src/qml/jsapi/qjsengine.h b/src/qml/jsapi/qjsengine.h index 1dde093a01..db78e1b9a9 100644 --- a/src/qml/jsapi/qjsengine.h +++ b/src/qml/jsapi/qjsengine.h @@ -212,7 +212,9 @@ private: static bool convertManaged(const QJSManagedValue &value, int type, void *ptr); static bool convertManaged(const QJSManagedValue &value, QMetaType type, void *ptr); - static bool convertV2(const QJSValue &value, int type, void *ptr); +#if QT_VERSION < QT_VERSION_CHECK(7,0,0) + static bool convertV2(const QJSValue &value, int type, void *ptr); // only there for BC reasons +#endif static bool convertV2(const QJSValue &value, QMetaType metaType, void *ptr); static bool convertString(const QString &string, QMetaType metaType, void *ptr);