diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-05-28 17:59:34 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-05-28 17:59:40 +0200 |
| commit | 0f5c34f2c6b64bae3429706a6c4211334c689092 (patch) | |
| tree | b85888d73518f6abc7bbde74ab71a27887682f9d /src/imports/qtquick2/plugin.cpp | |
| parent | 44ca7e31ee9365a72cd17ecd335ec4d0161420a9 (diff) | |
| parent | 9d61684d70c8691d81536b7b519388586e2cbbb8 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ie7dbc5a7d9eccd1613283134a1b47ab597d036d5
Diffstat (limited to 'src/imports/qtquick2/plugin.cpp')
| -rw-r--r-- | src/imports/qtquick2/plugin.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/imports/qtquick2/plugin.cpp b/src/imports/qtquick2/plugin.cpp index a5a2c73ced..efa05c349c 100644 --- a/src/imports/qtquick2/plugin.cpp +++ b/src/imports/qtquick2/plugin.cpp @@ -42,6 +42,9 @@ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <QtQml/private/qqmlengine_p.h> #include <QtQmlModels/private/qqmlmodelsmodule_p.h> +#if QT_CONFIG(qml_worker_script) +#include <QtQmlWorkerScript/private/qqmlworkerscriptmodule_p.h> +#endif #endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <private/qtquick2_p.h> @@ -63,6 +66,9 @@ public: #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QQmlEnginePrivate::registerQuickTypes(); QQmlModelsModule::registerQuickTypes(); +#if QT_CONFIG(qml_worker_script) + QQmlWorkerScriptModule::registerQuickTypes(); +#endif #endif QQmlQtQuick2Module::defineModule(); |