diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-24 16:19:48 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-24 16:26:35 +0200 |
| commit | 09cc372a3a14906aa2130f44c4950dcdd8c9bf0d (patch) | |
| tree | 20064c825a30c63d46c45203880eef364ca20a00 /src/imports/qtquick2 | |
| parent | 78254be6cbd239a3de332c5660b2c408d9f3e674 (diff) | |
| parent | 487d22bcde7e9d06162d44e7c5dca31d3afac694 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I52b2d17d9334313e4b3d84b52432f2ebc77f7415
Diffstat (limited to 'src/imports/qtquick2')
| -rw-r--r-- | src/imports/qtquick2/plugin.cpp | 18 | ||||
| -rw-r--r-- | src/imports/qtquick2/qmldir | 1 |
2 files changed, 2 insertions, 17 deletions
diff --git a/src/imports/qtquick2/plugin.cpp b/src/imports/qtquick2/plugin.cpp index 6b44f782bd..1b14e9f0e5 100644 --- a/src/imports/qtquick2/plugin.cpp +++ b/src/imports/qtquick2/plugin.cpp @@ -40,14 +40,6 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/QQmlEngine> -#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 @@ -64,17 +56,9 @@ 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); + qmlRegisterModule("QtQuick", 2, 15); } ~QtQuick2Plugin() override diff --git a/src/imports/qtquick2/qmldir b/src/imports/qtquick2/qmldir index 8167e813df..d74aabd9e9 100644 --- a/src/imports/qtquick2/qmldir +++ b/src/imports/qtquick2/qmldir @@ -3,3 +3,4 @@ plugin qtquick2plugin classname QtQuick2Plugin typeinfo plugins.qmltypes designersupported +import QtQml |