diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2023-01-10 12:56:58 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-01-18 14:29:47 +0000 |
| commit | 281497bfbc6af36c2051d255eed350c03da74439 (patch) | |
| tree | 3cd8ada9860f433f0b4f1215bda9c166d97cccee /src/qml/jsapi/qjsengine.cpp | |
| parent | 19b35008e2b2bebef10a9d52c8389920df1e1953 (diff) | |
Fix minor API problems
Add explicit where appropriate, and use more elegant constructs in
inline functions. Introduce removed_api.cpp for
QJSEngine::create(int, const void *).
Pick-to: 6.5
Change-Id: Ie54b0494fe3c5567f8a5ca361c3a583de3d97dd5
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/qml/jsapi/qjsengine.cpp')
| -rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index add8626691..04edd7a684 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -818,14 +818,6 @@ QJSValue QJSEngine::create(QMetaType type, const void *ptr) return QJSValuePrivate::fromReturnedValue(v->asReturnedValue()); } -#if QT_VERSION < QT_VERSION_CHECK(7,0,0) -QJSValue QJSEngine::create(int typeId, const void *ptr) -{ - QMetaType type(typeId); - return create(type, ptr); -} -#endif - bool QJSEngine::convertPrimitive(const QJSPrimitiveValue &value, QMetaType type, void *ptr) { switch (value.type()) { |