Doc: Use correct module identifiers in QML documentation

Multiple \qmlproperty, \qmlmethod, and \qmlsignal topics used an
incorrect QML module identifier. With upcoming changes to QDoc
these will start to generate documentation warnings.

Fix the commands to either use the correct identifier, or remove
the identifier as QDoc is capable of resolving the parent QML
type without it.

In passing, fix a documentation linking issue.

Change-Id: I5a562acc5f135d36c036ea1c1cc56218c23833b8
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
(cherry picked from commit ab97eaea8b476cd6168527183a13c3c6dfbc5746)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

24 files changed, 193 insertions, 193 deletions

diff --git a/examples/wayland/qtshell/doc/src/qtshell.qdoc b/examples/wayland/qtshell/doc/src/qtshell.qdoc
index 8f8a77b9b..2da1c1874 100644
--- a/examples/wayland/qtshell/doc/src/qtshell.qdoc
+++ b/examples/wayland/qtshell/doc/src/qtshell.qdoc
@@ -26,7 +26,7 @@
  *
  * When a client connects to the QtShell interface, it creates a \l{QtShellSurface}. The compositor
  * is notified of this by the emission of the
- * \l{QtWaylandCompositor::QtShell::qtShellSurfaceCreated()}{qtShellSurfaceCreated} signal. The
+ * \l [QML] {QtShell::}{qtShellSurfaceCreated} signal. The
  * example then adds the shell surface to a ListModel for easy access later.
  *
  * \snippet qtshell/qml/CompositorScreen.qml handleShellSurface
diff --git a/src/compositor/compositor_api/qwaylandclient.cpp b/src/compositor/compositor_api/qwaylandclient.cpp
index a60d6ce36..9c8bc704f 100644
--- a/src/compositor/compositor_api/qwaylandclient.cpp
+++ b/src/compositor/compositor_api/qwaylandclient.cpp
@@ -134,7 +134,7 @@ QWaylandClient *QWaylandClient::fromWlClient(QWaylandCompositor *compositor, wl_
 }
 
 /*!
- * \qmlproperty WaylandCompositor QtWaylandCompositor::WaylandClient::compositor
+ * \qmlproperty WaylandCompositor QtWayland.Compositor::WaylandClient::compositor
  *
  * This property holds the compositor of this WaylandClient.
  */
@@ -162,7 +162,7 @@ wl_client *QWaylandClient::client() const
 }
 
 /*!
- * \qmlproperty int QtWaylandCompositor::WaylandClient::userId
+ * \qmlproperty int QtWayland.Compositor::WaylandClient::userId
  *
  * This property holds the user id of this WaylandClient.
  */
@@ -181,7 +181,7 @@ qint64 QWaylandClient::userId() const
 }
 
 /*!
- * \qmlproperty int QtWaylandCompositor::WaylandClient::groupId
+ * \qmlproperty int QtWayland.Compositor::WaylandClient::groupId
  * \readonly
  *
  * This property holds the group id of this WaylandClient.
@@ -200,7 +200,7 @@ qint64 QWaylandClient::groupId() const
 }
 
 /*!
- * \qmlproperty int QtWaylandCompositor::WaylandClient::processId
+ * \qmlproperty int QtWayland.Compositor::WaylandClient::processId
  * \readonly
  *
  * This property holds the process id of this WaylandClient.
@@ -219,7 +219,7 @@ qint64 QWaylandClient::processId() const
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::WaylandClient::kill(signal)
+ * \qmlmethod void QtWayland.Compositor::WaylandClient::kill(signal)
  *
  * Kills the client with the specified \a signal.
  */
@@ -235,7 +235,7 @@ void QWaylandClient::kill(int signal)
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::WaylandClient::close()
+ * \qmlmethod void QtWayland.Compositor::WaylandClient::close()
  *
  * Closes the client
  */
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index cdc17769b..a6d43a810 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -504,7 +504,7 @@ QWaylandSeat *QWaylandCompositorPrivate::seatFor(QInputEvent *inputEvent)
 */
 
 /*!
-  \qmlsignal void QtWaylandCompositor::WaylandCompositor::surfaceRequested(WaylandClient client, int id, int version)
+  \qmlsignal void QtWayland.Compositor::WaylandCompositor::surfaceRequested(WaylandClient client, int id, int version)
 
   This signal is emitted when a \a client has created a surface with id \a id.
   The interface \a version is also available.
@@ -526,7 +526,7 @@ QWaylandSeat *QWaylandCompositorPrivate::seatFor(QInputEvent *inputEvent)
 */
 
 /*!
-  \qmlsignal void QtWaylandCompositor::WaylandCompositor::surfaceCreated(WaylandSurface surface)
+  \qmlsignal void QtWayland.Compositor::WaylandCompositor::surfaceCreated(WaylandSurface surface)
 
   This signal is emitted when a new WaylandSurface instance \a surface has been created.
 */
@@ -573,7 +573,7 @@ void QWaylandCompositor::create()
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::WaylandCompositor::created
+ * \qmlproperty bool QtWayland.Compositor::WaylandCompositor::created
  *
  * This property is true if WaylandCompositor has been initialized,
  * otherwise it's false.
@@ -592,7 +592,7 @@ bool QWaylandCompositor::isCreated() const
 }
 
 /*!
- * \qmlproperty string QtWaylandCompositor::WaylandCompositor::socketName
+ * \qmlproperty string QtWayland.Compositor::WaylandCompositor::socketName
  *
  * This property holds the socket name used by WaylandCompositor to communicate with
  * clients. It must be set before the component is completed.
@@ -635,7 +635,7 @@ QByteArray QWaylandCompositor::socketName() const
 }
 
 /*!
- * \qmlmethod QtWaylandCompositor::WaylandCompositor::addSocketDescriptor(fd)
+ * \qmlmethod QtWayland.Compositor::WaylandCompositor::addSocketDescriptor(fd)
  * \since 5.12
  *
  * Listen for client connections on a file descriptor, \a fd, referring to a
@@ -698,7 +698,7 @@ QList<QWaylandClient *>QWaylandCompositor::clients() const
 }
 
 /*!
- * \qmlmethod QtWaylandCompositor::WaylandCompositor::destroyClientForSurface(surface)
+ * \qmlmethod QtWayland.Compositor::WaylandCompositor::destroyClientForSurface(surface)
  *
  * Destroys the client for the WaylandSurface \a surface.
  */
@@ -712,7 +712,7 @@ void QWaylandCompositor::destroyClientForSurface(QWaylandSurface *surface)
 }
 
 /*!
- * \qmlmethod QtWaylandCompositor::WaylandCompositor::destroyClient(client)
+ * \qmlmethod QtWayland.Compositor::WaylandCompositor::destroyClient(client)
  *
  * Destroys the given WaylandClient \a client.
  */
@@ -770,7 +770,7 @@ QWaylandOutput *QWaylandCompositor::outputFor(QWindow *window) const
 }
 
 /*!
- * \qmlproperty WaylandOutput QtWaylandCompositor::WaylandCompositor::defaultOutput
+ * \qmlproperty WaylandOutput QtWayland.Compositor::WaylandCompositor::defaultOutput
  *
  * This property contains the first in the list of outputs added to the
  * WaylandCompositor, or null if no outputs have been added.
@@ -871,7 +871,7 @@ QWaylandTouch *QWaylandCompositor::createTouchDevice(QWaylandSeat *seat)
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::WaylandCompositor::retainedSelection
+ * \qmlproperty bool QtWayland.Compositor::WaylandCompositor::retainedSelection
  *
  * This property holds whether retained selection is enabled.
  */
@@ -917,7 +917,7 @@ void QWaylandCompositor::overrideSelection(const QMimeData *data)
 }
 
 /*!
- * \qmlproperty WaylandSeat QtWaylandCompositor::WaylandCompositor::defaultSeat
+ * \qmlproperty WaylandSeat QtWayland.Compositor::WaylandCompositor::defaultSeat
  *
  * This property contains the default seat for this
  * WaylandCompositor.
@@ -948,7 +948,7 @@ QWaylandSeat *QWaylandCompositor::seatFor(QInputEvent *inputEvent)
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::WaylandCompositor::useHardwareIntegrationExtension
+ * \qmlproperty bool QtWayland.Compositor::WaylandCompositor::useHardwareIntegrationExtension
  *
  * This property holds whether the hardware integration extension should be enabled for
  * this WaylandCompositor.
@@ -1034,7 +1034,7 @@ void QWaylandCompositor::grabSurface(QWaylandSurfaceGrabber *grabber, const QWay
 }
 
 /*!
- * \qmlproperty list<enum> QtWaylandCompositor::WaylandCompositor::additionalShmFormats
+ * \qmlproperty list<enum> QtWayland.Compositor::WaylandCompositor::additionalShmFormats
  *
  * This property holds the list of additional wl_shm formats advertised as supported by the
  * compositor.
diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp
index fc1cd5705..c19e2bd94 100644
--- a/src/compositor/compositor_api/qwaylandoutput.cpp
+++ b/src/compositor/compositor_api/qwaylandoutput.cpp
@@ -358,7 +358,7 @@ void QWaylandOutput::update()
 }
 
 /*!
- * \qmlproperty WaylandCompositor QtWaylandCompositor::WaylandOutput::compositor
+ * \qmlproperty WaylandCompositor QtWayland.Compositor::WaylandOutput::compositor
  *
  * This property holds the compositor displaying content on this WaylandOutput.
  *
@@ -398,7 +398,7 @@ void QWaylandOutput::setCompositor(QWaylandCompositor *compositor)
 }
 
 /*!
- * \qmlproperty string QtWaylandCompositor::WaylandOutput::manufacturer
+ * \qmlproperty string QtWayland.Compositor::WaylandOutput::manufacturer
  *
  * This property holds a textual description of the manufacturer of this WaylandOutput.
  */
@@ -426,7 +426,7 @@ void QWaylandOutput::setManufacturer(const QString &manufacturer)
 }
 
 /*!
- * \qmlproperty string QtWaylandCompositor::WaylandOutput::model
+ * \qmlproperty string QtWayland.Compositor::WaylandOutput::model
  *
  * This property holds a textual description of the model of this WaylandOutput.
  */
@@ -454,7 +454,7 @@ void QWaylandOutput::setModel(const QString &model)
 }
 
 /*!
- * \qmlproperty point QtWaylandCompositor::WaylandOutput::position
+ * \qmlproperty point QtWayland.Compositor::WaylandOutput::position
  *
  * This property holds the position of this WaylandOutput in the compositor's coordinate system.
  */
@@ -559,7 +559,7 @@ void QWaylandOutput::setCurrentMode(const QWaylandOutputMode &mode)
 }
 
 /*!
- * \qmlproperty rect QtWaylandCompositor::WaylandOutput::geometry
+ * \qmlproperty rect QtWayland.Compositor::WaylandOutput::geometry
  *
  * This property holds the geometry of the WaylandOutput.
  */
@@ -578,7 +578,7 @@ QRect QWaylandOutput::geometry() const
 }
 
 /*!
- * \qmlproperty rect QtWaylandCompositor::WaylandOutput::availableGeometry
+ * \qmlproperty rect QtWayland.Compositor::WaylandOutput::availableGeometry
  *
  * This property holds the geometry of the WaylandOutput available for displaying content.
  * The available geometry is in output coordinates space, starts from 0,0 and it's as big
@@ -621,7 +621,7 @@ void QWaylandOutput::setAvailableGeometry(const QRect &availableGeometry)
 }
 
 /*!
- * \qmlproperty size QtWaylandCompositor::WaylandOutput::physicalSize
+ * \qmlproperty size QtWayland.Compositor::WaylandOutput::physicalSize
  *
  * This property holds the physical size of the WaylandOutput in millimeters.
  *
@@ -669,7 +669,7 @@ void QWaylandOutput::setPhysicalSize(const QSize &size)
  */
 
 /*!
- * \qmlproperty enum QtWaylandCompositor::WaylandOutput::subpixel
+ * \qmlproperty enum QtWayland.Compositor::WaylandOutput::subpixel
  *
  * This property holds the subpixel arrangement of this WaylandOutput.
  *
@@ -726,7 +726,7 @@ void QWaylandOutput::setSubpixel(const Subpixel &subpixel)
 */
 
 /*!
- * \qmlproperty enum QtWaylandCompositor::WaylandOutput::transform
+ * \qmlproperty enum QtWayland.Compositor::WaylandOutput::transform
  *
  * This property holds the transformation that the QWaylandCompositor applies to a surface
  * to compensate for the orientation of the QWaylandOutput.
@@ -772,7 +772,7 @@ void QWaylandOutput::setTransform(const Transform &transform)
 }
 
 /*!
- * \qmlproperty int QtWaylandCompositor::WaylandOutput::scaleFactor
+ * \qmlproperty int QtWayland.Compositor::WaylandOutput::scaleFactor
  *
  * This property holds the factor by which the WaylandCompositor scales surface buffers
  * before they are displayed. It is used on high density output devices where unscaled content
@@ -822,7 +822,7 @@ void QWaylandOutput::setScaleFactor(int scale)
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::WaylandOutput::sizeFollowsWindow
+ * \qmlproperty bool QtWayland.Compositor::WaylandOutput::sizeFollowsWindow
  *
  * This property controls whether the size of the WaylandOutput matches the
  * size of its window.
@@ -860,7 +860,7 @@ void QWaylandOutput::setSizeFollowsWindow(bool follow)
 }
 
 /*!
- * \qmlproperty Window QtWaylandCompositor::WaylandOutput::window
+ * \qmlproperty Window QtWayland.Compositor::WaylandOutput::window
  *
  * This property holds the Window for this WaylandOutput.
  *
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
index f908532aa..43cc8c3e2 100644
--- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
@@ -47,7 +47,7 @@ QWaylandQuickCompositor::QWaylandQuickCompositor(QObject *parent)
 }
 
 /*!
- * \qmlproperty list QtWaylandCompositor::WaylandCompositor::extensions
+ * \qmlproperty list QtWayland.Compositor::WaylandCompositor::extensions
  *
  * A list of extensions that the compositor advertises to its clients. For
  * any Wayland extension the compositor should support, instantiate its component,
diff --git a/src/compositor/compositor_api/qwaylandquickhardwarelayer.cpp b/src/compositor/compositor_api/qwaylandquickhardwarelayer.cpp
index 07f37abee..9cf36b36f 100644
--- a/src/compositor/compositor_api/qwaylandquickhardwarelayer.cpp
+++ b/src/compositor/compositor_api/qwaylandquickhardwarelayer.cpp
@@ -79,7 +79,7 @@ QWaylandQuickHardwareLayer::~QWaylandQuickHardwareLayer()
 }
 
 /*!
- * \qmlproperty int QtWaylandCompositor::WaylandHardwareLayer::stackingLevel
+ * \qmlproperty int QtWayland.Compositor::WaylandHardwareLayer::stackingLevel
  *
  * This property holds the stacking level of this hardware layer relative to other hardware layers,
  * and can be used to sort hardware layers. I.e. a layer with a higher level is rendered on top of
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index 3f729e9f1..bf22325d5 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -482,7 +482,7 @@ QWaylandQuickItem::~QWaylandQuickItem()
 }
 
 /*!
- * \qmlproperty WaylandCompositor QtWaylandCompositor::WaylandQuickItem::compositor
+ * \qmlproperty WaylandCompositor QtWayland.Compositor::WaylandQuickItem::compositor
  *
  * This property holds the compositor for the surface rendered by this WaylandQuickItem.
  */
@@ -508,7 +508,7 @@ QWaylandView *QWaylandQuickItem::view() const
 }
 
 /*!
- * \qmlproperty WaylandSurface QtWaylandCompositor::WaylandQuickItem::surface
+ * \qmlproperty WaylandSurface QtWayland.Compositor::WaylandQuickItem::surface
  *
  * This property holds the surface rendered by this WaylandQuickItem.
  */
@@ -540,7 +540,7 @@ void QWaylandQuickItem::setSurface(QWaylandSurface *surface)
 }
 
 /*!
- * \qmlproperty enum QtWaylandCompositor::WaylandQuickItem::origin
+ * \qmlproperty enum QtWayland.Compositor::WaylandQuickItem::origin
  *
  * This property holds the origin of the QWaylandQuickItem.
  */
@@ -897,7 +897,7 @@ void QWaylandQuickItem::handlePlaceBelow(QWaylandSurface *referenceSurface)
 }
 
 /*!
-  \qmlproperty object QtWaylandCompositor::WaylandQuickItem::subsurfaceHandler
+  \qmlproperty object QtWayland.Compositor::WaylandQuickItem::subsurfaceHandler
 
   This property provides a way to override the default subsurface behavior.
 
@@ -953,7 +953,7 @@ void QWaylandQuickItem::setOutput(QWaylandOutput *output)
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::WaylandQuickItem::bufferLocked
+ * \qmlproperty bool QtWayland.Compositor::WaylandQuickItem::bufferLocked
  *
  * This property holds whether the item's buffer is currently locked. As long as
  * the buffer is locked, it will not be released and returned to the client.
@@ -1168,7 +1168,7 @@ void QWaylandQuickItem::updateSize()
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::WaylandQuickItem::focusOnClick
+ * \qmlproperty bool QtWayland.Compositor::WaylandQuickItem::focusOnClick
  *
  * This property specifies whether the WaylandQuickItem should take focus when
  * it is clicked or touched.
@@ -1283,7 +1283,7 @@ QVariant QWaylandQuickItem::inputMethodQuery(Qt::InputMethodQuery query, QVarian
 #endif
 
 /*!
-    \qmlproperty bool QtWaylandCompositor::WaylandQuickItem::paintEnabled
+    \qmlproperty bool QtWayland.Compositor::WaylandQuickItem::paintEnabled
 
     Returns true if the item is hidden, though the texture
     is still updated. As opposed to hiding the item by
@@ -1318,7 +1318,7 @@ void QWaylandQuickItem::setPaintEnabled(bool enabled)
 }
 
 /*!
-    \qmlproperty  bool QtWaylandCompositor::WaylandQuickItem::touchEventsEnabled
+    \qmlproperty  bool QtWayland.Compositor::WaylandQuickItem::touchEventsEnabled
 
     This property holds \c true if touch events are forwarded to the client
     surface, \c false otherwise.
@@ -1413,7 +1413,7 @@ void QWaylandQuickItem::updateInputMethod(Qt::InputMethodQueries queries)
 #endif
 
 /*!
- * \qmlsignal void QtWaylandCompositor::WaylandQuickItem::surfaceDestroyed()
+ * \qmlsignal void QtWayland.Compositor::WaylandQuickItem::surfaceDestroyed()
  *
  * This signal is emitted when the client has destroyed the \c wl_surface associated
  * with the WaylandQuickItem. The handler for this signal is expected to either destroy the
diff --git a/src/compositor/compositor_api/qwaylandquickoutput.cpp b/src/compositor/compositor_api/qwaylandquickoutput.cpp
index a388b1cc8..de6c3ede4 100644
--- a/src/compositor/compositor_api/qwaylandquickoutput.cpp
+++ b/src/compositor/compositor_api/qwaylandquickoutput.cpp
@@ -60,7 +60,7 @@ void QWaylandQuickOutput::update()
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::WaylandOutput::automaticFrameCallback
+ * \qmlproperty bool QtWayland.Compositor::WaylandOutput::automaticFrameCallback
  *
  * This property holds whether the WaylandOutput automatically sends frame
  * callbacks when rendering.
diff --git a/src/compositor/compositor_api/qwaylandquicksurface.cpp b/src/compositor/compositor_api/qwaylandquicksurface.cpp
index 7921907fa..920415d68 100644
--- a/src/compositor/compositor_api/qwaylandquicksurface.cpp
+++ b/src/compositor/compositor_api/qwaylandquicksurface.cpp
@@ -37,7 +37,7 @@ QWaylandQuickSurface::~QWaylandQuickSurface()
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::WaylandSurface::useTextureAlpha
+ * \qmlproperty bool QtWayland.Compositor::WaylandSurface::useTextureAlpha
  *
  * This property specifies whether the surface should use texture alpha.
  */
diff --git a/src/compositor/compositor_api/qwaylandseat.cpp b/src/compositor/compositor_api/qwaylandseat.cpp
index 375202fbf..c99e7ec4f 100644
--- a/src/compositor/compositor_api/qwaylandseat.cpp
+++ b/src/compositor/compositor_api/qwaylandseat.cpp
@@ -279,7 +279,7 @@ uint QWaylandSeat::sendTouchPointEvent(QWaylandSurface *surface, int id, const Q
 }
 
 /*!
- * \qmlmethod uint QtWaylandCompositor::WaylandSeat::sendTouchPointPressed(WaylandSurface surface, int id, point position)
+ * \qmlmethod uint QtWayland.Compositor::WaylandSeat::sendTouchPointPressed(WaylandSurface surface, int id, point position)
  *
  * Sends a touch pressed event for the touch point \a id on \a surface with
  * position \a position.
@@ -313,7 +313,7 @@ uint QWaylandSeat::sendTouchPointPressed(QWaylandSurface *surface, int id, const
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::WaylandSeat::sendTouchPointReleased(WaylandSurface surface, int id, point position)
+ * \qmlmethod void QtWayland.Compositor::WaylandSeat::sendTouchPointReleased(WaylandSurface surface, int id, point position)
  *
  * Sends a touch released event for the touch point \a id on \a surface with
  * position \a position.
@@ -347,7 +347,7 @@ uint QWaylandSeat::sendTouchPointReleased(QWaylandSurface *surface, int id, cons
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::WaylandSeat::sendTouchPointMoved(WaylandSurface surface, int id, point position)
+ * \qmlmethod void QtWayland.Compositor::WaylandSeat::sendTouchPointMoved(WaylandSurface surface, int id, point position)
  *
  * Sends a touch moved event for the touch point \a id on \a surface with
  * position \a position.
@@ -381,7 +381,7 @@ uint QWaylandSeat::sendTouchPointMoved(QWaylandSurface *surface, int id, const Q
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::WaylandSeat::sendTouchFrameEvent(WaylandClient client)
+ * \qmlmethod void QtWayland.Compositor::WaylandSeat::sendTouchFrameEvent(WaylandClient client)
  *
  * Sends a frame event to the touch device of a \a client to indicate the end
  * of a series of touch up, down, and motion events.
@@ -399,7 +399,7 @@ void QWaylandSeat::sendTouchFrameEvent(QWaylandClient *client)
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::WaylandSeat::sendTouchCancelEvent(WaylandClient client)
+ * \qmlmethod void QtWayland.Compositor::WaylandSeat::sendTouchCancelEvent(WaylandClient client)
  *
  * Sends a cancel event to the touch device of a \a client.
  */
@@ -507,7 +507,7 @@ void QWaylandSeat::sendFullKeyEvent(QKeyEvent *event)
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::WaylandSeat::sendKeyEvent(int qtKey, bool pressed)
+ * \qmlmethod void QtWayland.Compositor::WaylandSeat::sendKeyEvent(int qtKey, bool pressed)
  * \since 5.12
  *
  * Sends a key press (if \a pressed is \c true) or release (if \a pressed is \c false)
@@ -713,7 +713,7 @@ void QWaylandSeat::handleMouseFocusDestroyed()
 }
 
 
-/*! \qmlsignal void QtWaylandCompositor::QWaylandSeat::keyboardFocusChanged(QWaylandSurface newFocus, QWaylandSurface oldFocus)
+/*! \qmlsignal void QtWayland.Compositor::WaylandSeat::keyboardFocusChanged(QWaylandSurface newFocus, QWaylandSurface oldFocus)
  *
  * This signal is emitted when setKeyboardFocus() is called or when a WaylandQuickItem has focus
  * and the user starts pressing keys.
@@ -733,7 +733,7 @@ void QWaylandSeat::handleMouseFocusDestroyed()
  * \a oldFocus has the surface that lost keyboard focus; or \c nullptr if no surface had focus.
  */
 
-/*! \qmlsignal void QtWaylandCompositor::QWaylandSeat::cursorSurfaceRequest(QWaylandSurface surface, int hotspotX, int hotspotY)
+/*! \qmlsignal void QtWayland.Compositor::WaylandSeat::cursorSurfaceRequest(QWaylandSurface surface, int hotspotX, int hotspotY)
  *
  * This signal is emitted when the client has requested for a specific \a surface to be the mouse
  * cursor. For example, when the user hovers over a particular surface, and you want the cursor
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index cc89219bb..207158bf7 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -442,7 +442,7 @@ QWaylandSurface::~QWaylandSurface()
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::WaylandSurface::initialize(WaylandCompositor compositor, WaylandClient client, int id, int version)
+ * \qmlmethod void QtWayland.Compositor::WaylandSurface::initialize(WaylandCompositor compositor, WaylandClient client, int id, int version)
  *
  * Initializes the WaylandSurface with the given \a compositor and \a client, and with the given \a id
  * and \a version.
@@ -477,7 +477,7 @@ bool QWaylandSurface::isInitialized() const
 }
 
 /*!
- * \qmlproperty WaylandClient QtWaylandCompositor::WaylandSurface::client
+ * \qmlproperty WaylandClient QtWayland.Compositor::WaylandSurface::client
  *
  * This property holds the client using this WaylandSurface.
  */
@@ -508,7 +508,7 @@ QWaylandClient *QWaylandSurface::client() const
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::WaylandSurface::hasContent
+ * \qmlproperty bool QtWayland.Compositor::WaylandSurface::hasContent
  *
  * This property holds whether the WaylandSurface has content.
  */
@@ -525,7 +525,7 @@ bool QWaylandSurface::hasContent() const
 }
 
 /*!
- * \qmlproperty rect QtWaylandCompositor::WaylandSurface::sourceGeometry
+ * \qmlproperty rect QtWayland.Compositor::WaylandSurface::sourceGeometry
  * \since 5.13
  *
  * This property describes the portion of the attached Wayland buffer that should
@@ -556,7 +556,7 @@ QRectF QWaylandSurface::sourceGeometry() const
 }
 
 /*!
- * \qmlproperty size QtWaylandCompositor::WaylandSurface::destinationSize
+ * \qmlproperty size QtWayland.Compositor::WaylandSurface::destinationSize
  * \since 5.13
  *
  * This property holds the size of this WaylandSurface in surface coordinates.
@@ -581,7 +581,7 @@ QSize QWaylandSurface::destinationSize() const
 }
 
 /*!
- * \qmlproperty size QtWaylandCompositor::WaylandSurface::bufferSize
+ * \qmlproperty size QtWayland.Compositor::WaylandSurface::bufferSize
  *
  * This property holds the size of the current buffer of this WaylandSurface in pixels,
  * not in surface coordinates.
@@ -610,7 +610,7 @@ QSize QWaylandSurface::bufferSize() const
 }
 
 /*!
- * \qmlproperty size QtWaylandCompositor::WaylandSurface::bufferScale
+ * \qmlproperty size QtWayland.Compositor::WaylandSurface::bufferScale
  *
  * This property holds the WaylandSurface's buffer scale. The buffer scale lets
  * a client supply higher resolution buffer data for use on high resolution
@@ -631,7 +631,7 @@ int QWaylandSurface::bufferScale() const
 }
 
 /*!
- * \qmlproperty enum QtWaylandCompositor::WaylandSurface::contentOrientation
+ * \qmlproperty enum QtWayland.Compositor::WaylandSurface::contentOrientation
  *
  * This property holds the orientation of the WaylandSurface's contents.
  *
@@ -661,7 +661,7 @@ Qt::ScreenOrientation QWaylandSurface::contentOrientation() const
  */
 
 /*!
- * \qmlproperty enum QtWaylandCompositor::WaylandSurface::origin
+ * \qmlproperty enum QtWayland.Compositor::WaylandSurface::origin
  *
  * This property holds the origin of the WaylandSurface's buffer, or
  * WaylandSurface.OriginTopLeft if the surface has no buffer.
@@ -752,7 +752,7 @@ bool QWaylandSurface::inputRegionContains(const QPointF &position) const
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::WaylandSurface::destroy()
+ * \qmlmethod void QtWayland.Compositor::WaylandSurface::destroy()
  *
  * Destroys the WaylandSurface.
  */
@@ -767,7 +767,7 @@ void QWaylandSurface::destroy()
 }
 
 /*!
- * \qmlmethod bool QtWaylandCompositor::WaylandSurface::isDestroyed()
+ * \qmlmethod bool QtWayland.Compositor::WaylandSurface::isDestroyed()
  *
  * Returns \c true if the WaylandSurface has been destroyed. Otherwise returns \c false.
  */
@@ -782,7 +782,7 @@ bool QWaylandSurface::isDestroyed() const
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::WaylandSurface::cursorSurface
+ * \qmlproperty bool QtWayland.Compositor::WaylandSurface::cursorSurface
  *
  * This property holds whether the WaylandSurface is a cursor surface.
  */
@@ -809,7 +809,7 @@ bool QWaylandSurface::isCursorSurface() const
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::WaylandSurface::inhibitsIdle
+ * \qmlproperty bool QtWayland.Compositor::WaylandSurface::inhibitsIdle
  * \since 5.14
  *
  * This property holds whether this surface is intended to inhibit the idle
@@ -834,7 +834,7 @@ bool QWaylandSurface::inhibitsIdle() const
 }
 
 /*!
- *  \qmlproperty bool QtWaylandCompositor::WaylandSurface::isOpaque
+ *  \qmlproperty bool QtWayland.Compositor::WaylandSurface::isOpaque
  *  \since 6.4
  *
  *  This property holds whether the surface is fully opaque, as reported by the
@@ -1075,7 +1075,7 @@ void QWaylandSurfacePrivate::Subsurface::subsurface_set_desync(wl_subsurface::Re
 }
 
 /*!
- * \qmlsignal QtWaylandCompositor::WaylandSurface::childAdded(WaylandSurface child)
+ * \qmlsignal QtWayland.Compositor::WaylandSurface::childAdded(WaylandSurface child)
  *
  * This signal is emitted when a wl_subsurface, \a child, has been added to the surface.
  */
@@ -1087,7 +1087,7 @@ void QWaylandSurfacePrivate::Subsurface::subsurface_set_desync(wl_subsurface::Re
  */
 
 /*!
- * \qmlsignal QtWaylandCompositor::WaylandSurface::surfaceDestroyed()
+ * \qmlsignal QtWayland.Compositor::WaylandSurface::surfaceDestroyed()
  *
  * This signal is emitted when the corresponding wl_surface is destroyed.
  */
@@ -1099,7 +1099,7 @@ void QWaylandSurfacePrivate::Subsurface::subsurface_set_desync(wl_subsurface::Re
  */
 
 /*!
- * \qmlsignal void QtWaylandCompositor::WaylandSurface::dragStarted(WaylandDrag drag)
+ * \qmlsignal void QtWayland.Compositor::WaylandSurface::dragStarted(WaylandDrag drag)
  *
  * This signal is emitted when a \a drag has started from this surface.
  */
diff --git a/src/compositor/compositor_api/qwaylandview.cpp b/src/compositor/compositor_api/qwaylandview.cpp
index 88d90e198..ead37c75c 100644
--- a/src/compositor/compositor_api/qwaylandview.cpp
+++ b/src/compositor/compositor_api/qwaylandview.cpp
@@ -84,7 +84,7 @@ QObject *QWaylandView::renderObject() const
 }
 
 /*!
- * \qmlproperty WaylandSurface QtWaylandCompositor::WaylandView::surface
+ * \qmlproperty WaylandSurface QtWayland.Compositor::WaylandView::surface
  *
  * This property holds the surface viewed by this WaylandView.
  */
@@ -143,7 +143,7 @@ void QWaylandView::setSurface(QWaylandSurface *newSurface)
 }
 
 /*!
- * \qmlproperty WaylandOutput QtWaylandCompositor::WaylandView::output
+ * \qmlproperty WaylandOutput QtWayland.Compositor::WaylandView::output
  *
  * This property holds the output on which this view displays its surface.
  */
@@ -258,7 +258,7 @@ QRegion QWaylandView::currentDamage()
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::WaylandView::bufferLocked
+ * \qmlproperty bool QtWayland.Compositor::WaylandView::bufferLocked
  *
  * This property holds whether the view's buffer is currently locked. When
  * the buffer is locked, advance() will not advance to the next buffer and
@@ -291,7 +291,7 @@ void QWaylandView::setBufferLocked(bool locked)
     emit bufferLockedChanged();
 }
 /*!
- * \qmlproperty bool QtWaylandCompositor::WaylandView::allowDiscardFrontBuffer
+ * \qmlproperty bool QtWayland.Compositor::WaylandView::allowDiscardFrontBuffer
  *
  * By default, the view locks the current buffer until advance() is called. Set this property
  * to true to allow Qt to release the buffer when the primary view is no longer using it.
diff --git a/src/compositor/extensions/qwaylandiviapplication.cpp b/src/compositor/extensions/qwaylandiviapplication.cpp
index 5d86c40cf..db9130829 100644
--- a/src/compositor/extensions/qwaylandiviapplication.cpp
+++ b/src/compositor/extensions/qwaylandiviapplication.cpp
@@ -106,7 +106,7 @@ QByteArray QWaylandIviApplication::interfaceName()
 }
 
 /*!
- * \qmlsignal void QtWaylandCompositor::IviApplication::iviSurfaceRequested(WaylandSurface surface, int iviId, WaylandResource resource)
+ * \qmlsignal void IviApplication::iviSurfaceRequested(WaylandSurface surface, int iviId, WaylandResource resource)
  *
  * This signal is emitted when the client has requested an \c ivi_surface to be associated
  * with \a surface, which is identified by \a iviId. The handler for this signal is
@@ -125,7 +125,7 @@ QByteArray QWaylandIviApplication::interfaceName()
  */
 
 /*!
- * \qmlsignal void QtWaylandCompositor::IviApplication::iviSurfaceCreated(IviSurface *iviSurface)
+ * \qmlsignal void IviApplication::iviSurfaceCreated(IviSurface *iviSurface)
  *
  * This signal is emitted when an IviSurface has been created. The supplied \a iviSurface is
  * most commonly used to instantiate a ShellSurfaceItem.
diff --git a/src/compositor/extensions/qwaylandivisurface.cpp b/src/compositor/extensions/qwaylandivisurface.cpp
index 8d89f3f23..493416abf 100644
--- a/src/compositor/extensions/qwaylandivisurface.cpp
+++ b/src/compositor/extensions/qwaylandivisurface.cpp
@@ -61,7 +61,7 @@ QWaylandIviSurface::QWaylandIviSurface(QWaylandIviApplication *application, QWay
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::IviSurface::initialize(IviApplication iviApplication, WaylandSurface surface, int iviId, WaylandResource resource)
+ * \qmlmethod void IviSurface::initialize(IviApplication iviApplication, WaylandSurface surface, int iviId, WaylandResource resource)
  *
  * Initializes the IviSurface, associating it with the given \a iviApplication, \a surface,
  * \a iviId, and \a resource.
@@ -89,7 +89,7 @@ void QWaylandIviSurface::initialize(QWaylandIviApplication *iviApplication, QWay
 }
 
 /*!
- * \qmlproperty WaylandSurface QtWaylandCompositor::IviSurface::surface
+ * \qmlproperty WaylandSurface IviSurface::surface
  *
  * This property holds the surface associated with this IviSurface.
  */
@@ -106,7 +106,7 @@ QWaylandSurface *QWaylandIviSurface::surface() const
 }
 
 /*!
- * \qmlproperty int QtWaylandCompositor::IviSurface::iviId
+ * \qmlproperty int IviSurface::iviId
  * \readonly
  *
  * This property holds the ivi id id of this IviSurface.
@@ -155,7 +155,7 @@ QWaylandIviSurface *QWaylandIviSurface::fromResource(wl_resource *resource)
 }
 
 /*!
- * \qmlmethod int QtWaylandCompositor::IviSurface::sendConfigure(size size)
+ * \qmlmethod int IviSurface::sendConfigure(size size)
  *
  * Sends a configure event to the client, telling it to resize the surface to the given \a size.
  */
diff --git a/src/compositor/extensions/qwaylandpresentationtime.cpp b/src/compositor/extensions/qwaylandpresentationtime.cpp
index d47f60167..637fc5d68 100644
--- a/src/compositor/extensions/qwaylandpresentationtime.cpp
+++ b/src/compositor/extensions/qwaylandpresentationtime.cpp
@@ -104,7 +104,7 @@ QWaylandCompositor *QWaylandPresentationTime::compositor() const
 }
 
 /*!
- * \qmlmethod void QWaylandCompositor::PresentationTime::sendFeedback(Window window, int sequence, int sec, int nsec)
+ * \qmlmethod void PresentationTime::sendFeedback(Window window, int sequence, int sec, int nsec)
  *
  * Interface to notify that a frame is presented on screen using \a window.
  * If your platform supports DRM events, \c page_flip_handler is the proper timing to send it.
diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp
index dfbe41490..90369c326 100644
--- a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp
+++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp
@@ -77,7 +77,7 @@ QWaylandQuickShellSurfaceItem::QWaylandQuickShellSurfaceItem(QWaylandQuickShellS
 }
 
 /*!
- * \qmlproperty ShellSurface QtWaylandCompositor::ShellSurfaceItem::shellSurface
+ * \qmlproperty ShellSurface QtWayland.Compositor::ShellSurfaceItem::shellSurface
  *
  * This property holds the ShellSurface rendered by this ShellSurfaceItem.
  * It may either be an XdgSurfaceV5, WlShellSurface or IviSurface depending on which shell protocol
@@ -120,7 +120,7 @@ void QWaylandQuickShellSurfaceItem::setShellSurface(QWaylandShellSurface *shellS
 }
 
 /*!
- * \qmlproperty Item QtWaylandCompositor::ShellSurfaceItem::moveItem
+ * \qmlproperty Item QtWayland.Compositor::ShellSurfaceItem::moveItem
  *
  * This property holds the move item for this ShellSurfaceItem. This is the item that will be moved
  * when the clients request the ShellSurface to be moved, maximized, resized etc. This property is
@@ -151,7 +151,7 @@ void QWaylandQuickShellSurfaceItem::setMoveItem(QQuickItem *moveItem)
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::ShellSurfaceItem::autoCreatePopupItems
+ * \qmlproperty bool QtWayland.Compositor::ShellSurfaceItem::autoCreatePopupItems
  *
  * This property holds whether ShellSurfaceItems for popups parented to the shell
  * surface managed by this item should automatically be created.
diff --git a/src/compositor/extensions/qwaylandshell.cpp b/src/compositor/extensions/qwaylandshell.cpp
index 3c22afb4c..68f9d839b 100644
--- a/src/compositor/extensions/qwaylandshell.cpp
+++ b/src/compositor/extensions/qwaylandshell.cpp
@@ -29,7 +29,7 @@ QWaylandShell::QWaylandShell(QWaylandObject *waylandObject)
  */
 
 /*!
- * \qmlproperty enumeration QtWaylandCompositor::Shell::focusPolicy
+ * \qmlproperty enumeration Shell::focusPolicy
  *
  * This property holds the focus policy of the Shell.
  */
diff --git a/src/compositor/extensions/qwaylandshellsurface.cpp b/src/compositor/extensions/qwaylandshellsurface.cpp
index 37b4199f0..5e999cf9f 100644
--- a/src/compositor/extensions/qwaylandshellsurface.cpp
+++ b/src/compositor/extensions/qwaylandshellsurface.cpp
@@ -81,7 +81,7 @@
 #endif
 
 /*!
- * \qmlproperty enum QtWaylandCompositor::ShellSurface::windowType
+ * \qmlproperty enum QtWayland.Compositor::ShellSurface::windowType
  *
  * This property holds the window type of the ShellSurface.
  */
diff --git a/src/compositor/extensions/qwaylandwlshell.cpp b/src/compositor/extensions/qwaylandwlshell.cpp
index 4fb55e942..c0e6119e1 100644
--- a/src/compositor/extensions/qwaylandwlshell.cpp
+++ b/src/compositor/extensions/qwaylandwlshell.cpp
@@ -345,7 +345,7 @@ const struct wl_interface *QWaylandWlShell::interface()
 }
 
 /*!
- * \qmlsignal void QtWaylandCompositor::WlShell::wlShellSurfaceRequested(WaylandSurface surface, WaylandResource resource)
+ * \qmlsignal void WlShell::wlShellSurfaceRequested(WaylandSurface surface, WaylandResource resource)
  *
  * This signal is emitted when the client has requested a \c wl_shell_surface to be associated with
  * \a surface. The handler for this signal may create a shell surface for \a resource and initialize
@@ -363,7 +363,7 @@ const struct wl_interface *QWaylandWlShell::interface()
  */
 
 /*!
- * \qmlsignal void QtWaylandCompositor::WlShell::wlShellSurfaceCreated(WlShellSurface shellSurface)
+ * \qmlsignal void WlShell::wlShellSurfaceCreated(WlShellSurface shellSurface)
  *
  * This signal is emitted when the client has created a \c wl_shell_surface.
  * A common use case is to let the handler of this signal instantiate a ShellSurfaceItem or
@@ -438,7 +438,7 @@ QWaylandWlShellSurface::~QWaylandWlShellSurface()
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::WlShellSurface::initialize(WlShell shell, WaylandSurface surface, WaylandResource resource)
+ * \qmlmethod void WlShellSurface::initialize(WlShell shell, WaylandSurface surface, WaylandResource resource)
  *
  * Initializes the WlShellSurface and associates it with the given \a shell, \a surface, and \a resource.
  */
@@ -538,7 +538,7 @@ void QWaylandWlShellSurface::sendConfigure(const QSize &size, ResizeEdge edges)
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::WlShellSurface::sendPopupDone()
+ * \qmlmethod void WlShellSurface::sendPopupDone()
  *
  * Sends a popup_done event to the client to indicate that the user has clicked
  * somewhere outside the client's surfaces.
@@ -562,7 +562,7 @@ QWaylandQuickShellIntegration *QWaylandWlShellSurface::createIntegration(QWaylan
 #endif
 
 /*!
- * \qmlproperty WaylandSurface QtWaylandCompositor::WlShellSurface::surface
+ * \qmlproperty WaylandSurface WlShellSurface::surface
  *
  * This property holds the \c wl_surface associated with this WlShellSurface.
  */
@@ -579,7 +579,7 @@ QWaylandSurface *QWaylandWlShellSurface::surface() const
 }
 
 /*!
- * \qmlproperty WlShell QtWaylandCompositor::WlShellSurface::shell
+ * \qmlproperty WlShell WlShellSurface::shell
  *
  * This property holds the shell associated with this WlShellSurface.
  */
@@ -596,7 +596,7 @@ QWaylandWlShell *QWaylandWlShellSurface::shell() const
 }
 
 /*!
- * \qmlproperty enum QtWaylandCompositor::WlShellSurface::windowType
+ * \qmlproperty enum WlShellSurface::windowType
  *
  * This property holds the window type of the WlShellSurface.
  */
@@ -608,7 +608,7 @@ Qt::WindowType QWaylandWlShellSurface::windowType() const
 }
 
 /*!
- * \qmlproperty string QtWaylandCompositor::WlShellSurface::title
+ * \qmlproperty string WlShellSurface::title
  *
  * This property holds the title of the WlShellSurface.
  */
@@ -625,7 +625,7 @@ QString QWaylandWlShellSurface::title() const
 }
 
 /*!
- * \qmlproperty string QtWaylandCompositor::WlShellSurface::className
+ * \qmlproperty string WlShellSurface::className
  *
  * This property holds the class name of the WlShellSurface.
  */
@@ -647,7 +647,7 @@ QWaylandSurfaceRole *QWaylandWlShellSurface::role()
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::WlShellSurface::ping()
+ * \qmlmethod void WlShellSurface::ping()
  *
  * Sends a ping event to the client. If the client replies to the event the pong
  * signal will be emitted.
diff --git a/src/compositor/extensions/qwaylandxdgdecorationv1.cpp b/src/compositor/extensions/qwaylandxdgdecorationv1.cpp
index 64a92a893..c7af0bca5 100644
--- a/src/compositor/extensions/qwaylandxdgdecorationv1.cpp
+++ b/src/compositor/extensions/qwaylandxdgdecorationv1.cpp
@@ -86,7 +86,7 @@ void QWaylandXdgDecorationManagerV1::initialize()
 }
 
 /*!
-    \qmlproperty string QtWaylandCompositor::XdgDecorationManagerV1::preferredMode
+    \qmlproperty string XdgDecorationManagerV1::preferredMode
 
     This property holds the decoration mode the compositor prefers.
 
diff --git a/src/compositor/extensions/qwaylandxdgoutputv1.cpp b/src/compositor/extensions/qwaylandxdgoutputv1.cpp
index 14e50eb82..035d8dd3d 100644
--- a/src/compositor/extensions/qwaylandxdgoutputv1.cpp
+++ b/src/compositor/extensions/qwaylandxdgoutputv1.cpp
@@ -206,7 +206,7 @@ QWaylandXdgOutputV1::~QWaylandXdgOutputV1()
 }
 
 /*!
- * \qmlproperty XdgOutputManagerV1 QtWaylandCompositor::XdgOutputV1::manager
+ * \qmlproperty XdgOutputManagerV1 XdgOutputV1::manager
  * \readonly
  *
  * This property holds the object that manages this XdgOutputV1.
@@ -224,7 +224,7 @@ QWaylandXdgOutputManagerV1 *QWaylandXdgOutputV1::manager() const
 }
 
 /*!
- * \qmlproperty WaylandOutput QtWaylandCompositor::XdgOutputV1::output
+ * \qmlproperty WaylandOutput XdgOutputV1::output
  * \readonly
  *
  * This property holds the WaylandOutput associated with this XdgOutputV1.
@@ -242,7 +242,7 @@ QWaylandOutput *QWaylandXdgOutputV1::output() const
 }
 
 /*!
- * \qmlproperty string QtWaylandCompositor::XdgOutputV1::name
+ * \qmlproperty string XdgOutputV1::name
  *
  * This property holds the name of this output.
  *
@@ -293,7 +293,7 @@ void QWaylandXdgOutputV1::setName(const QString &name)
 }
 
 /*!
- *  \qmlproperty string QtWaylandCompositor::XdgOutputV1::description
+ *  \qmlproperty string XdgOutputV1::description
  *
  *  This property holds the description of this output.
  *
@@ -334,7 +334,7 @@ void QWaylandXdgOutputV1::setDescription(const QString &description)
 }
 
 /*!
- * \qmlproperty point QtWaylandCompositor::XdgOutputV1::logicalPosition
+ * \qmlproperty point XdgOutputV1::logicalPosition
  *
  * This property holds the coordinates of the output within the global compositor space.
  *
@@ -370,7 +370,7 @@ void QWaylandXdgOutputV1::setLogicalPosition(const QPoint &position)
 }
 
 /*!
- * \qmlproperty size QtWaylandCompositor::XdgOutputV1::logicalSize
+ * \qmlproperty size XdgOutputV1::logicalSize
  *
  * This property holds the size of the output in the global compositor space.
  *
@@ -422,7 +422,7 @@ void QWaylandXdgOutputV1::setLogicalSize(const QSize &size)
 }
 
 /*!
- * \qmlproperty rect QtWaylandCompositor::XdgOutputV1::logicalGeometry
+ * \qmlproperty rect XdgOutputV1::logicalGeometry
  * \readonly
  *
  * This property holds the position and size of the output in the global compositor space.
diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp
index 8ceb57da3..871f0cf62 100644
--- a/src/compositor/extensions/qwaylandxdgshell.cpp
+++ b/src/compositor/extensions/qwaylandxdgshell.cpp
@@ -197,7 +197,7 @@ QByteArray QWaylandXdgShell::interfaceName()
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::XdgShell::ping(WaylandClient client)
+ * \qmlmethod void XdgShell::ping(WaylandClient client)
  *
  * Sends a ping event to \a client. If the client replies to the event the
  * \l pong signal will be emitted.
@@ -475,7 +475,7 @@ QWaylandXdgSurface::QWaylandXdgSurface(QWaylandXdgShell *xdgShell, QWaylandSurfa
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::XdgSurface::initialize(object xdgShell, object surface, object client, int id)
+ * \qmlmethod void XdgSurface::initialize(object xdgShell, object surface, object client, int id)
  *
  * Initializes the XdgSurface, associating it with the given \a xdgShell, \a surface,
  * \a client, and \a id.
@@ -501,7 +501,7 @@ void QWaylandXdgSurface::initialize(QWaylandXdgShell *xdgShell, QWaylandSurface
 }
 
 /*!
- * \qmlproperty enum QtWaylandCompositor::XdgSurface::windowType
+ * \qmlproperty enum XdgSurface::windowType
  *
  * This property holds the window type of the XdgSurface.
  */
@@ -512,7 +512,7 @@ Qt::WindowType QWaylandXdgSurface::windowType() const
 }
 
 /*!
- * \qmlproperty rect QtWaylandCompositor::XdgSurface::windowGeometry
+ * \qmlproperty rect XdgSurface::windowGeometry
  *
  * This property holds the window geometry of the QWaylandXdgSurface. The window
  * geometry describes the window's visible bounds from the user's perspective.
@@ -557,7 +557,7 @@ void QWaylandXdgSurface::handleBufferScaleChanged()
 }
 
 /*!
- * \qmlproperty XdgShell QtWaylandCompositor::XdgSurface::shell
+ * \qmlproperty XdgShell XdgSurface::shell
  *
  * This property holds the shell associated with this XdgSurface.
  */
@@ -574,7 +574,7 @@ QWaylandXdgShell *QWaylandXdgSurface::shell() const
 }
 
 /*!
- * \qmlproperty WaylandSurface QtWaylandCompositor::XdgSurface::surface
+ * \qmlproperty WaylandSurface XdgSurface::surface
  *
  * This property holds the surface associated with this XdgSurface.
  */
@@ -591,7 +591,7 @@ QWaylandSurface *QWaylandXdgSurface::surface() const
 }
 
 /*!
- * \qmlproperty XdgToplevel QtWaylandCompositor::XdgSurface::toplevel
+ * \qmlproperty XdgToplevel XdgSurface::toplevel
  *
  * This property holds the properties and methods that are specific to the
  * toplevel XdgSurface.
@@ -614,7 +614,7 @@ QWaylandXdgToplevel *QWaylandXdgSurface::toplevel() const
 }
 
 /*!
- * \qmlproperty XdgPopup QtWaylandCompositor::XdgSurface::popup
+ * \qmlproperty XdgPopup XdgSurface::popup
  *
  * This property holds the properties and methods that are specific to the
  * popup XdgSurface.
@@ -725,7 +725,7 @@ QWaylandXdgToplevel::~QWaylandXdgToplevel()
 }
 
 /*!
- * \qmlproperty XdgSurface QtWaylandCompositor::XdgToplevel::xdgSurface
+ * \qmlproperty XdgSurface XdgToplevel::xdgSurface
  *
  * This property holds the XdgSurface for this XdgToplevel.
  */
@@ -742,7 +742,7 @@ QWaylandXdgSurface *QWaylandXdgToplevel::xdgSurface() const
 }
 
 /*!
- * \qmlproperty XdgToplevel QtWaylandCompositor::XdgToplevel::parentToplevel
+ * \qmlproperty XdgToplevel XdgToplevel::parentToplevel
  *
  * This property holds the XdgToplevel parent of this XdgToplevel.
  */
@@ -760,7 +760,7 @@ QWaylandXdgToplevel *QWaylandXdgToplevel::parentToplevel() const
 }
 
 /*!
- * \qmlproperty string QtWaylandCompositor::XdgToplevel::title
+ * \qmlproperty string XdgToplevel::title
  *
  * This property holds the title of the XdgToplevel.
  */
@@ -777,7 +777,7 @@ QString QWaylandXdgToplevel::title() const
 }
 
 /*!
- * \qmlproperty string QtWaylandCompositor::XdgToplevel::appId
+ * \qmlproperty string XdgToplevel::appId
  *
  * This property holds the app id of the XdgToplevel.
  */
@@ -794,7 +794,7 @@ QString QWaylandXdgToplevel::appId() const
 }
 
 /*!
- * \qmlproperty size QtWaylandCompositor::XdgToplevel::maxSize
+ * \qmlproperty size XdgToplevel::maxSize
  *
  * This property holds the maximum size of the XdgToplevel as requested by the client.
  *
@@ -815,7 +815,7 @@ QSize QWaylandXdgToplevel::maxSize() const
 }
 
 /*!
- * \qmlproperty size QtWaylandCompositor::XdgToplevel::minSize
+ * \qmlproperty size XdgToplevel::minSize
  *
  * This property holds the minimum size of the XdgToplevel as requested by the client.
  *
@@ -847,7 +847,7 @@ QList<QWaylandXdgToplevel::State> QWaylandXdgToplevel::states() const
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::XdgToplevel::maximized
+ * \qmlproperty bool XdgToplevel::maximized
  *
  * This property holds whether the client has acknowledged that it should be maximized.
  */
@@ -864,7 +864,7 @@ bool QWaylandXdgToplevel::maximized() const
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::XdgToplevel::fullscreen
+ * \qmlproperty bool XdgToplevel::fullscreen
  *
  * This property holds whether the client has acknowledged that it should be fullscreen.
  */
@@ -881,7 +881,7 @@ bool QWaylandXdgToplevel::fullscreen() const
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::XdgToplevel::resizing
+ * \qmlproperty bool XdgToplevel::resizing
  *
  * This property holds whether the client has acknowledged that it is being resized.
  */
@@ -898,7 +898,7 @@ bool QWaylandXdgToplevel::resizing() const
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::XdgToplevel::activated
+ * \qmlproperty bool XdgToplevel::activated
  *
  * This property holds whether toplevel is drawing itself as having input focus.
  */
@@ -924,7 +924,7 @@ bool QWaylandXdgToplevel::activated() const
  */
 
 /*!
- * \qmlproperty enumeration QtWaylandCompositor::XdgToplevel::decorationMode
+ * \qmlproperty enumeration XdgToplevel::decorationMode
  *
  * This property holds the current window decoration mode for this toplevel.
  *
@@ -949,7 +949,7 @@ QWaylandXdgToplevel::DecorationMode QWaylandXdgToplevel::decorationMode() const
 }
 
 /*!
- * \qmlmethod size QtWaylandCompositor::XdgToplevel::sizeForResize(size size, point delta, uint edges)
+ * \qmlmethod size XdgToplevel::sizeForResize(size size, point delta, uint edges)
  *
  * Convenience for computing the new size given the current \a size, a \a delta, and
  * the \a edges active in the drag.
@@ -1005,7 +1005,7 @@ uint QWaylandXdgToplevel::sendConfigure(const QSize &size, const QList<QWaylandX
 }
 
 /*!
- * \qmlmethod int QtWaylandCompositor::XdgToplevel::sendConfigure(size size, list<int> states)
+ * \qmlmethod int XdgToplevel::sendConfigure(size size, list<int> states)
  *
  * Sends a configure event to the client. \a size contains the pixel size of the surface.
  * A size of zero means the client is free to decide the size.
@@ -1020,7 +1020,7 @@ uint QWaylandXdgToplevel::sendConfigure(const QSize &size, const QList<int> &sta
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::XdgToplevel::sendClose()
+ * \qmlmethod void XdgToplevel::sendClose()
  *
  * Sends a close event to the client. The client may choose to ignore the event.
  */
@@ -1035,7 +1035,7 @@ void QWaylandXdgToplevel::sendClose()
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::XdgToplevel::sendMaximized(size size)
+ * \qmlmethod void XdgToplevel::sendMaximized(size size)
  *
  * Convenience for sending a configure event with the maximized state set, and
  * fullscreen and resizing removed. The activated state is left in its current state.
@@ -1063,7 +1063,7 @@ uint QWaylandXdgToplevel::sendMaximized(const QSize &size)
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::XdgToplevel::sendUnmaximized(size size)
+ * \qmlmethod void XdgToplevel::sendUnmaximized(size size)
  *
  * Convenience for sending a configure event with the maximized, fullscreen and
  * resizing states removed, and fullscreen and resizing removed. The activated
@@ -1093,7 +1093,7 @@ uint QWaylandXdgToplevel::sendUnmaximized(const QSize &size)
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::XdgToplevel::sendFullscreen(size size)
+ * \qmlmethod void XdgToplevel::sendFullscreen(size size)
  *
  * Convenience for sending a configure event with the fullscreen state set, and
  * maximized and resizing removed. The activated state is left in its current state.
@@ -1125,7 +1125,7 @@ uint QWaylandXdgToplevel::sendFullscreen(const QSize &size)
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::XdgToplevel::sendResizing(size maxSize)
+ * \qmlmethod void XdgToplevel::sendResizing(size maxSize)
  *
  * Convenience for sending a configure event with the resizing state set, and
  * maximized and fullscreen removed. The activated state is left in its current state.
@@ -1171,7 +1171,7 @@ QWaylandXdgToplevel *QWaylandXdgToplevel::fromResource(wl_resource *resource)
 }
 
 /*!
- * \qmlsignal QtWaylandCompositor::XdgShell::xdgSurfaceCreated(XdgSurface xdgSurface)
+ * \qmlsignal XdgShell::xdgSurfaceCreated(XdgSurface xdgSurface)
  *
  * This signal is emitted when the client has created a \c xdg_surface.
  * Note that \a xdgSurface is not mapped, i.e. according to the \c xdg-shell
@@ -1191,7 +1191,7 @@ QWaylandXdgToplevel *QWaylandXdgToplevel::fromResource(wl_resource *resource)
  */
 
 /*!
- * \qmlsignal QtWaylandCompositor::XdgShell::toplevelCreated(XdgToplevel toplevel, XdgSurface xdgSurface)
+ * \qmlsignal XdgShell::toplevelCreated(XdgToplevel toplevel, XdgSurface xdgSurface)
  *
  * This signal is emitted when the client has created a \c xdg_toplevel.
  * A common use case is to let the handler of this signal instantiate a ShellSurfaceItem or
@@ -1211,7 +1211,7 @@ QWaylandXdgToplevel *QWaylandXdgToplevel::fromResource(wl_resource *resource)
  */
 
 /*!
- * \qmlsignal QtWaylandCompositor::XdgShell::popupCreated(XdgPopup popup, XdgSurface xdgSurface)
+ * \qmlsignal XdgShell::popupCreated(XdgPopup popup, XdgSurface xdgSurface)
  *
  * This signal is emitted when the client has created a \c xdg_popup.
  * A common use case is to let the handler of this signal instantiate a ShellSurfaceItem or
@@ -1231,7 +1231,7 @@ QWaylandXdgToplevel *QWaylandXdgToplevel::fromResource(wl_resource *resource)
  */
 
 /*!
- * \qmlsignal QtWaylandCompositor::XdgShell::pong(int serial)
+ * \qmlsignal XdgShell::pong(int serial)
  *
  * This signal is emitted when the client has responded to a ping event with serial, \a serial.
  *
@@ -1552,7 +1552,7 @@ QWaylandXdgPopup::QWaylandXdgPopup(QWaylandXdgSurface *xdgSurface, QWaylandXdgSu
 }
 
 /*!
- * \qmlproperty XdgSurface QtWaylandCompositor::XdgPopup::xdgSurface
+ * \qmlproperty XdgSurface XdgPopup::xdgSurface
  *
  * This property holds the XdgSurface associated with this XdgPopup.
  */
@@ -1569,7 +1569,7 @@ QWaylandXdgSurface *QWaylandXdgPopup::xdgSurface() const
 }
 
 /*!
- * \qmlproperty XdgSurface QtWaylandCompositor::XdgPopup::parentXdgSurface
+ * \qmlproperty XdgSurface XdgPopup::parentXdgSurface
  *
  * This property holds the XdgSurface associated with the parent of this XdgPopup.
  */
@@ -1587,7 +1587,7 @@ QWaylandXdgSurface *QWaylandXdgPopup::parentXdgSurface() const
 }
 
 /*!
- * \qmlproperty rect QtWaylandCompositor::XdgPopup::configuredGeometry
+ * \qmlproperty rect XdgPopup::configuredGeometry
  *
  * The window geometry the popup received in the configure event. Relative to the
  * upper left corner of the parent surface.
@@ -1606,7 +1606,7 @@ QRect QWaylandXdgPopup::configuredGeometry() const
 }
 
 /*!
- * \qmlproperty rect QtWaylandCompositor::XdgPopup::anchorRect
+ * \qmlproperty rect XdgPopup::anchorRect
  *
  * The anchor rectangle relative to the parent window geometry that the child
  * surface should be placed relative to.
@@ -1625,7 +1625,7 @@ QRect QWaylandXdgPopup::anchorRect() const
 }
 
 /*!
- * \qmlproperty enumeration QtWaylandCompositor::XdgPopup::anchorEdges
+ * \qmlproperty enumeration XdgPopup::anchorEdges
  *
  * This property holds the set of edges on the anchor rect that the child surface should be placed
  * relative to. If no edges are specified in a direction, the anchor point should be
@@ -1652,7 +1652,7 @@ Qt::Edges QWaylandXdgPopup::anchorEdges() const
 }
 
 /*!
- * \qmlproperty rect QtWaylandCompositor::XdgPopup::gravityEdges
+ * \qmlproperty rect XdgPopup::gravityEdges
  *
  * Specifies in what direction the surface should be positioned, relative to the anchor
  * point.
@@ -1677,7 +1677,7 @@ Qt::Edges QWaylandXdgPopup::gravityEdges() const
 }
 
 /*!
- * \qmlproperty enumeration QtWaylandCompositor::XdgPopup::slideConstraints
+ * \qmlproperty enumeration XdgPopup::slideConstraints
  *
  * This property holds the orientations in which the child should slide to fit within the screen.
  *
@@ -1707,7 +1707,7 @@ Qt::Orientations QWaylandXdgPopup::slideConstraints() const
 }
 
 /*!
- * \qmlproperty enumeration QtWaylandCompositor::XdgPopup::flipConstraints
+ * \qmlproperty enumeration XdgPopup::flipConstraints
  *
  * This property holds the orientations in which the child should flip to fit within the screen.
  *
@@ -1737,7 +1737,7 @@ Qt::Orientations QWaylandXdgPopup::flipConstraints() const
 }
 
 /*!
- * \qmlproperty enumeration QtWaylandCompositor::XdgPopup::resizeConstraints
+ * \qmlproperty enumeration XdgPopup::resizeConstraints
  *
  * This property holds the orientations in which the child should resize to fit within the screen.
  *
@@ -1767,7 +1767,7 @@ Qt::Orientations QWaylandXdgPopup::resizeConstraints() const
 }
 
 /*!
- * \qmlproperty point QtWaylandCompositor::XdgPopup::offset
+ * \qmlproperty point XdgPopup::offset
  *
  * The position relative to the position of the anchor on the anchor rectangle and
  * the anchor on the surface.
@@ -1786,7 +1786,7 @@ QPoint QWaylandXdgPopup::offset() const
 }
 
 /*!
- * \qmlproperty size QtWaylandCompositor::XdgPopup::positionerSize
+ * \qmlproperty size XdgPopup::positionerSize
  *
  * The size requested for the window geometry by the positioner object.
  */
@@ -1803,7 +1803,7 @@ QSize QWaylandXdgPopup::positionerSize() const
 }
 
 /*!
- * \qmlproperty point QtWaylandCompositor::XdgPopup::unconstrainedPosition
+ * \qmlproperty point XdgPopup::unconstrainedPosition
  *
  * The position of the surface relative to the parent window geometry if the surface
  * is not constrained. I.e. when not moved to fit inside the screen or similar.
@@ -1822,7 +1822,7 @@ QPoint QWaylandXdgPopup::unconstrainedPosition() const
 }
 
 /*!
- * \qmlmethod int QtWaylandCompositor::XdgPopup::sendConfigure(rect geometry)
+ * \qmlmethod int XdgPopup::sendConfigure(rect geometry)
  *
  * Sends a configure event to the client. \a geometry contains the window geometry
  * relative to the upper left corner of the window geometry of the parent surface.
@@ -1844,7 +1844,7 @@ uint QWaylandXdgPopup::sendConfigure(const QRect &geometry)
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::XdgPopup::sendPopupDone()
+ * \qmlmethod void XdgPopup::sendPopupDone()
  * \since 5.14
  *
  * Dismiss the popup. According to the \c xdg-shell protocol this should make the
diff --git a/src/imports/compositor-extensions/qtshell/qwaylandqtshell.cpp b/src/imports/compositor-extensions/qtshell/qwaylandqtshell.cpp
index 7788e3ea8..d0715e8c2 100644
--- a/src/imports/compositor-extensions/qtshell/qwaylandqtshell.cpp
+++ b/src/imports/compositor-extensions/qtshell/qwaylandqtshell.cpp
@@ -157,7 +157,7 @@ QByteArray QWaylandQtShell::interfaceName()
 }
 
 /*!
- * \qmlsignal void QtWaylandCompositor::QtShell::qtShellSurfaceRequested(WaylandSurface surface, WaylandResource resource)
+ * \qmlsignal void QtShell::qtShellSurfaceRequested(WaylandSurface surface, WaylandResource resource)
  *
  * This signal is emitted when the client has requested a QtShellSurface to be associated
  * with \a surface. The handler for this signal is expected to create the QtShellSurface for
@@ -166,7 +166,7 @@ QByteArray QWaylandQtShell::interfaceName()
  */
 
 /*!
- * \qmlsignal void QtWaylandCompositor::QtShell::qtShellSurfaceCreated(QtShellSurface *qtShellSurface)
+ * \qmlsignal void QtShell::qtShellSurfaceCreated(QtShellSurface *qtShellSurface)
  *
  * This signal is emitted when an QtShellSurface has been created. The supplied \a qtShellSurface is
  * most commonly used to instantiate a ShellSurfaceItem.
@@ -221,7 +221,7 @@ QWaylandSurfaceRole QWaylandQtShellSurfacePrivate::s_role("qt_shell_surface");
  */
 
 /*!
-  \qmlsignal void QtWaylandCompositor::QtShellSurface::startMove()
+  \qmlsignal void QtShellSurface::startMove()
 
   The client has requested an interactive move operation in the compositor by calling
   \l{QWindow::startSystemMove()}.
@@ -230,7 +230,7 @@ QWaylandSurfaceRole QWaylandQtShellSurfacePrivate::s_role("qt_shell_surface");
 */
 
 /*!
-  \qmlsignal void QtWaylandCompositor::QtShellSurface::startResize(enum edges)
+  \qmlsignal void QtShellSurface::startResize(enum edges)
 
   The client has requested an interactive resize operation in the compositor by calling
   \l{QWindow::startSystemResize()}.
@@ -259,7 +259,7 @@ QWaylandQtShellSurface::QWaylandQtShellSurface(QWaylandQtShell *application, QWa
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::QtShellSurface::initialize(QtShell qtShell, WaylandSurface surface, WaylandResource resource)
+ * \qmlmethod void QtShellSurface::initialize(QtShell qtShell, WaylandSurface surface, WaylandResource resource)
  *
  * Initializes the QtShellSurface, associating it with the given \a qtShell, \a surface, and
  * \a resource.
@@ -282,7 +282,7 @@ void QWaylandQtShellSurface::initialize(QWaylandQtShell *qtShell, QWaylandSurfac
 }
 
 /*!
- * \qmlproperty WaylandSurface QtWaylandCompositor::QtShellSurface::surface
+ * \qmlproperty WaylandSurface QtShellSurface::surface
  *
  * This property holds the surface associated with this QtShellSurface.
  */
@@ -299,7 +299,7 @@ QWaylandQtShell *QWaylandQtShellSurface::shell() const
 }
 
 /*!
- * \qmlproperty point QtWaylandCompositor::QtShellSurface::windowPosition
+ * \qmlproperty point QtShellSurface::windowPosition
  *
  * This property holds the position of the shell surface relative to its output.
  */
@@ -324,7 +324,7 @@ void QWaylandQtShellSurface::setWindowPosition(const QPoint &position)
 }
 
 /*!
- * \qmlproperty rect QtWaylandCompositor::QtShellSurface::windowGeometry
+ * \qmlproperty rect QtShellSurface::windowGeometry
  *
  * This property holds the window geometry of the shell surface.
  */
@@ -335,7 +335,7 @@ QRect QWaylandQtShellSurface::windowGeometry() const
 }
 
 /*!
- * \qmlproperty size QtWaylandCompositor::QtShellSurface::minimumSize
+ * \qmlproperty size QtShellSurface::minimumSize
  *
  * The minimum size of the window if the client has specified one. Otherwise an invalid size.
  */
@@ -346,7 +346,7 @@ QSize QWaylandQtShellSurface::minimumSize() const
 }
 
 /*!
- * \qmlproperty size QtWaylandCompositor::QtShellSurface::maximumSize
+ * \qmlproperty size QtShellSurface::maximumSize
  *
  * The maximum size of the window if the client has specified one. Otherwise an invalid size.
  */
@@ -357,7 +357,7 @@ QSize QWaylandQtShellSurface::maximumSize() const
 }
 
 /*!
- *  \qmlmethod void QtWaylandCompositor::QtShellSurface::requestWindowGeometry(int windowState, rect windowGeometry)
+ *  \qmlmethod void QtShellSurface::requestWindowGeometry(int windowState, rect windowGeometry)
  *
  *  Requests a new \a windowState and \a windowGeometry for the QtShellSurface. The state and
  *  geometry is updated when the client has acknowledged the request (at which point it is safe to
@@ -402,7 +402,7 @@ void QWaylandQtShellSurface::setFrameMargins(const QMargins &margins)
 }
 
 /*!
- *  \qmlproperty int QtWaylandCompositor::QtShellSurface::frameMarginLeft
+ *  \qmlproperty int QtShellSurface::frameMarginLeft
  *
  *  This holds the window frame margin to the left of the surface.
  */
@@ -425,7 +425,7 @@ int QWaylandQtShellSurface::frameMarginLeft() const
 }
 
 /*!
- *  \qmlproperty int QtWaylandCompositor::QtShellSurface::frameMarginRight
+ *  \qmlproperty int QtShellSurface::frameMarginRight
  *
  *  This holds the window frame margin to the right of the surface.
  */
@@ -448,7 +448,7 @@ int QWaylandQtShellSurface::frameMarginRight() const
 }
 
 /*!
- *  \qmlproperty int QtWaylandCompositor::QtShellSurface::frameMarginTop
+ *  \qmlproperty int QtShellSurface::frameMarginTop
  *
  *  This holds the window frame margin above the surface.
  */
@@ -471,7 +471,7 @@ int QWaylandQtShellSurface::frameMarginTop() const
 }
 
 /*!
- *  \qmlproperty int QtWaylandCompositor::QtShellSurface::frameMarginBottom
+ *  \qmlproperty int QtShellSurface::frameMarginBottom
  *
  *  This holds the window frame margin below the surface.
  */
@@ -499,7 +499,7 @@ int QWaylandQtShellSurface::frameMarginBottom() const
 }
 
 /*!
- *  \qmlproperty int QtWaylandCompositor::QtShellSurface::windowFlags
+ *  \qmlproperty int QtShellSurface::windowFlags
  *
  *  This property holds the window flags of the QtShellSurface.
  */
@@ -510,7 +510,7 @@ uint QWaylandQtShellSurface::windowFlags() const
 }
 
 /*!
- *  \qmlmethod void QtWaylandCompositor::QtShellSurface::sendClose()
+ *  \qmlmethod void QtShellSurface::sendClose()
  *
  *  Requests that the client application closes itself.
  */
@@ -521,7 +521,7 @@ void QWaylandQtShellSurface::sendClose()
 }
 
 /*!
- *  \qmlproperty string QtWaylandCompositor::QtShellSurface::windowTitle
+ *  \qmlproperty string QtShellSurface::windowTitle
  *
  *  This property holds the window title of the QtShellSurface.
  */
@@ -532,7 +532,7 @@ QString QWaylandQtShellSurface::windowTitle() const
 }
 
 /*!
- *  \qmlproperty bool QtWaylandCompositor::QtShellSurface::active
+ *  \qmlproperty bool QtShellSurface::active
  *
  *  This property holds whether the surface is currently considered active.
  *
@@ -561,7 +561,7 @@ bool QWaylandQtShellSurface::active() const
 }
 
 /*!
- *  \qmlproperty enum QtWaylandCompositor::QtShellSurface::capabilities
+ *  \qmlproperty enum QtShellSurface::capabilities
  *
  * This property holds the capabilities of the compositor. By default, no special capabilities are
  * enabled.
@@ -594,7 +594,7 @@ QWaylandQtShellSurface::CapabilityFlags QWaylandQtShellSurface::capabilities() c
 }
 
 /*!
- *  \qmlproperty int QtWaylandCompositor::QtShellSurface::windowState
+ *  \qmlproperty int QtShellSurface::windowState
  *
  *  This property holds the window state of the QtShellSurface.
  *
diff --git a/src/imports/compositor-extensions/qtshell/qwaylandqtshellchrome.cpp b/src/imports/compositor-extensions/qtshell/qwaylandqtshellchrome.cpp
index 47fe586a6..ffccf5d21 100644
--- a/src/imports/compositor-extensions/qtshell/qwaylandqtshellchrome.cpp
+++ b/src/imports/compositor-extensions/qtshell/qwaylandqtshellchrome.cpp
@@ -171,7 +171,7 @@ void QWaylandQtShellChrome::init()
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::QtShellChrome::toggleFullScreen()
+ * \qmlmethod void QtShellChrome::toggleFullScreen()
  *
  * Toggles between fullscreen and normal window states. This method also clears the minimized
  * or maximized window states if either is set.
@@ -195,7 +195,7 @@ void QWaylandQtShellChrome::toggleFullScreen()
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::QtShellChrome::toggleMaximized()
+ * \qmlmethod void QtShellChrome::toggleMaximized()
  *
  * Toggles between maximized and normal states. This method also clears the minimized
  * window state if it is set.
@@ -219,7 +219,7 @@ void QWaylandQtShellChrome::toggleMaximized()
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::QtShellChrome::toggleMinimized()
+ * \qmlmethod void QtShellChrome::toggleMinimized()
  *
  * Toggles between minimized and normal states. This method also clears the maximized
  * window state if it is set.
@@ -243,7 +243,7 @@ void QWaylandQtShellChrome::toggleMinimized()
 }
 
 /*!
- * \qmlproperty ShellSurfaceItem QtWaylandCompositor::QtShellChrome::shellSurfaceItem
+ * \qmlproperty ShellSurfaceItem QtShellChrome::shellSurfaceItem
  *
  * This property holds the shell surface item associated with this QtShellChrome. It will
  * in turn manage the \c shellSurface of this item. The \c shellSurface of the item is expected to
@@ -402,7 +402,7 @@ void QWaylandQtShellChrome::titleBarMove()
 }
 
 /*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::titleBar
+ * \qmlproperty Item QtShellChrome::titleBar
  *
  * This property holds the default title bar item of the QtShellChrome. If set, a \l DragHandler
  * will be installed on the title bar which moves the window around on user interaction. In
@@ -475,7 +475,7 @@ void QWaylandQtShellChrome::setTitleBar(QQuickItem *item)
 }
 
 /*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::leftResizeHandle
+ * \qmlproperty Item QtShellChrome::leftResizeHandle
  *
  * This property holds the default left resize handle of the QtShellChrome. If set, a \l DragHandler
  * will be installed on the resize handle which resizes the window by moving its left edge.
@@ -539,7 +539,7 @@ void QWaylandQtShellChrome::setLeftResizeHandle(QQuickItem *item)
 }
 
 /*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::rightResizeHandle
+ * \qmlproperty Item QtShellChrome::rightResizeHandle
  *
  * This property holds the default right resize handle of the QtShellChrome. If set, a \l DragHandler
  * will be installed on the resize handle which resizes the window by moving its right edge.
@@ -603,7 +603,7 @@ void QWaylandQtShellChrome::setRightResizeHandle(QQuickItem *item)
 }
 
 /*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::topResizeHandle
+ * \qmlproperty Item QtShellChrome::topResizeHandle
  *
  * This property holds the default top resize handle of the QtShellChrome. If set, a \l DragHandler
  * will be installed on the resize handle which resizes the window by moving its top edge.
@@ -667,7 +667,7 @@ void QWaylandQtShellChrome::setTopResizeHandle(QQuickItem *item)
 }
 
 /*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::bottomResizeHandle
+ * \qmlproperty Item QtShellChrome::bottomResizeHandle
  *
  * This property holds the default bottom resize handle of the QtShellChrome. If set, a \l DragHandler
  * will be installed on the resize handle which resizes the window by moving its bottom edge.
@@ -732,7 +732,7 @@ void QWaylandQtShellChrome::setBottomResizeHandle(QQuickItem *item)
 }
 
 /*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::topLeftResizeHandle
+ * \qmlproperty Item QtShellChrome::topLeftResizeHandle
  *
  * This property holds the default top-left resize handle of the QtShellChrome. If set, a \l DragHandler
  * will be installed on the resize handle which resizes the window by moving its top and left edges
@@ -789,7 +789,7 @@ void QWaylandQtShellChrome::setTopLeftResizeHandle(QQuickItem *item)
 }
 
 /*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::bottomLeftResizeHandle
+ * \qmlproperty Item QtShellChrome::bottomLeftResizeHandle
  *
  * This property holds the default bottom-left resize handle of the QtShellChrome. If set, a \l DragHandler
  * will be installed on the resize handle which resizes the window by moving its bottom and left edges
@@ -846,7 +846,7 @@ void QWaylandQtShellChrome::setBottomLeftResizeHandle(QQuickItem *item)
 }
 
 /*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::topRightResizeHandle
+ * \qmlproperty Item QtShellChrome::topRightResizeHandle
  *
  * This property holds the default top-right resize handle of the QtShellChrome. If set, a \l DragHandler
  * will be installed on the resize handle which resizes the window by moving its top and right edges
@@ -903,7 +903,7 @@ void QWaylandQtShellChrome::setTopRightResizeHandle(QQuickItem *item)
 }
 
 /*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::bottomRightResizeHandle
+ * \qmlproperty Item QtShellChrome::bottomRightResizeHandle
  *
  * This property holds the default bottom-right resize handle of the QtShellChrome. If set, a \l DragHandler
  * will be installed on the resize handle which resizes the window by moving its bottom and right edges
@@ -960,7 +960,7 @@ void QWaylandQtShellChrome::setBottomRightResizeHandle(QQuickItem *item)
 }
 
 /*!
- * \qmlproperty rect QtWaylandCompositor::QtShellChrome::maximizedRect
+ * \qmlproperty rect QtShellChrome::maximizedRect
  *
  * This property holds the are of the WaylandOutput which is available to be filled by the
  * window when it is in maximized state. By default, the window will fill the entire geometry
@@ -1161,7 +1161,7 @@ void QWaylandQtShellChrome::updateWindowFlags()
 }
 
 /*!
- * \qmlproperty int QtWaylandCompositor::QtShellChrome::windowFlags
+ * \qmlproperty int QtShellChrome::windowFlags
  *
  * This property holds the window flags of the QtShellChrome. They will match the \c windowFlags
  * property of the associated QtShellSurface, except when this is equal to Qt.Window. In this case,
@@ -1175,7 +1175,7 @@ uint QWaylandQtShellChrome::currentWindowFlags() const
 }
 
 /*!
- * \qmlproperty int QtWaylandCompositor::QtShellChrome::windowState
+ * \qmlproperty int QtShellChrome::windowState
  *
  * This property holds the window state of the shell surface. It will be updated immediately when
  * the window state is requested on the compositor-side, before this has been acknowledged by the
@@ -1200,7 +1200,7 @@ bool QWaylandQtShellChrome::hasTitleBar() const
 }
 
 /*!
- * \qmlproperty bool QtWaylandCompositor::QtShellChrome::hasDecorations
+ * \qmlproperty bool QtShellChrome::hasDecorations
  *
  * This property is true if the QtShellChrome's decorations should be visible, based on its window
  * state and window flags.
@@ -1290,7 +1290,7 @@ void QWaylandQtShellChrome::updateAutomaticPosition()
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::QtShellChrome::deactivate()
+ * \qmlmethod void QtShellChrome::deactivate()
  *
  * Manually deactivates this window. If the window was active, this will activate the next window in
  * the stack instead.
@@ -1319,7 +1319,7 @@ void QWaylandQtShellChrome::activateOnGrab(QPointingDevice::GrabTransition trans
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::QtShellChrome::activate()
+ * \qmlmethod void QtShellChrome::activate()
  *
  * Manually activate this window. This will also raise the window.
  *
@@ -1334,7 +1334,7 @@ void QWaylandQtShellChrome::activate()
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::QtShellChrome::raise()
+ * \qmlmethod void QtShellChrome::raise()
  *
  * Raise this window, so that it stacks on top of other windows (except if the other window's
  * flags prohibit this.)
@@ -1347,7 +1347,7 @@ void QWaylandQtShellChrome::raise()
 }
 
 /*!
- * \qmlmethod void QtWaylandCompositor::QtShellChrome::lower()
+ * \qmlmethod void QtShellChrome::lower()
  *
  * Lower this window, so that it stacks underneath other windows (except if the other window's
  * window flags prohibit this.)
@@ -1374,7 +1374,7 @@ void QWaylandQtShellChrome::updateActiveState()
 }
 
 /*!
- * \qmlproperty int QtWaylandCompositor::QtShellChrome::frameMarginLeft
+ * \qmlproperty int QtShellChrome::frameMarginLeft
  *
  * Sets the size of the left margin of the QtShellChrome which is reserved for window decorations.
  * By default, this will equal the width of the \l leftResizeHandle if it is set. Otherwise it will
@@ -1405,7 +1405,7 @@ int QWaylandQtShellChrome::frameMarginLeft() const
 }
 
 /*!
- * \qmlproperty int QtWaylandCompositor::QtShellChrome::frameMarginRight
+ * \qmlproperty int QtShellChrome::frameMarginRight
  *
  * Sets the size of the right margin of the QtShellChrome which is reserved for window decorations.
  * By default, this will equal the width of the \l rightResizeHandle if it is set. Otherwise it will
@@ -1436,7 +1436,7 @@ int QWaylandQtShellChrome::frameMarginRight() const
 }
 
 /*!
- * \qmlproperty int QtWaylandCompositor::QtShellChrome::frameMarginTop
+ * \qmlproperty int QtShellChrome::frameMarginTop
  *
  * Sets the size of the top margin of the QtShellChrome which is reserved for window decorations.
  * By default, this will equal the sum of the \l leftResizeHandle and the \l{titleBar}'s heights,
@@ -1466,7 +1466,7 @@ int QWaylandQtShellChrome::frameMarginTop() const
 }
 
 /*!
- * \qmlproperty int QtWaylandCompositor::QtShellChrome::frameMarginBottom
+ * \qmlproperty int QtShellChrome::frameMarginBottom
  *
  * Sets the size of the bottom margin of the QtShellChrome which is reserved for window decorations.
  * By default, this will equal the height of the \l bottomResizeHandle if it is set. Otherwise it will