diff options
Diffstat (limited to 'src/imports/qtquick2')
| -rw-r--r-- | src/imports/qtquick2/plugin.cpp | 18 | ||||
| -rw-r--r-- | src/imports/qtquick2/qtquick2.pro | 4 |
2 files changed, 21 insertions, 1 deletions
diff --git a/src/imports/qtquick2/plugin.cpp b/src/imports/qtquick2/plugin.cpp index d73a8b3688..efa05c349c 100644 --- a/src/imports/qtquick2/plugin.cpp +++ b/src/imports/qtquick2/plugin.cpp @@ -39,6 +39,14 @@ #include <QtQml/qqmlextensionplugin.h> +#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> QT_BEGIN_NAMESPACE @@ -55,7 +63,17 @@ 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(); +#if QT_CONFIG(qml_worker_script) + QQmlWorkerScriptModule::registerQuickTypes(); +#endif +#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 diff --git a/src/imports/qtquick2/qtquick2.pro b/src/imports/qtquick2/qtquick2.pro index 744dce4195..8543049ead 100644 --- a/src/imports/qtquick2/qtquick2.pro +++ b/src/imports/qtquick2/qtquick2.pro @@ -6,6 +6,8 @@ IMPORT_VERSION = 2.$$QT_MINOR_VERSION SOURCES += \ plugin.cpp -QT += quick-private qml-private +QT += quick-private qml-private qmlmodels-private + +qtConfig(qml-worker-script): QT += qmlworkerscript-private load(qml_plugin) |