diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2023-06-16 15:03:33 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2023-06-20 11:38:41 +0200 |
commit | 8c451bba7aa6474c8aaec01b8fb02201e0237835 (patch) | |
tree | 77dd4d480379e964b68d9b1f249dd1dacb5fa314 /src/qml/jsruntime/qv4engine_p.h | |
parent | e50b2069f90542328fbc9917bf0345f30dfa583e (diff) |
QML: Allow conversion of symbols to QVariant
We produce their descriptiveString or simply a QVariant containing a
QJSValue, depending on whether we're supposed to convert objects without
equivalent C++ type or not.
Pick-to: 6.6 6.5 6.2
Fixes: QTBUG-113854
Change-Id: I22b6038c936d860fdd8aa227f9dfe704e3265a77
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4engine_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4engine_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h index b4fe8602f1..8590f330c4 100644 --- a/src/qml/jsruntime/qv4engine_p.h +++ b/src/qml/jsruntime/qv4engine_p.h @@ -663,7 +663,7 @@ public: // variant conversions static QVariant toVariant( - const QV4::Value &value, QMetaType typeHint, bool createJSValueForObjects = true); + const QV4::Value &value, QMetaType typeHint, bool createJSValueForObjectsAndSymbols = true); QV4::ReturnedValue fromVariant(const QVariant &); QV4::ReturnedValue fromVariant( const QVariant &variant, Heap::Object *parent, int property, uint flags); |