diff options
author | Paul Olav Tvete <paul.tvete@qt.io> | 2019-10-02 15:59:44 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2019-10-02 15:59:44 +0200 |
commit | 55a4148b9bf21b481f4044ecfb1f6ad933168264 (patch) | |
tree | eca4af16bf723f4c9dcaf895ed628d546fb4db04 /src/imports | |
parent | ddf5e26fdb6f334bef807879543d760123bf220a (diff) | |
parent | bf35b2cb11136a4bdc59e52ef1aafb2cb48d8e3c (diff) | |
download | qtwayland-55a4148b9bf21b481f4044ecfb1f6ad933168264.tar.gz |
Merge remote-tracking branch 'qt/wip/qt6' into dev
Change-Id: I8d16410f0c400ee685774722d210d6f5986de843
Diffstat (limited to 'src/imports')
-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 223ca0bc..7b4d2b5e 100644 --- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp +++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp @@ -136,9 +136,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"); |