diff options
Diffstat (limited to 'src/qml/types/qquickworkerscript.cpp')
| -rw-r--r-- | src/qml/types/qquickworkerscript.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp index da34101c36..507e94fb7e 100644 --- a/src/qml/types/qquickworkerscript.cpp +++ b/src/qml/types/qquickworkerscript.cpp @@ -340,7 +340,11 @@ bool QQuickWorkerScriptEnginePrivate::event(QEvent *event) return true; } else if (event->type() == (QEvent::Type)WorkerRemoveEvent::WorkerRemove) { WorkerRemoveEvent *workerEvent = static_cast<WorkerRemoveEvent *>(event); - workers.remove(workerEvent->workerId()); + QHash<int, WorkerScript *>::iterator itr = workers.find(workerEvent->workerId()); + if (itr != workers.end()) { + delete itr.value(); + workers.erase(itr); + } return true; } else { return QObject::event(event); @@ -382,7 +386,7 @@ void QQuickWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url) if (f.open(QIODevice::ReadOnly)) { QByteArray data = f.readAll(); QString sourceCode = QString::fromUtf8(data); - QQmlScript::Parser::extractPragmas(sourceCode); + QmlIR::Document::removeScriptPragmas(sourceCode); WorkerScript *script = workers.value(id); if (!script) @@ -580,7 +584,7 @@ void QQuickWorkerScriptEngine::run() that the main GUI thread is not blocked. Messages can be passed between the new thread and the parent thread - using \l sendMessage() and the \l {WorkerScript::onMessage}{onMessage()} handler. + using \l sendMessage() and the \c onMessage() handler. An example: @@ -716,10 +720,12 @@ void QQuickWorkerScript::componentComplete() } /*! - \qmlsignal WorkerScript::onMessage(jsobject msg) + \qmlsignal WorkerScript::message(jsobject msg) - This handler is called when a message \a msg is received from a worker + This signal is emitted when a message \a msg is received from a worker script in another thread through a call to sendMessage(). + + The corresponding handler is \c onMessage. */ bool QQuickWorkerScript::event(QEvent *event) |