diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-05-11 17:37:07 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-24 05:52:32 +0200 |
| commit | 4709f30b26042427b225dd164648e3f5907c9d33 (patch) | |
| tree | 3edac8d14d3fb77406ef93aa2c34c42131109625 /src/qml/qml/v4/qv4irbuilder.cpp | |
| parent | 2542778d4837143a61dfcf143c32683acc8b998a (diff) | |
Enable binding to properties of type QJSValue.
This allows javascript objects of all types to be bound to properties
declared in c++. Compared to a QVariant the primary benefit this offers
is a type which functions and objects with functions can be bound to.
Change-Id: Idb3313e7ff1d616ab12d44f616083c8296201f3a
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/qml/qml/v4/qv4irbuilder.cpp')
| -rw-r--r-- | src/qml/qml/v4/qv4irbuilder.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/qml/v4/qv4irbuilder.cpp b/src/qml/qml/v4/qv4irbuilder.cpp index 52f0696be9..47acaaf67c 100644 --- a/src/qml/qml/v4/qv4irbuilder.cpp +++ b/src/qml/qml/v4/qv4irbuilder.cpp @@ -48,6 +48,8 @@ DEFINE_BOOL_CONFIG_OPTION(qmlVerboseCompiler, QML_VERBOSE_COMPILER) +Q_DECLARE_METATYPE(QJSValue) + QT_BEGIN_NAMESPACE using namespace QQmlJS; @@ -81,6 +83,8 @@ static IR::Type irTypeFromVariantType(int t, QQmlEnginePrivate *engine, const QM return IR::SGAnchorLineType; } else if (engine->metaObjectForType(t)) { return IR::ObjectType; + } else if (t == qMetaTypeId<QJSValue>()) { + return IR::JSValueType; } return IR::InvalidType; |