Move WlShell types into their own import

We want extensions to be in submodules in QML.

[ChangeLog][WlShell] Moved WlShell types into QML import
QtWayland.Compositor.WlShell rather than QtWayland.Compositor

Task-number: QTBUG-68840
Change-Id: I7c3d2d05efdab86ea61affc6a9a0bc3e10835328
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

21 files changed, 257 insertions, 118 deletions

diff --git a/examples/wayland/custom-extension/compositor/qml/main.qml b/examples/wayland/custom-extension/compositor/qml/main.qml
index 92b8d63f4..fcd7eba79 100644
--- a/examples/wayland/custom-extension/compositor/qml/main.qml
+++ b/examples/wayland/custom-extension/compositor/qml/main.qml
@@ -50,6 +50,7 @@
 
 import QtQuick
 import QtWayland.Compositor
+import QtWayland.Compositor.WlShell
 
 import com.theqtcompany.customextension 1.0
 
diff --git a/examples/wayland/hwlayer-compositor/main.qml b/examples/wayland/hwlayer-compositor/main.qml
index c13223aa6..584c0c353 100644
--- a/examples/wayland/hwlayer-compositor/main.qml
+++ b/examples/wayland/hwlayer-compositor/main.qml
@@ -53,6 +53,7 @@ import QtQuick.Window
 import QtQuick.Controls 2.2
 import QtWayland.Compositor
 import QtWayland.Compositor.XdgShell
+import QtWayland.Compositor.WlShell
 
 WaylandCompositor {
     WaylandOutput {
diff --git a/examples/wayland/minimal-qml/main.qml b/examples/wayland/minimal-qml/main.qml
index 6a802217c..a4e6d89fc 100644
--- a/examples/wayland/minimal-qml/main.qml
+++ b/examples/wayland/minimal-qml/main.qml
@@ -52,6 +52,7 @@ import QtQuick
 import QtQuick.Window
 import QtWayland.Compositor
 import QtWayland.Compositor.XdgShell
+import QtWayland.Compositor.WlShell
 
 WaylandCompositor {
     // The output defines the screen.
diff --git a/examples/wayland/multi-output/qml/main.qml b/examples/wayland/multi-output/qml/main.qml
index eb5d15895..7632eb9cf 100644
--- a/examples/wayland/multi-output/qml/main.qml
+++ b/examples/wayland/multi-output/qml/main.qml
@@ -51,6 +51,7 @@
 import QtQuick
 import QtWayland.Compositor
 import QtWayland.Compositor.XdgShell
+import QtWayland.Compositor.WlShell
 
 WaylandCompositor {
     id: comp
diff --git a/examples/wayland/multi-screen/qml/main.qml b/examples/wayland/multi-screen/qml/main.qml
index 6d3606d04..ab6d796bb 100644
--- a/examples/wayland/multi-screen/qml/main.qml
+++ b/examples/wayland/multi-screen/qml/main.qml
@@ -54,6 +54,7 @@ import QtQuick
 import QtQuick.Window as Window
 import QtWayland.Compositor
 import QtWayland.Compositor.XdgShell
+import QtWayland.Compositor.WlShell
 import QtQml.Models
 
 WaylandCompositor {
diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml
index eb4ccfc11..448c5ff8f 100644
--- a/examples/wayland/pure-qml/qml/main.qml
+++ b/examples/wayland/pure-qml/qml/main.qml
@@ -51,6 +51,7 @@
 import QtQuick
 import QtWayland.Compositor
 import QtWayland.Compositor.XdgShell
+import QtWayland.Compositor.WlShell
 
 WaylandCompositor {
     id: waylandCompositor
diff --git a/examples/wayland/server-buffer/compositor/qml/main.qml b/examples/wayland/server-buffer/compositor/qml/main.qml
index 907c20892..73b3fa8a4 100644
--- a/examples/wayland/server-buffer/compositor/qml/main.qml
+++ b/examples/wayland/server-buffer/compositor/qml/main.qml
@@ -50,6 +50,7 @@
 
 import QtQuick
 import QtWayland.Compositor
+import QtWayland.Compositor.WlShell
 import QtQuick.Window
 
 import com.theqtcompany.sharebufferextension
diff --git a/examples/wayland/texture-sharing/custom-compositor/qml/main.qml b/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
index 5958ceb51..7a5705169 100644
--- a/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
+++ b/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
@@ -52,6 +52,7 @@ import QtQuick
 import QtQuick.Window
 import QtWayland.Compositor
 import QtWayland.Compositor.XdgShell
+import QtWayland.Compositor.WlShell
 
 import com.theqtcompany.customsharingextension
 
diff --git a/examples/wayland/texture-sharing/minimal-compositor.qml b/examples/wayland/texture-sharing/minimal-compositor.qml
index b3a32e05c..a832b051f 100644
--- a/examples/wayland/texture-sharing/minimal-compositor.qml
+++ b/examples/wayland/texture-sharing/minimal-compositor.qml
@@ -52,6 +52,7 @@ import QtQuick
 import QtQuick.Window
 import QtWayland.Compositor
 import QtWayland.Compositor.XdgShell
+import QtWayland.Compositor.WlShell
 
 // importing the texture sharing extension:
 import QtWayland.Compositor.TextureSharingExtension
diff --git a/src/compositor/extensions/qwaylandwlshell.cpp b/src/compositor/extensions/qwaylandwlshell.cpp
index 6eb1c06e4..c708ca045 100644
--- a/src/compositor/extensions/qwaylandwlshell.cpp
+++ b/src/compositor/extensions/qwaylandwlshell.cpp
@@ -244,7 +244,7 @@ void QWaylandWlShellSurfacePrivate::shell_surface_set_class(Resource *resource,
 
 /*!
  * \qmltype WlShell
- * \inqmlmodule QtWayland.Compositor
+ * \inqmlmodule QtWayland.Compositor.WlShell
  * \since 5.8
  * \brief Provides an extension for desktop-style user interfaces.
  *
@@ -259,7 +259,7 @@ void QWaylandWlShellSurfacePrivate::shell_surface_set_class(Resource *resource,
  * supported by the compositor:
  *
  * \qml \QtMinorVersion
- * import QtWayland.Compositor 1.\1
+ * import QtWayland.Compositor.WlShell
  *
  * WaylandCompositor {
  *     WlShell {
@@ -413,7 +413,7 @@ QByteArray QWaylandWlShell::interfaceName()
 
 /*!
  * \qmltype WlShellSurface
- * \inqmlmodule QtWayland.Compositor
+ * \inqmlmodule QtWayland.Compositor.WlShell
  * \since 5.8
  * \brief Provides a \c wl_shell_surface that offers desktop-style compositor-specific features to a surface.
  *
diff --git a/src/imports/compositor-extensions/CMakeLists.txt b/src/imports/compositor-extensions/CMakeLists.txt
index 9daa2933d..27c7cb063 100644
--- a/src/imports/compositor-extensions/CMakeLists.txt
+++ b/src/imports/compositor-extensions/CMakeLists.txt
@@ -2,3 +2,4 @@
 
 add_subdirectory(xdgshell)
 add_subdirectory(iviapplication)
+add_subdirectory(wlshell)
diff --git a/src/imports/compositor-extensions/compositor-extensions.pro b/src/imports/compositor-extensions/compositor-extensions.pro
index 77891b42f..f5adf5ab5 100644
--- a/src/imports/compositor-extensions/compositor-extensions.pro
+++ b/src/imports/compositor-extensions/compositor-extensions.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
 SUBDIRS = \
     xdgshell \
-    iviapplication
+    iviapplication \
+    wlshell
diff --git a/src/imports/compositor-extensions/wlshell/CMakeLists.txt b/src/imports/compositor-extensions/wlshell/CMakeLists.txt
new file mode 100644
index 000000000..51fd0023d
--- /dev/null
+++ b/src/imports/compositor-extensions/wlshell/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from wlshell.pro.
+
+#####################################################################
+## qwaylandcompositorwlshellplugin Plugin:
+#####################################################################
+
+qt_add_qml_module(qwaylandcompositorwlshellplugin
+    URI "QtWayland.Compositor.WlShell"
+    VERSION "${CMAKE_PROJECT_VERSION}"
+    CLASSNAME QWaylandCompositorWlShellPlugin
+    SKIP_TYPE_REGISTRATION
+    SOURCES
+        qwaylandcompositorwlshellplugin.cpp
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::WaylandCompositor
+)
+
+#### Keys ignored in scope 1:.:.:wlshell.pro:<TRUE>:
+# CXX_MODULE = "qml"
+# QML_IMPORT_VERSION = "$$QT_VERSION"
+# TARGETPATH = "QtWayland/Compositor/WlShell"
diff --git a/src/imports/compositor-extensions/wlshell/plugins.qmltypes b/src/imports/compositor-extensions/wlshell/plugins.qmltypes
new file mode 100644
index 000000000..99a3ce9a6
--- /dev/null
+++ b/src/imports/compositor-extensions/wlshell/plugins.qmltypes
@@ -0,0 +1,140 @@
+import QtQuick.tooling 1.2
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable QtWayland.Compositor.WlShell 6.0'
+
+Module {
+    dependencies: ["QtQuick 2.0"]
+    Component { name: "QWaylandCompositorExtension"; prototype: "QWaylandObject" }
+    Component { name: "QWaylandObject"; prototype: "QObject" }
+    Component {
+        name: "QWaylandShell"
+        prototype: "QWaylandCompositorExtension"
+        Enum {
+            name: "FocusPolicy"
+            values: {
+                "AutomaticFocus": 0,
+                "ManualFocus": 1
+            }
+        }
+        Property { name: "focusPolicy"; type: "FocusPolicy" }
+    }
+    Component {
+        name: "QWaylandShellSurface"
+        prototype: "QWaylandCompositorExtension"
+        Property { name: "windowType"; type: "Qt::WindowType"; isReadonly: true }
+    }
+    Component {
+        name: "QWaylandWlShell"
+        prototype: "QWaylandShell"
+        Signal {
+            name: "wlShellSurfaceRequested"
+            Parameter { name: "surface"; type: "QWaylandSurface"; isPointer: true }
+            Parameter { name: "resource"; type: "QWaylandResource" }
+        }
+        Signal {
+            name: "wlShellSurfaceCreated"
+            Parameter { name: "shellSurface"; type: "QWaylandWlShellSurface"; isPointer: true }
+        }
+        Method { name: "closeAllPopups" }
+    }
+    Component {
+        name: "QWaylandWlShellQuickExtension"
+        defaultProperty: "data"
+        prototype: "QWaylandWlShell"
+        exports: ["QtWayland.Compositor.WlShell/WlShell 1.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+    }
+    Component {
+        name: "QWaylandWlShellSurface"
+        defaultProperty: "data"
+        prototype: "QWaylandShellSurface"
+        exports: ["QtWayland.Compositor.WlShell/WlShellSurface 1.0"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "FullScreenMethod"
+            values: {
+                "DefaultFullScreen": 0,
+                "ScaleFullScreen": 1,
+                "DriverFullScreen": 2,
+                "FillFullScreen": 3
+            }
+        }
+        Enum {
+            name: "ResizeEdge"
+            values: {
+                "NoneEdge": 0,
+                "TopEdge": 1,
+                "BottomEdge": 2,
+                "LeftEdge": 4,
+                "TopLeftEdge": 5,
+                "BottomLeftEdge": 6,
+                "RightEdge": 8,
+                "TopRightEdge": 9,
+                "BottomRightEdge": 10
+            }
+        }
+        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+        Property { name: "surface"; type: "QWaylandSurface"; isReadonly: true; isPointer: true }
+        Property { name: "shell"; type: "QWaylandWlShell"; isReadonly: true; isPointer: true }
+        Property { name: "title"; type: "string"; isReadonly: true }
+        Property { name: "className"; type: "string"; isReadonly: true }
+        Signal { name: "pong" }
+        Signal {
+            name: "startMove"
+            Parameter { name: "seat"; type: "QWaylandSeat"; isPointer: true }
+        }
+        Signal {
+            name: "startResize"
+            Parameter { name: "seat"; type: "QWaylandSeat"; isPointer: true }
+            Parameter { name: "edges"; type: "ResizeEdge" }
+        }
+        Signal { name: "setDefaultToplevel" }
+        Signal {
+            name: "setTransient"
+            Parameter { name: "parentSurface"; type: "QWaylandSurface"; isPointer: true }
+            Parameter { name: "relativeToParent"; type: "QPoint" }
+            Parameter { name: "inactive"; type: "bool" }
+        }
+        Signal {
+            name: "setFullScreen"
+            Parameter { name: "method"; type: "FullScreenMethod" }
+            Parameter { name: "framerate"; type: "uint" }
+            Parameter { name: "output"; type: "QWaylandOutput"; isPointer: true }
+        }
+        Signal {
+            name: "setPopup"
+            Parameter { name: "seat"; type: "QWaylandSeat"; isPointer: true }
+            Parameter { name: "parentSurface"; type: "QWaylandSurface"; isPointer: true }
+            Parameter { name: "relativeToParent"; type: "QPoint" }
+        }
+        Signal {
+            name: "setMaximized"
+            Parameter { name: "output"; type: "QWaylandOutput"; isPointer: true }
+        }
+        Method { name: "ping" }
+        Method {
+            name: "initialize"
+            Parameter { name: "shell"; type: "QWaylandWlShell"; isPointer: true }
+            Parameter { name: "surface"; type: "QWaylandSurface"; isPointer: true }
+            Parameter { name: "resource"; type: "QWaylandResource" }
+        }
+        Method {
+            name: "sizeForResize"
+            type: "QSize"
+            Parameter { name: "size"; type: "QSizeF" }
+            Parameter { name: "delta"; type: "QPointF" }
+            Parameter { name: "edges"; type: "ResizeEdge" }
+        }
+        Method {
+            name: "sendConfigure"
+            Parameter { name: "size"; type: "QSize" }
+            Parameter { name: "edges"; type: "ResizeEdge" }
+        }
+        Method { name: "sendPopupDone" }
+    }
+}
diff --git a/src/imports/compositor-extensions/wlshell/qmldir b/src/imports/compositor-extensions/wlshell/qmldir
new file mode 100644
index 000000000..75e1f2b35
--- /dev/null
+++ b/src/imports/compositor-extensions/wlshell/qmldir
@@ -0,0 +1,3 @@
+module QtWayland.Compositor.WlShell
+plugin qwaylandcompositorwlshellplugin
+classname QWaylandCompositorWlShellPlugin
diff --git a/src/imports/compositor-extensions/wlshell/qwaylandcompositorwlshellplugin.cpp b/src/imports/compositor-extensions/wlshell/qwaylandcompositorwlshellplugin.cpp
new file mode 100644
index 000000000..9193425eb
--- /dev/null
+++ b/src/imports/compositor-extensions/wlshell/qwaylandcompositorwlshellplugin.cpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqml.h>
+
+#include <QtWaylandCompositor/qwaylandquickextension.h>
+#include <QtWaylandCompositor/qwaylandwlshell.h>
+
+QT_BEGIN_NAMESPACE
+
+Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandWlShell)
+
+class QWaylandCompositorWlShellPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
+public:
+    void registerTypes(const char *uri) override
+    {
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWayland.Compositor.WlShell"));
+        defineModule(uri);
+    }
+
+    static void defineModule(const char *uri)
+    {
+        qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR);
+        qmlRegisterType<QWaylandWlShellQuickExtension>(uri, 1, 0, "WlShell");
+        qmlRegisterType<QWaylandWlShellSurface>(uri, 1, 0, "WlShellSurface");
+    }
+};
+
+QT_END_NAMESPACE
+
+#include "qwaylandcompositorwlshellplugin.moc"
diff --git a/src/imports/compositor-extensions/wlshell/wlshell.pro b/src/imports/compositor-extensions/wlshell/wlshell.pro
new file mode 100644
index 000000000..30d0201f0
--- /dev/null
+++ b/src/imports/compositor-extensions/wlshell/wlshell.pro
@@ -0,0 +1,11 @@
+CXX_MODULE = qml
+TARGET  = qwaylandcompositorwlshellplugin
+TARGETPATH = QtWayland/Compositor/WlShell
+QML_IMPORT_VERSION = $$QT_VERSION
+
+SOURCES += \
+    qwaylandcompositorwlshellplugin.cpp
+
+QT += waylandcompositor
+
+load(qml_plugin)
diff --git a/src/imports/compositor/plugins.qmltypes b/src/imports/compositor/plugins.qmltypes
index 863d9f779..a37f99d52 100644
--- a/src/imports/compositor/plugins.qmltypes
+++ b/src/imports/compositor/plugins.qmltypes
@@ -528,116 +528,6 @@ Module {
         Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
     }
     Component {
-        name: "QWaylandWlShell"
-        prototype: "QWaylandShell"
-        Signal {
-            name: "wlShellSurfaceRequested"
-            Parameter { name: "surface"; type: "QWaylandSurface"; isPointer: true }
-            Parameter { name: "resource"; type: "QWaylandResource" }
-        }
-        Signal {
-            name: "wlShellSurfaceCreated"
-            Parameter { name: "shellSurface"; type: "QWaylandWlShellSurface"; isPointer: true }
-        }
-        Method { name: "closeAllPopups" }
-    }
-    Component {
-        name: "QWaylandWlShellQuickExtension"
-        defaultProperty: "data"
-        prototype: "QWaylandWlShell"
-        exports: ["QtWayland.Compositor/WlShell 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-    }
-    Component {
-        name: "QWaylandWlShellSurface"
-        defaultProperty: "data"
-        prototype: "QWaylandShellSurface"
-        exports: ["QtWayland.Compositor/WlShellSurface 1.0"]
-        exportMetaObjectRevisions: [0]
-        Enum {
-            name: "FullScreenMethod"
-            values: {
-                "DefaultFullScreen": 0,
-                "ScaleFullScreen": 1,
-                "DriverFullScreen": 2,
-                "FillFullScreen": 3
-            }
-        }
-        Enum {
-            name: "ResizeEdge"
-            values: {
-                "NoneEdge": 0,
-                "TopEdge": 1,
-                "BottomEdge": 2,
-                "LeftEdge": 4,
-                "TopLeftEdge": 5,
-                "BottomLeftEdge": 6,
-                "RightEdge": 8,
-                "TopRightEdge": 9,
-                "BottomRightEdge": 10
-            }
-        }
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "surface"; type: "QWaylandSurface"; isReadonly: true; isPointer: true }
-        Property { name: "shell"; type: "QWaylandWlShell"; isReadonly: true; isPointer: true }
-        Property { name: "title"; type: "string"; isReadonly: true }
-        Property { name: "className"; type: "string"; isReadonly: true }
-        Signal { name: "pong" }
-        Signal {
-            name: "startMove"
-            Parameter { name: "seat"; type: "QWaylandSeat"; isPointer: true }
-        }
-        Signal {
-            name: "startResize"
-            Parameter { name: "seat"; type: "QWaylandSeat"; isPointer: true }
-            Parameter { name: "edges"; type: "ResizeEdge" }
-        }
-        Signal { name: "setDefaultToplevel" }
-        Signal {
-            name: "setTransient"
-            Parameter { name: "parentSurface"; type: "QWaylandSurface"; isPointer: true }
-            Parameter { name: "relativeToParent"; type: "QPoint" }
-            Parameter { name: "inactive"; type: "bool" }
-        }
-        Signal {
-            name: "setFullScreen"
-            Parameter { name: "method"; type: "FullScreenMethod" }
-            Parameter { name: "framerate"; type: "uint" }
-            Parameter { name: "output"; type: "QWaylandOutput"; isPointer: true }
-        }
-        Signal {
-            name: "setPopup"
-            Parameter { name: "seat"; type: "QWaylandSeat"; isPointer: true }
-            Parameter { name: "parentSurface"; type: "QWaylandSurface"; isPointer: true }
-            Parameter { name: "relativeToParent"; type: "QPoint" }
-        }
-        Signal {
-            name: "setMaximized"
-            Parameter { name: "output"; type: "QWaylandOutput"; isPointer: true }
-        }
-        Method { name: "ping" }
-        Method {
-            name: "initialize"
-            Parameter { name: "shell"; type: "QWaylandWlShell"; isPointer: true }
-            Parameter { name: "surface"; type: "QWaylandSurface"; isPointer: true }
-            Parameter { name: "resource"; type: "QWaylandResource" }
-        }
-        Method {
-            name: "sizeForResize"
-            type: "QSize"
-            Parameter { name: "size"; type: "QSizeF" }
-            Parameter { name: "delta"; type: "QPointF" }
-            Parameter { name: "edges"; type: "ResizeEdge" }
-        }
-        Method {
-            name: "sendConfigure"
-            Parameter { name: "size"; type: "QSize" }
-            Parameter { name: "edges"; type: "ResizeEdge" }
-        }
-        Method { name: "sendPopupDone" }
-    }
-    Component {
         prototype: "QWaylandQuickItem"
         name: "QtWayland.Compositor/WaylandCursorItem 1.0"
         exports: ["QtWayland.Compositor/WaylandCursorItem 1.0"]
diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
index 19d38fec1..9711fc053 100644
--- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp
+++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
@@ -49,7 +49,8 @@
 #include <QtWaylandCompositor/QWaylandResource>
 
 #include <QtWaylandCompositor/QWaylandQtWindowManager>
-#include <QtWaylandCompositor/QWaylandWlShell>
+#include <QtWaylandCompositor/QWaylandShell>
+#include <QtWaylandCompositor/QWaylandShellSurface>
 #include <QtWaylandCompositor/QWaylandTextInputManager>
 #include <QtWaylandCompositor/QWaylandIdleInhibitManagerV1>
 
@@ -61,7 +62,6 @@ QT_BEGIN_NAMESPACE
 Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CONTAINER_CLASS(QWaylandQuickCompositor)
 Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandQtWindowManager)
 Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandIdleInhibitManagerV1)
-Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandWlShell)
 Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandTextInputManager)
 
 class QmlUrlResolver
@@ -139,8 +139,6 @@ public:
 
         //This should probably be somewhere else
         qmlRegisterType<QWaylandQtWindowManagerQuickExtension>(uri, 1, 0, "QtWindowManager");
-        qmlRegisterType<QWaylandWlShellQuickExtension>(uri, 1, 0, "WlShell");
-        qmlRegisterType<QWaylandWlShellSurface>(uri, 1, 0, "WlShellSurface");
         qmlRegisterType<QWaylandQuickShellSurfaceItem>(uri, 1, 0, "ShellSurfaceItem");
         qmlRegisterType<QWaylandTextInputManagerQuickExtension>(uri, 1, 0, "TextInputManager");
 
diff --git a/tests/manual/keymap/keymapcompositor.qml b/tests/manual/keymap/keymapcompositor.qml
index 87e20cf73..d718ea7eb 100644
--- a/tests/manual/keymap/keymapcompositor.qml
+++ b/tests/manual/keymap/keymapcompositor.qml
@@ -50,6 +50,7 @@
 
 import QtQuick 2.0
 import QtWayland.Compositor 1.0
+import QtWayland.Compositor.WlShell
 import QtQuick.Window 2.2
 
 WaylandCompositor {
diff --git a/tests/manual/scaling-compositor/main.qml b/tests/manual/scaling-compositor/main.qml
index 655bae1c2..b27a0fecd 100644
--- a/tests/manual/scaling-compositor/main.qml
+++ b/tests/manual/scaling-compositor/main.qml
@@ -51,6 +51,7 @@
 import QtQuick 2.15
 import QtQuick.Window 2.2
 import QtWayland.Compositor 1.3
+import QtWayland.Compositor.WlShell
 
 WaylandCompositor {
     id: comp