diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-07-06 09:08:04 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-07-09 13:00:02 +0200 |
| commit | 5948edb37237c11804bf6a7a1226134167ac47af (patch) | |
| tree | 76f9f14c34df26bf2b14def3bc15f9cf864e5807 /examples/wayland/pure-qml/qml | |
| parent | e88cb48b8d0db81cc29ebe47968860b86f65b455 (diff) | |
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>
Diffstat (limited to 'examples/wayland/pure-qml/qml')
| -rw-r--r-- | examples/wayland/pure-qml/qml/Chrome.qml | 4 | ||||
| -rw-r--r-- | examples/wayland/pure-qml/qml/CompositorScreen.qml | 6 | ||||
| -rw-r--r-- | examples/wayland/pure-qml/qml/Keyboard.qml | 4 | ||||
| -rw-r--r-- | examples/wayland/pure-qml/qml/main.qml | 4 |
4 files changed, 9 insertions, 9 deletions
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 |