diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 14:41:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 14:41:35 +0200 |
commit | 4653217c3f36e7914f2cc0573347a078dd11768f (patch) | |
tree | 7c7e862bdec55ae7ea0e2b6816bda189febbe4d1 /src/qml/qml/qqmlengine.cpp | |
parent | c5dcabeb6a07ed358e64f26cd8475bfe5daae0e4 (diff) | |
parent | ad125bd18ef5c98a264b9e4fac258dd07511035d (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/quickwidgets/qquickwidget.cpp
Change-Id: I3e2326bc86a9d3adaafbe3830b75ce9afa81c45b
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
-rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 9c5e48ae32..0c003790dd 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -912,7 +912,7 @@ QQuickWorkerScriptEngine *QQmlEnginePrivate::getWorkerScriptEngine() Note that the \l {Qt Quick 1} version is called QDeclarativeEngine. - \sa QQmlComponent, QQmlContext + \sa QQmlComponent, QQmlContext, {QML Global Object} */ /*! |