diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-24 10:14:57 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-24 11:48:14 +0100 |
| commit | b1fa22c1683d9f6cedb001f5ef8a0dac71868935 (patch) | |
| tree | c30a114c75be071310df974283b928329f9d5c12 /src/qml/qml/qqmlengine.cpp | |
| parent | ba68c325688acf3072715757480497524f61c425 (diff) | |
| parent | fe5d69669197a51662061b014810f0242eec5ca7 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/qml/compiler/qv4ssa.cpp
src/quick/accessible/qaccessiblequickview_p.h
src/quick/items/qquickmousearea.cpp
src/quick/util/qquickanimatorjob.cpp
tools/qmlplugindump/main.cpp
Change-Id: I84474cf39895b9b757403971d2e9196e8c9d1809
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 9e6d046485..86ad84b9c1 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -1039,7 +1039,7 @@ QQmlEngine::~QQmlEngine() /*! \fn void QQmlEngine::exit(int retCode) This signal is emitted when the QML loaded by the engine would like to exit - from the event loop with the specified return code. + from the event loop with the specified return code \a retCode. \since 5.8 \sa quit() |