Doc: Remove version numbers for import statement

-recommend using the import statement without versions for Qt 6.0
-update use of \qml snippet without \QtMinorVersion

Task-number: QTBUG-87155
Change-Id: Ibbde1698e04368a30eb4013940bbd8d9070625b3
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit e6130db467f1365c38e14aba6675683ed8724cd7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

8 files changed, 13 insertions, 13 deletions

diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
index 49f0860e..bd2b60b5 100644
--- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
@@ -82,8 +82,8 @@ QWaylandQuickCompositor::QWaylandQuickCompositor(QObject *parent)
  * For instance, the following code would allow the clients to request \c wl_shell
  * surfaces in the compositor using the \c wl_shell interface.
  *
- * \qml \QtMinorVersion
- * import QtWayland.Compositor 1.\1
+ * \qml
+ * import QtWayland.Compositor
  *
  * WaylandCompositor {
  *     WlShell {
diff --git a/src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc b/src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc
index a2099dd1..d150afe0 100644
--- a/src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc
+++ b/src/compositor/doc/src/qtwaylandcompositor-qmltypes.qdoc
@@ -37,8 +37,8 @@
   The QML types can be imported into your application using the following
   import statement:
 
-  \qml \QtMinorVersion
-  import QtWayland.Compositor 1.\1
+  \qml
+  import QtWayland.Compositor
   \endqml
 
   To link against the module, add this line to your \l qmake \c .pro file:
diff --git a/src/compositor/extensions/qwaylandidleinhibitv1.cpp b/src/compositor/extensions/qwaylandidleinhibitv1.cpp
index 3d7e4d13..d4937c6c 100644
--- a/src/compositor/extensions/qwaylandidleinhibitv1.cpp
+++ b/src/compositor/extensions/qwaylandidleinhibitv1.cpp
@@ -64,8 +64,8 @@ QT_BEGIN_NAMESPACE
     To provide the functionality of the extension in a compositor, create an instance of the
     IdleInhibitManagerV1 component and add it to the list of extensions supported by the compositor:
 
-    \qml \QtMinorVersion
-    import QtWayland.Compositor 1.\1
+    \qml
+    import QtWayland.Compositor
 
     WaylandCompositor {
         IdleInhibitManagerV1 {
diff --git a/src/compositor/extensions/qwaylandiviapplication.cpp b/src/compositor/extensions/qwaylandiviapplication.cpp
index 3dd35f1c..d0eb4d0b 100644
--- a/src/compositor/extensions/qwaylandiviapplication.cpp
+++ b/src/compositor/extensions/qwaylandiviapplication.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
  * an instance of the IviApplication component and add it to the list of extensions
  * supported by the compositor:
  *
- * \qml \QtMinorVersion
+ * \qml
  * import QtWayland.Compositor.IviApplication
  *
  * WaylandCompositor {
diff --git a/src/compositor/extensions/qwaylandwlshell.cpp b/src/compositor/extensions/qwaylandwlshell.cpp
index c708ca04..7b3c7628 100644
--- a/src/compositor/extensions/qwaylandwlshell.cpp
+++ b/src/compositor/extensions/qwaylandwlshell.cpp
@@ -258,7 +258,7 @@ void QWaylandWlShellSurfacePrivate::shell_surface_set_class(Resource *resource,
  * an instance of the WlShell component and add it to the list of extensions
  * supported by the compositor:
  *
- * \qml \QtMinorVersion
+ * \qml
  * import QtWayland.Compositor.WlShell
  *
  * WaylandCompositor {
diff --git a/src/compositor/extensions/qwaylandxdgdecorationv1.cpp b/src/compositor/extensions/qwaylandxdgdecorationv1.cpp
index 7b80cf01..12cecccf 100644
--- a/src/compositor/extensions/qwaylandxdgdecorationv1.cpp
+++ b/src/compositor/extensions/qwaylandxdgdecorationv1.cpp
@@ -52,8 +52,8 @@ QT_BEGIN_NAMESPACE
     To provide the functionality of the extension in a compositor, create an instance of the
     XdgDecorationManagerV1 component and add it to the list of extensions supported by the compositor:
 
-    \qml \QtMinorVersion
-    import QtWayland.Compositor 1.\1
+    \qml
+    import QtWayland.Compositor
 
     WaylandCompositor {
         // Xdg decoration manager assumes xdg-shell is being used
diff --git a/src/compositor/extensions/qwaylandxdgoutputv1.cpp b/src/compositor/extensions/qwaylandxdgoutputv1.cpp
index e9949947..ead14ae7 100644
--- a/src/compositor/extensions/qwaylandxdgoutputv1.cpp
+++ b/src/compositor/extensions/qwaylandxdgoutputv1.cpp
@@ -56,8 +56,8 @@ QT_BEGIN_NAMESPACE
  * XdgOutputManagerV1 component and add it to the list of extensions supported by the compositor,
  * and associated each XdgOutputV1 with its WaylandOutput:
  *
- * \qml \QtMinorVersion
- * import QtWayland.Compositor 1.\1
+ * \qml
+ * import QtWayland.Compositor
  *
  * WaylandCompositor {
  *     XdgOutputManagerV1 {
diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp
index 3d2b9e3c..8483f0a6 100644
--- a/src/compositor/extensions/qwaylandxdgshell.cpp
+++ b/src/compositor/extensions/qwaylandxdgshell.cpp
@@ -148,7 +148,7 @@ void QWaylandXdgShellPrivate::xdg_wm_base_pong(Resource *resource, uint32_t seri
  * an instance of the XdgShell component and add it to the list of extensions
  * supported by the compositor:
  *
- * \qml \QtMinorVersion
+ * \qml
  * import QtWayland.Compositor.XdgShell
  *
  * WaylandCompositor {