diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-06-13 23:10:03 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-06-13 23:10:03 +0200 |
| commit | 9932617582470d717c97f8161a65133293c185c5 (patch) | |
| tree | 1df48d67c6e5ca4aa8b7810fc9e717083b4199e3 /src/qml/qml/qqmlengine.cpp | |
| parent | 7fde8a8d20da7fa00d974286fa903b3fee76d466 (diff) | |
| parent | 17ee404f2678684674b9c5c0c523602953146e37 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/quickwidgets/qquickwidget.cpp
Change-Id: Id4b080aea713df68608847bb82570231e37ce536
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index f78cdbb970..61246b92d8 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -809,6 +809,7 @@ void QQmlEnginePrivate::init() qRegisterMetaType<QList<QObject*> >(); qRegisterMetaType<QList<int> >(); qRegisterMetaType<QQmlV4Handle>(); + qRegisterMetaType<QQmlBinding*>(); v8engine()->setEngine(q); |