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/qmlworkerscript | |
parent | 78254be6cbd239a3de332c5660b2c408d9f3e674 (diff) | |
parent | 487d22bcde7e9d06162d44e7c5dca31d3afac694 (diff) |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I52b2d17d9334313e4b3d84b52432f2ebc77f7415
Diffstat (limited to 'src/qmlworkerscript')
-rw-r--r-- | src/qmlworkerscript/qqmlworkerscriptmodule.cpp | 11 | ||||
-rw-r--r-- | src/qmlworkerscript/qqmlworkerscriptmodule_p.h | 3 |
2 files changed, 0 insertions, 14 deletions
diff --git a/src/qmlworkerscript/qqmlworkerscriptmodule.cpp b/src/qmlworkerscript/qqmlworkerscriptmodule.cpp index 98e82dbeba..5eb7d306bc 100644 --- a/src/qmlworkerscript/qqmlworkerscriptmodule.cpp +++ b/src/qmlworkerscript/qqmlworkerscriptmodule.cpp @@ -42,17 +42,6 @@ QT_BEGIN_NAMESPACE -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - -void QQmlWorkerScriptModule::registerQuickTypes() -{ - // Don't add anything here. These are only for backwards compatibility. - const char uri[] = "QtQuick"; - qmlRegisterType<QQuickWorkerScript>(uri, 2, 0, "WorkerScript"); -} - -#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - void QQmlWorkerScriptModule::defineModule() { const char uri[] = "QtQml.WorkerScript"; diff --git a/src/qmlworkerscript/qqmlworkerscriptmodule_p.h b/src/qmlworkerscript/qqmlworkerscriptmodule_p.h index a2efb304c1..ae52d10c16 100644 --- a/src/qmlworkerscript/qqmlworkerscriptmodule_p.h +++ b/src/qmlworkerscript/qqmlworkerscriptmodule_p.h @@ -58,9 +58,6 @@ QT_BEGIN_NAMESPACE class Q_QMLWORKERSCRIPT_PRIVATE_EXPORT QQmlWorkerScriptModule { public: -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - static void registerQuickTypes(); -#endif static void defineModule(); }; |