diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-04-23 09:33:25 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-04-23 09:34:29 +0200 |
| commit | 580fa7dc88aae23053e44ffa335a15f6af112a20 (patch) | |
| tree | 5bc915d7c2e252739122d9441bd0d7fa7175d0c2 /src/imports/qtquick2/plugin.cpp | |
| parent | 6767114285db9d0e16dc278d08f231e8561546b4 (diff) | |
| parent | c00283bb3bb966bf60c307ec8283bd98c12318bf (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ifec879473540b609403ac951967f6d9ecb0bb6f0
Diffstat (limited to 'src/imports/qtquick2/plugin.cpp')
| -rw-r--r-- | src/imports/qtquick2/plugin.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/imports/qtquick2/plugin.cpp b/src/imports/qtquick2/plugin.cpp index d73a8b3688..4dc6fee916 100644 --- a/src/imports/qtquick2/plugin.cpp +++ b/src/imports/qtquick2/plugin.cpp @@ -38,6 +38,8 @@ ****************************************************************************/ #include <QtQml/qqmlextensionplugin.h> +#include <QtQml/private/qqmlengine_p.h> +#include <QtQml/private/qqmlmodelsmodule_p.h> #include <private/qtquick2_p.h> @@ -55,7 +57,14 @@ public: Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick")); Q_UNUSED(uri); moduleDefined = true; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QQmlEnginePrivate::registerQuickTypes(); + QQmlModelsModule::registerQuickTypes(); +#endif QQmlQtQuick2Module::defineModule(); + + // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward + qmlRegisterModule("QtQuick", 2, QT_VERSION_MINOR); } ~QtQuick2Plugin() override |