diff options
author | Liang Qi <liang.qi@qt.io> | 2019-10-07 13:10:18 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-10-07 13:10:18 +0200 |
commit | 7e17fb2ded407cd75643f248d39a21721cfd79f7 (patch) | |
tree | ce24e8e7a94d5bc74566086b61c4164236e468ad /src/qmlworkerscript | |
parent | f3d40bd0203acda21abfb3c3c71e526646706616 (diff) | |
parent | 67fc5b677a05f88f043ea825810b7b244a516b42 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp
Change-Id: Id2e81000bcbd4de18fe22b085fdf5eed42c02516
Diffstat (limited to 'src/qmlworkerscript')
-rw-r--r-- | src/qmlworkerscript/doc/qtqmlworkerscript.qdocconf | 37 | ||||
-rw-r--r-- | src/qmlworkerscript/qmlworkerscript.pro | 2 | ||||
-rw-r--r-- | src/qmlworkerscript/qquickworkerscript.cpp | 4 |
3 files changed, 41 insertions, 2 deletions
diff --git a/src/qmlworkerscript/doc/qtqmlworkerscript.qdocconf b/src/qmlworkerscript/doc/qtqmlworkerscript.qdocconf new file mode 100644 index 0000000000..bb883cf39f --- /dev/null +++ b/src/qmlworkerscript/doc/qtqmlworkerscript.qdocconf @@ -0,0 +1,37 @@ +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtdeclarative.qdocconf) + +project = QtQmlWorkerScript +description = Qt Qml WorkerScript Reference Documentation +version = $QT_VERSION +moduleheader = QtQmlWorkerScript +qhp.projects = QtQmlWorkerScript + +qhp.QtQmlWorkerScript.file = qtqmlworkerscript.qhp +qhp.QtQmlWorkerScript.namespace = org.qt-project.qtqmlworkerscript.$QT_VERSION_TAG +qhp.QtQmlWorkerScript.virtualFolder = qtqmlworkerscript +qhp.QtQmlWorkerScript.indexRoot = + +qhp.QtQmlWorkerScript.filterAttributes = qtqmlworkerscript $QT_VERSION qtrefdoc +qhp.QtQmlWorkerScript.customFilters.Qt.name = QtQmlWorkerScript $QT_VERSION +qhp.QtQmlWorkerScript.customFilters.Qt.filterAttributes = qtqmlworkerscript $QT_VERSION + +qhp.QtQmlWorkerScript.title = QML Types +qhp.QtQmlWorkerScript.indexTitle = Qt QML WorkerScript QML Types +qhp.QtQmlWorkerScript.selectors = qmlclass +qhp.QtQmlWorkerScript.sortPages = true + +tagfile = qtqmlworkerscript.tags + +depends += qtcore qtqml qtdoc + +headerdirs += .. + +sourcedirs += .. \ + ../../imports/workerscript + +exampledirs += ../../../examples/qml \ + ../ \ + snippets + +navigation.qmltypespage = "Qt Qml WorkerScript QML Types" diff --git a/src/qmlworkerscript/qmlworkerscript.pro b/src/qmlworkerscript/qmlworkerscript.pro index 908caa4ed4..9f5e0e809a 100644 --- a/src/qmlworkerscript/qmlworkerscript.pro +++ b/src/qmlworkerscript/qmlworkerscript.pro @@ -1,6 +1,8 @@ TARGET = QtQmlWorkerScript QT = core-private qml-private +QMAKE_DOCS = $$PWD/doc/qtqmlworkerscript.qdocconf + DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES QT_NO_FOREACH HEADERS += \ diff --git a/src/qmlworkerscript/qquickworkerscript.cpp b/src/qmlworkerscript/qquickworkerscript.cpp index 4da1def5f5..8b236697b9 100644 --- a/src/qmlworkerscript/qquickworkerscript.cpp +++ b/src/qmlworkerscript/qquickworkerscript.cpp @@ -374,7 +374,7 @@ QQuickWorkerScriptEngine::~QQuickWorkerScriptEngine() yieldCurrentThread(); } - d->deleteLater(); + delete d; } WorkerScript::WorkerScript(int id, QQuickWorkerScriptEnginePrivate *parent) @@ -441,7 +441,7 @@ void QQuickWorkerScriptEngine::run() \qmltype WorkerScript \instantiates QQuickWorkerScript \ingroup qtquick-threading - \inqmlmodule QtQml + \inqmlmodule QtQml.WorkerScript \brief Enables the use of threads in a Qt Quick application. Use WorkerScript to run operations in a new thread. |