diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-13 01:01:04 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-03-13 10:10:09 +0100 |
| commit | 76be4abbbcfb2fbb14ce532413e0895198e7f0f1 (patch) | |
| tree | 5d6ca9c4425df15a93b6f74dc8e4dbb38db74d91 /src/qml/qml | |
| parent | 587d789fa5929f462b5744ba33a25db6c77b36fc (diff) | |
| parent | 70d726e91e4ef27002b2271805de19077e25809c (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/qml/compiler/qv4codegen.cpp
src/qml/animations/qsequentialanimationgroupjob.cpp
Change-Id: I8b76e509fd7c8599d4cef25181d790ee28edab54
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) { |