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/multi-screen/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/multi-screen/qml')
| -rw-r--r-- | examples/wayland/multi-screen/qml/Chrome.qml | 4 | ||||
| -rw-r--r-- | examples/wayland/multi-screen/qml/Screen.qml | 6 | ||||
| -rw-r--r-- | examples/wayland/multi-screen/qml/main.qml | 10 |
3 files changed, 10 insertions, 10 deletions
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 |