diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-06 16:19:01 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-06 17:08:09 +0200 |
commit | 3e9fe00c4e4ae4c096a960b4a3b432fca546007a (patch) | |
tree | b4ea58b13ba5bd7d4eb5bd5cf523250eae221620 /src | |
parent | a16b5a7b661b96b79dc0da25a1328dd870cbd8b0 (diff) |
Fix Qt6 build
Modify all the qmlRegisterModule calls to use minor version 15
because minor version zero from 6.0.0 would make tests fail.
This is similar to what was done in qtdeclarative in
c147b20a2c1299b2d659fe7c9472ae3866b6a425.
Change-Id: I62081374f1cd2a6afde2d5e0654755a62897d6fb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/compositor/qwaylandquickcompositorplugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp index 949d2cfaa..93bab1790 100644 --- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp +++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp @@ -130,9 +130,9 @@ public: static void defineModule(const char *uri) { - // This is needed so to guarantee that the import is available with the current - // Qt minor version even if no new types have been added since the last release. - qmlRegisterModule(uri, 1, QT_VERSION_MINOR); + // The minor version used to be the current Qt 5 minor. For compatibility it is the last + // Qt 5 release. + qmlRegisterModule(uri, 1, 15); qmlRegisterType<QWaylandQuickCompositorQuickExtensionContainer>(uri, 1, 0, "WaylandCompositor"); qmlRegisterType<QWaylandQuickItem>(uri, 1, 0, "WaylandQuickItem"); |