Remove redundant types

It doesn't make much sense to use the exact same class for the uncreatable
type and the shell surface type.

Remove the base uncreatable types.

Change-Id: Id155c8131b0b46b6b0b7b200ee44331a295ad76d
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>

2 files changed, 4 insertions, 14 deletions

diff --git a/src/imports/compositor/plugins.qmltypes b/src/imports/compositor/plugins.qmltypes
index 60550165d..b0fb43754 100644
--- a/src/imports/compositor/plugins.qmltypes
+++ b/src/imports/compositor/plugins.qmltypes
@@ -404,12 +404,8 @@ Module {
     Component {
         name: "QWaylandWlShellSurface"
         prototype: "QWaylandShellSurface"
-        exports: [
-            "QtWayland.Compositor/WlShellSurface 1.0",
-            "QtWayland.Compositor/WlShellSurfaceBase 1.0"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 0]
+        exports: ["QtWayland.Compositor/WlShellSurface 1.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "FullScreenMethod"
             values: {
@@ -545,12 +541,8 @@ Module {
     Component {
         name: "QWaylandXdgSurface"
         prototype: "QWaylandShellSurface"
-        exports: [
-            "QtWayland.Compositor/XdgSurface 1.0",
-            "QtWayland.Compositor/XdgSurfaceBase 1.0"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 0]
+        exports: ["QtWayland.Compositor/XdgSurface 1.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "State"
             values: {
diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
index 112ad5787..d9d24ade0 100644
--- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp
+++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
@@ -141,8 +141,6 @@ public:
         qmlRegisterUncreatableType<QWaylandCompositor>(uri, 1, 0, "WaylandCompositorBase", QObject::tr("Cannot create instance of WaylandCompositorBase, use WaylandCompositor instead"));
         qmlRegisterUncreatableType<QWaylandSurface>(uri, 1, 0, "WaylandSurfaceBase", QObject::tr("Cannot create instance of WaylandSurfaceBase, use WaylandSurface instead"));
         qmlRegisterUncreatableType<QWaylandShellSurface>(uri, 1, 0, "ShellSurface", QObject::tr("Cannot create instance of ShellSurface"));
-        qmlRegisterUncreatableType<QWaylandWlShellSurface>(uri, 1, 0, "WlShellSurfaceBase", QObject::tr("Cannot create instance of WlShellSurfaceBase, use WlShellSurface instead"));
-        qmlRegisterUncreatableType<QWaylandXdgSurface>(uri, 1, 0, "XdgSurfaceBase", QObject::tr("Cannot create instance of XdgSurfaceBase, use XdgSurface instead"));
         qmlRegisterUncreatableType<QWaylandResource>(uri, 1, 0, "WaylandResource", QObject::tr("Cannot create instance of WaylandResource"));
 
         //This should probably be somewhere else