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/qmlmodels/qqmlmodelsmodule_p.h | |
| 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/qmlmodels/qqmlmodelsmodule_p.h')
| -rw-r--r-- | src/qmlmodels/qqmlmodelsmodule_p.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/qmlmodels/qqmlmodelsmodule_p.h b/src/qmlmodels/qqmlmodelsmodule_p.h index 7e02578db9..f63052b682 100644 --- a/src/qmlmodels/qqmlmodelsmodule_p.h +++ b/src/qmlmodels/qqmlmodelsmodule_p.h @@ -58,11 +58,6 @@ QT_BEGIN_NAMESPACE class Q_QMLMODELS_PRIVATE_EXPORT QQmlModelsModule { public: -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - static void registerQmlTypes(); - static void registerQuickTypes(); -#endif - static void defineModule(); static void defineLabsModule(); }; |