diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-22 09:56:51 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-22 17:21:53 +0200 |
| commit | 487d22bcde7e9d06162d44e7c5dca31d3afac694 (patch) | |
| tree | 42c375cc436b86d89a3b807e96a60b71314c42ad /src/qmlworkerscript | |
| parent | af3438cf29925bfcf4ff1a8fa04276580b66ce37 (diff) | |
Remove module registration related Qt version #ifdefs
Ahead of compiling declarative with a newer qtbase that bumps the Qt
version to 6, we can already now remove the Qt 5 code paths related to
type registrations as commit 8534634bd204ccdca3edcc244a35be6e81739fce
implements those dependencies differently.
This also required lowering the minimum minor version for the
Instantiator to 1, as it was in the Qt 5 branch.
Change-Id: Idd38c967eeb8423509237116803d292bba422f8b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
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(); }; |