diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-12-11 15:47:27 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-11 15:58:26 +0100 |
| commit | c72b7fe5cdd80a171734920ba406abfa266a1db0 (patch) | |
| tree | d1ca4cee47fa413b9b968499b41fdf51242079ee /src | |
| parent | 27c89b420211cbacd06681181e5ae41ca96d73c5 (diff) | |
Make sure Q_DECLARE_METATYPE is used in all TUs it is registered in.
Change-Id: I0aea3bfcae77d22f04166ce7e04c9a4898e7f99b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index fa7134ed..23bc9aa1 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -114,6 +114,7 @@ #endif Q_DECLARE_METATYPE(QDeclarativeProperty) +Q_DECLARE_METATYPE(QScriptValue) QT_BEGIN_NAMESPACE @@ -570,7 +571,7 @@ void QDeclarativeEnginePrivate::init() Q_Q(QDeclarativeEngine); qRegisterMetaType<QVariant>("QVariant"); qRegisterMetaType<QDeclarativeScriptString>("QDeclarativeScriptString"); - qRegisterMetaType<QScriptValue>("QScriptValue"); + qRegisterMetaType<QScriptValue>(); qRegisterMetaType<QDeclarativeComponent::Status>("QDeclarativeComponent::Status"); QDeclarativeData::init(); |