Remove import versions from QML examples

We no longer have to specify the version for QML imports, as it
will just default to most recently available. The examples should
follow best practices, so this cleans up all the QML in the
examples.

Note: Due to QTBUG-85443, we have to leave the QtQuick.Controls
imports versioned for now.

Change-Id: I237da0bd406fe1e06123bb47e29a7d921c64b5b5
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

24 files changed, 71 insertions, 75 deletions

diff --git a/examples/wayland/custom-extension/compositor/qml/Screen.qml b/examples/wayland/custom-extension/compositor/qml/Screen.qml
index 9c46a2035..3d3deca58 100644
--- a/examples/wayland/custom-extension/compositor/qml/Screen.qml
+++ b/examples/wayland/custom-extension/compositor/qml/Screen.qml
@@ -48,9 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Window 2.2
-import QtWayland.Compositor 1.0
+import QtQuick
+import QtQuick.Window
+import QtWayland.Compositor
 
 WaylandOutput {
     id: output
diff --git a/examples/wayland/custom-extension/compositor/qml/main.qml b/examples/wayland/custom-extension/compositor/qml/main.qml
index a7d762276..ce9d764f7 100644
--- a/examples/wayland/custom-extension/compositor/qml/main.qml
+++ b/examples/wayland/custom-extension/compositor/qml/main.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtWayland.Compositor 1.0
+import QtQuick
+import QtWayland.Compositor
 
 import com.theqtcompany.customextension 1.0
 
diff --git a/examples/wayland/custom-extension/qml-client/main.qml b/examples/wayland/custom-extension/qml-client/main.qml
index 11dc49c54..dd9212ef2 100644
--- a/examples/wayland/custom-extension/qml-client/main.qml
+++ b/examples/wayland/custom-extension/qml-client/main.qml
@@ -48,9 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Window 2.0
-import com.theqtcompany.customextension 1.0
+import QtQuick
+import QtQuick.Window
+import com.theqtcompany.customextension
 
 Window {
     id: topLevelWindow
diff --git a/examples/wayland/hwlayer-compositor/main.qml b/examples/wayland/hwlayer-compositor/main.qml
index ae4720f39..734782346 100644
--- a/examples/wayland/hwlayer-compositor/main.qml
+++ b/examples/wayland/hwlayer-compositor/main.qml
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Window 2.2
+import QtQuick
+import QtQuick.Window
 import QtQuick.Controls 2.2
-import QtWayland.Compositor 1.3
+import QtWayland.Compositor
 
 WaylandCompositor {
     WaylandOutput {
diff --git a/examples/wayland/ivi-compositor/main.qml b/examples/wayland/ivi-compositor/main.qml
index 1ea965e15..49a05a595 100644
--- a/examples/wayland/ivi-compositor/main.qml
+++ b/examples/wayland/ivi-compositor/main.qml
@@ -48,9 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtWayland.Compositor 1.0
-import QtQuick.Window 2.2
+import QtQuick
+import QtWayland.Compositor
+import QtQuick.Window
 
 WaylandCompositor {
     WaylandOutput {
diff --git a/examples/wayland/minimal-qml/main.qml b/examples/wayland/minimal-qml/main.qml
index 55ec9c038..f44d6b49b 100644
--- a/examples/wayland/minimal-qml/main.qml
+++ b/examples/wayland/minimal-qml/main.qml
@@ -48,9 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Window 2.2
-import QtWayland.Compositor 1.3
+import QtQuick
+import QtQuick.Window
+import QtWayland.Compositor
 
 WaylandCompositor {
     // The output defines the screen.
diff --git a/examples/wayland/multi-output/qml/GridScreen.qml b/examples/wayland/multi-output/qml/GridScreen.qml
index 252d66b12..1f690b7c1 100644
--- a/examples/wayland/multi-output/qml/GridScreen.qml
+++ b/examples/wayland/multi-output/qml/GridScreen.qml
@@ -48,9 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Window 2.2
-import QtWayland.Compositor 1.14
+import QtQuick
+import QtQuick.Window
+import QtWayland.Compositor
 
 WaylandOutput {
     id: output
diff --git a/examples/wayland/multi-output/qml/ShellChrome.qml b/examples/wayland/multi-output/qml/ShellChrome.qml
index e28addaaf..cccfb9113 100644
--- a/examples/wayland/multi-output/qml/ShellChrome.qml
+++ b/examples/wayland/multi-output/qml/ShellChrome.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtWayland.Compositor 1.0
+import QtQuick
+import QtWayland.Compositor
 
 ShellSurfaceItem {
     id: rootChrome
diff --git a/examples/wayland/multi-output/qml/ShellScreen.qml b/examples/wayland/multi-output/qml/ShellScreen.qml
index 20a0e80ac..4b3684fde 100644
--- a/examples/wayland/multi-output/qml/ShellScreen.qml
+++ b/examples/wayland/multi-output/qml/ShellScreen.qml
@@ -48,9 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Window 2.2
-import QtWayland.Compositor 1.14
+import QtQuick
+import QtQuick.Window
+import QtWayland.Compositor
 
 WaylandOutput {
     id: output
diff --git a/examples/wayland/multi-output/qml/main.qml b/examples/wayland/multi-output/qml/main.qml
index 45f91fd66..efced875d 100644
--- a/examples/wayland/multi-output/qml/main.qml
+++ b/examples/wayland/multi-output/qml/main.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtWayland.Compositor 1.14
+import QtQuick
+import QtWayland.Compositor
 
 WaylandCompositor {
     id: comp
diff --git a/examples/wayland/multi-screen/qml/Chrome.qml b/examples/wayland/multi-screen/qml/Chrome.qml
index 99141ad25..6c36102b8 100644
--- a/examples/wayland/multi-screen/qml/Chrome.qml
+++ b/examples/wayland/multi-screen/qml/Chrome.qml
@@ -49,8 +49,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtWayland.Compositor 1.0
+import QtQuick
+import QtWayland.Compositor
 
 Item {
     id: chrome
diff --git a/examples/wayland/multi-screen/qml/Screen.qml b/examples/wayland/multi-screen/qml/Screen.qml
index edf842c0c..9e4d5b681 100644
--- a/examples/wayland/multi-screen/qml/Screen.qml
+++ b/examples/wayland/multi-screen/qml/Screen.qml
@@ -48,9 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtWayland.Compositor 1.0
-import QtQuick.Window 2.3
+import QtQuick
+import QtWayland.Compositor
+import QtQuick.Window
 
 WaylandOutput {
     id: screen
diff --git a/examples/wayland/multi-screen/qml/main.qml b/examples/wayland/multi-screen/qml/main.qml
index 2925d7e08..0ef75fbce 100644
--- a/examples/wayland/multi-screen/qml/main.qml
+++ b/examples/wayland/multi-screen/qml/main.qml
@@ -49,11 +49,11 @@
 **
 ****************************************************************************/
 
-import QtQml 2.2
-import QtQuick 2.0
-import QtQuick.Window 2.3 as Window
-import QtWayland.Compositor 1.3
-import QtQml.Models 2.1
+import QtQml
+import QtQuick
+import QtQuick.Window as Window
+import QtWayland.Compositor
+import QtQml.Models
 
 WaylandCompositor {
     id: comp
diff --git a/examples/wayland/overview-compositor/main.qml b/examples/wayland/overview-compositor/main.qml
index 3785a7ed0..b5f671f61 100644
--- a/examples/wayland/overview-compositor/main.qml
+++ b/examples/wayland/overview-compositor/main.qml
@@ -48,9 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtWayland.Compositor 1.3
-import QtQuick.Window 2.3
+import QtQuick
+import QtWayland.Compositor
+import QtQuick.Window
 import QtQuick.Controls 2.0
 
 WaylandCompositor {
diff --git a/examples/wayland/pure-qml/qml/Chrome.qml b/examples/wayland/pure-qml/qml/Chrome.qml
index 6e3270961..10710e71d 100644
--- a/examples/wayland/pure-qml/qml/Chrome.qml
+++ b/examples/wayland/pure-qml/qml/Chrome.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtWayland.Compositor 1.0
+import QtQuick
+import QtWayland.Compositor
 
 ShellSurfaceItem {
     id: chrome
diff --git a/examples/wayland/pure-qml/qml/CompositorScreen.qml b/examples/wayland/pure-qml/qml/CompositorScreen.qml
index b156cb434..79dee6a2f 100644
--- a/examples/wayland/pure-qml/qml/CompositorScreen.qml
+++ b/examples/wayland/pure-qml/qml/CompositorScreen.qml
@@ -48,9 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.5
-import QtQuick.Window 2.2
-import QtWayland.Compositor 1.0
+import QtQuick
+import QtQuick.Window
+import QtWayland.Compositor
 
 WaylandOutput {
     id: output
diff --git a/examples/wayland/pure-qml/qml/Keyboard.qml b/examples/wayland/pure-qml/qml/Keyboard.qml
index b2586ffd4..9f336e942 100644
--- a/examples/wayland/pure-qml/qml/Keyboard.qml
+++ b/examples/wayland/pure-qml/qml/Keyboard.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.5
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick
+import QtQuick.VirtualKeyboard
 
 InputPanel {
     visible: active
diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml
index 83d7b2a18..097ee9b13 100644
--- a/examples/wayland/pure-qml/qml/main.qml
+++ b/examples/wayland/pure-qml/qml/main.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtWayland.Compositor 1.3
+import QtQuick
+import QtWayland.Compositor
 
 WaylandCompositor {
     id: waylandCompositor
diff --git a/examples/wayland/server-buffer/compositor/qml/main.qml b/examples/wayland/server-buffer/compositor/qml/main.qml
index 7df8ab7bb..907c20892 100644
--- a/examples/wayland/server-buffer/compositor/qml/main.qml
+++ b/examples/wayland/server-buffer/compositor/qml/main.qml
@@ -48,15 +48,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtWayland.Compositor 1.0
-import QtQuick.Window 2.2
+import QtQuick
+import QtWayland.Compositor
+import QtQuick.Window
 
-import com.theqtcompany.sharebufferextension 1.0
-
-import QtQuick 2.6
-import QtQuick.Window 2.2
-import QtWayland.Compositor 1.0
+import com.theqtcompany.sharebufferextension
 
 WaylandCompositor {
     WaylandOutput {
diff --git a/examples/wayland/server-side-decoration/main.qml b/examples/wayland/server-side-decoration/main.qml
index 4639ddcfd..d93d7689c 100644
--- a/examples/wayland/server-side-decoration/main.qml
+++ b/examples/wayland/server-side-decoration/main.qml
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Window 2.2
-import QtQuick.Layouts 1.3
-import QtWayland.Compositor 1.3
+import QtQuick
+import QtQuick.Window
+import QtQuick.Layouts
+import QtWayland.Compositor
 
 WaylandCompositor {
     // The output defines the screen.
diff --git a/examples/wayland/spanning-screens/main.qml b/examples/wayland/spanning-screens/main.qml
index a5abc9b01..b3788dbc0 100644
--- a/examples/wayland/spanning-screens/main.qml
+++ b/examples/wayland/spanning-screens/main.qml
@@ -48,9 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Window 2.3
-import QtWayland.Compositor 1.3
+import QtQuick
+import QtQuick.Window
+import QtWayland.Compositor
 
 WaylandCompositor {
     WaylandOutput {
diff --git a/examples/wayland/texture-sharing/custom-compositor/qml/main.qml b/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
index fc6befd93..6e1348140 100644
--- a/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
+++ b/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
@@ -48,11 +48,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Window 2.2
-import QtWayland.Compositor 1.3
+import QtQuick
+import QtQuick.Window
+import QtWayland.Compositor
 
-import com.theqtcompany.customsharingextension 1.0
+import com.theqtcompany.customsharingextension
 
 WaylandCompositor {
     WaylandOutput {
diff --git a/examples/wayland/texture-sharing/minimal-compositor.qml b/examples/wayland/texture-sharing/minimal-compositor.qml
index 847560479..ba89afd62 100644
--- a/examples/wayland/texture-sharing/minimal-compositor.qml
+++ b/examples/wayland/texture-sharing/minimal-compositor.qml
@@ -48,12 +48,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Window 2.2
-import QtWayland.Compositor 1.3
+import QtQuick
+import QtQuick.Window
+import QtWayland.Compositor
 
 // importing the texture sharing extension:
-import QtWayland.Compositor.TextureSharingExtension 1.0
+import QtWayland.Compositor.TextureSharingExtension
 
 WaylandCompositor {
     WaylandOutput {
diff --git a/examples/wayland/texture-sharing/qml-client/main.qml b/examples/wayland/texture-sharing/qml-client/main.qml
index 371a97594..2c2584043 100644
--- a/examples/wayland/texture-sharing/qml-client/main.qml
+++ b/examples/wayland/texture-sharing/qml-client/main.qml
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Window 2.2
+import QtQuick
+import QtQuick.Window
 
-import QtWayland.Client.TextureSharing 1.0
+import QtWayland.Client.TextureSharing
 
 Window {
     width: 800