diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-04 15:20:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-04 15:22:47 +0200 |
| commit | 39888db8b34767974d4a443bfe40b9e84fed315a (patch) | |
| tree | 2133759c6c2e91ff65b886c70093f4f52c7bbba5 /src/qml/qml/qqmlengine.cpp | |
| parent | fd295c5047095806db2015a978ed593a140ff373 (diff) | |
| parent | 5c221826025276aea5ee19275f350a28e02db254 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/quick/doc/src/qmltypereference.qdoc
Change-Id: Ia58f1c5a98309c32ef8d8e5c893faf261215f19f
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 fd516c9815..c0cabe4dd0 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -596,7 +596,7 @@ The following functions are also on the Qt object. \li application.font \endlist - \sa Screen, Window, {QtQuick::Window::screen}{Window.screen} + \sa Screen, Window, {QtQuick.Window::Window::screen}{Window.screen} */ /*! |