diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-25 01:00:10 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-25 01:00:11 +0100 |
| commit | 9893e71cea5de10193376c1733db627ef0783614 (patch) | |
| tree | 391fabceb9d4ff6ba5f3ff2c2ec42acb613eb4ef /src/qmlworkerscript | |
| parent | 87e7203532d69e0aaa0898a972d1d90fa589d519 (diff) | |
| parent | e1b4b267aa8c4d9c53e5af4def54f5e9e14e0103 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Icb61522fb41a35303bb3d201b344a0407f67f9a0
Diffstat (limited to 'src/qmlworkerscript')
| -rw-r--r-- | src/qmlworkerscript/qquickworkerscript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qmlworkerscript/qquickworkerscript.cpp b/src/qmlworkerscript/qquickworkerscript.cpp index 72ae6d5bd4..4a79027234 100644 --- a/src/qmlworkerscript/qquickworkerscript.cpp +++ b/src/qmlworkerscript/qquickworkerscript.cpp @@ -544,7 +544,7 @@ void QQuickWorkerScript::setSource(const QUrl &source) } /*! - \qmlproperty url WorkerScript::ready + \qmlproperty bool WorkerScript::ready This holds whether the WorkerScript has been initialized and is ready for receiving messages via \tt WorkerScript.sendMessage(). |