diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-15 01:00:09 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-03-15 11:20:40 +0100 |
| commit | 67cc0be410e0325ff5c8757684cacd02eea91572 (patch) | |
| tree | d41a8a73b6792e6ebd70b94cd439d6b33bdcadda /src/qml/qml | |
| parent | 662c53dc583188d0278c86f59ab6b80056dbd419 (diff) | |
| parent | f10ac43ebb839b61315bd3b370b77683b625e4c4 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/compiler/qv4codegen.cpp
Change-Id: I604517d0948fb5056ce36cc104f13ac956fbcc24
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlapplicationengine.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlapplicationengine.cpp b/src/qml/qml/qqmlapplicationengine.cpp index c519429d48..1b7a433a84 100644 --- a/src/qml/qml/qqmlapplicationengine.cpp +++ b/src/qml/qml/qqmlapplicationengine.cpp @@ -250,10 +250,12 @@ QQmlApplicationEngine::~QQmlApplicationEngine() /*! Loads the root QML file located at \a url. The object tree defined by the file is created immediately for local file urls. Remote urls are loaded asynchronously, - listen to the objectCreated signal to determine when the object - tree is ready. + listen to the \l {QQmlApplicationEngine::objectCreated()}{objectCreated} signal to + determine when the object tree is ready. - If an error occurs, error messages are printed with qWarning. + If an error occurs, the \l {QQmlApplicationEngine::objectCreated()}{objectCreated} + signal is emitted with a null pointer as parameter and error messages are printed + with qWarning. */ void QQmlApplicationEngine::load(const QUrl &url) { |