diff options
author | Robert Griebl <robert.griebl@qt.io> | 2023-06-16 02:11:48 +0200 |
---|---|---|
committer | Robert Griebl <robert.griebl@qt.io> | 2023-06-17 11:13:23 +0200 |
commit | e9a48f7377e23b4c0070d5a149c0c385cf4daa47 (patch) | |
tree | 1562c50c0967bb971602fbdf9bc0645a148c46d5 | |
parent | 4b4db525338e4448a364cec923965bede36e1575 (diff) |
Make all example and doc QML imports versionless
Pick-to: 6.6
Change-Id: Ie3292ac14ce07c5eda08fc7869c21a788eddd1c8
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
49 files changed, 123 insertions, 123 deletions
diff --git a/examples/applicationmanager/animated-windows/apps/animated-windows.fish/fish.qml b/examples/applicationmanager/animated-windows/apps/animated-windows.fish/fish.qml index 6b948e83..80f8aaf7 100644 --- a/examples/applicationmanager/animated-windows/apps/animated-windows.fish/fish.qml +++ b/examples/applicationmanager/animated-windows/apps/animated-windows.fish/fish.qml @@ -3,8 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application ApplicationManagerWindow { id: root diff --git a/examples/applicationmanager/animated-windows/apps/animated-windows.rabbit/rabbit.qml b/examples/applicationmanager/animated-windows/apps/animated-windows.rabbit/rabbit.qml index 215fc218..5788a1be 100644 --- a/examples/applicationmanager/animated-windows/apps/animated-windows.rabbit/rabbit.qml +++ b/examples/applicationmanager/animated-windows/apps/animated-windows.rabbit/rabbit.qml @@ -3,8 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application ApplicationManagerWindow { id: root diff --git a/examples/applicationmanager/animated-windows/system-ui/main.qml b/examples/applicationmanager/animated-windows/system-ui/main.qml index 806c582d..00fc4b32 100644 --- a/examples/applicationmanager/animated-windows/system-ui/main.qml +++ b/examples/applicationmanager/animated-windows/system-ui/main.qml @@ -5,9 +5,9 @@ pragma ComponentBehavior: Bound -import QtQuick 2.4 -import QtQuick.Layouts 1.11 -import QtApplicationManager.SystemUI 2.0 +import QtQuick +import QtQuick.Layouts +import QtApplicationManager.SystemUI Rectangle { width: 1024 diff --git a/examples/applicationmanager/application-features/apps/compositor/compositor.qml b/examples/applicationmanager/application-features/apps/compositor/compositor.qml index d97d50bf..26df5f92 100644 --- a/examples/applicationmanager/application-features/apps/compositor/compositor.qml +++ b/examples/applicationmanager/application-features/apps/compositor/compositor.qml @@ -4,9 +4,9 @@ pragma ComponentBehavior: Bound -import QtQuick 2.11 -import QtApplicationManager.Application 2.0 -import QtWayland.Compositor 1.3 +import QtQuick +import QtApplicationManager.Application +import QtWayland.Compositor import QtWayland.Compositor.XdgShell import QtWayland.Compositor.WlShell diff --git a/examples/applicationmanager/application-features/apps/crash/crashapp.qml b/examples/applicationmanager/application-features/apps/crash/crashapp.qml index 4b90735b..fbc42656 100644 --- a/examples/applicationmanager/application-features/apps/crash/crashapp.qml +++ b/examples/applicationmanager/application-features/apps/crash/crashapp.qml @@ -6,7 +6,7 @@ pragma ComponentBehavior: Bound import QtQuick import QtApplicationManager.Application -import Terminator 2.0 +import Terminator ApplicationManagerWindow { id: root diff --git a/examples/applicationmanager/application-features/apps/twins/twins.qml b/examples/applicationmanager/application-features/apps/twins/twins.qml index 6afaa078..880ab350 100644 --- a/examples/applicationmanager/application-features/apps/twins/twins.qml +++ b/examples/applicationmanager/application-features/apps/twins/twins.qml @@ -2,8 +2,8 @@ // Copyright (C) 2019 Luxoft Sweden AB // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.11 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application QtObject { property var win1: ApplicationManagerWindow { diff --git a/examples/applicationmanager/application-features/client.qml b/examples/applicationmanager/application-features/client.qml index a10dbae6..3e89118c 100644 --- a/examples/applicationmanager/application-features/client.qml +++ b/examples/applicationmanager/application-features/client.qml @@ -2,7 +2,7 @@ // Copyright (C) 2019 Luxoft Sweden AB // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.11 +import QtQuick Rectangle { id: root diff --git a/examples/applicationmanager/application-features/doc/src/application-features.qdoc b/examples/applicationmanager/application-features/doc/src/application-features.qdoc index 5d5e1e20..20ae20f4 100644 --- a/examples/applicationmanager/application-features/doc/src/application-features.qdoc +++ b/examples/applicationmanager/application-features/doc/src/application-features.qdoc @@ -49,7 +49,7 @@ its root element. The QML code for the nested compositor application is as follows: \quotefromfile applicationmanager/application-features/apps/compositor/compositor.qml -\skipto import QtQuick 2.11 +\skipto import QtQuick \printuntil /^\}/ \section2 Crash Simulation and Recovery @@ -78,7 +78,7 @@ as the application's root element. The QML code for the two top-level windows application is as follows: \quotefromfile applicationmanager/application-features/apps/twins/twins.qml -\skipto import QtQuick 2.11 +\skipto import QtQuick \printuntil Component.onCompleted: setWindowProperty("type", "pop-up"); \printuntil /^\}/ diff --git a/examples/applicationmanager/application-features/system-ui/main.qml b/examples/applicationmanager/application-features/system-ui/main.qml index 0ed06c1d..4029248c 100644 --- a/examples/applicationmanager/application-features/system-ui/main.qml +++ b/examples/applicationmanager/application-features/system-ui/main.qml @@ -4,9 +4,9 @@ pragma ComponentBehavior: Bound -import QtQuick 2.11 -import QtQuick.Window 2.11 -import QtApplicationManager.SystemUI 2.0 +import QtQuick +import QtQuick.Window +import QtApplicationManager.SystemUI Window { title: "Application Features - QtApplicationManager Example" diff --git a/examples/applicationmanager/frame-timer/apps/frame-timer.fish/fish.qml b/examples/applicationmanager/frame-timer/apps/frame-timer.fish/fish.qml index a18104e4..8aa4d6e2 100644 --- a/examples/applicationmanager/frame-timer/apps/frame-timer.fish/fish.qml +++ b/examples/applicationmanager/frame-timer/apps/frame-timer.fish/fish.qml @@ -3,8 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application ApplicationManagerWindow { id: root diff --git a/examples/applicationmanager/frame-timer/apps/frame-timer.rabbit/rabbit.qml b/examples/applicationmanager/frame-timer/apps/frame-timer.rabbit/rabbit.qml index 215fc218..5788a1be 100644 --- a/examples/applicationmanager/frame-timer/apps/frame-timer.rabbit/rabbit.qml +++ b/examples/applicationmanager/frame-timer/apps/frame-timer.rabbit/rabbit.qml @@ -3,8 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application ApplicationManagerWindow { id: root diff --git a/examples/applicationmanager/frame-timer/system-ui/main.qml b/examples/applicationmanager/frame-timer/system-ui/main.qml index 42dcfd3d..c724a861 100644 --- a/examples/applicationmanager/frame-timer/system-ui/main.qml +++ b/examples/applicationmanager/frame-timer/system-ui/main.qml @@ -5,11 +5,11 @@ pragma ComponentBehavior: Bound -import QtQuick 2.11 -import QtQuick.Layouts 1.11 -import QtQuick.Window 2.11 -import QtApplicationManager 2.0 -import QtApplicationManager.SystemUI 2.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtApplicationManager +import QtApplicationManager.SystemUI Window { id: sysuiWindow diff --git a/examples/applicationmanager/hello-world/apps/hello-world.blue/main.qml b/examples/applicationmanager/hello-world/apps/hello-world.blue/main.qml index ac533303..631e3129 100644 --- a/examples/applicationmanager/hello-world/apps/hello-world.blue/main.qml +++ b/examples/applicationmanager/hello-world/apps/hello-world.blue/main.qml @@ -3,8 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application ApplicationManagerWindow { color: "blue" diff --git a/examples/applicationmanager/hello-world/apps/hello-world.green/main.qml b/examples/applicationmanager/hello-world/apps/hello-world.green/main.qml index 9ce953de..52ac7fb5 100644 --- a/examples/applicationmanager/hello-world/apps/hello-world.green/main.qml +++ b/examples/applicationmanager/hello-world/apps/hello-world.green/main.qml @@ -3,8 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application ApplicationManagerWindow { color: "Green" diff --git a/examples/applicationmanager/hello-world/apps/hello-world.red/main.qml b/examples/applicationmanager/hello-world/apps/hello-world.red/main.qml index 563971d8..be839761 100644 --- a/examples/applicationmanager/hello-world/apps/hello-world.red/main.qml +++ b/examples/applicationmanager/hello-world/apps/hello-world.red/main.qml @@ -3,8 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application ApplicationManagerWindow { color: "red" diff --git a/examples/applicationmanager/hello-world/system-ui.qml b/examples/applicationmanager/hello-world/system-ui.qml index f9037065..d8e87dc9 100644 --- a/examples/applicationmanager/hello-world/system-ui.qml +++ b/examples/applicationmanager/hello-world/system-ui.qml @@ -3,8 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 -import QtApplicationManager.SystemUI 2.0 +import QtQuick +import QtApplicationManager.SystemUI Item { width: 800 diff --git a/examples/applicationmanager/launch-intents/apps/launch-intents.blue/main.qml b/examples/applicationmanager/launch-intents/apps/launch-intents.blue/main.qml index 180843ec..b74dc6b3 100644 --- a/examples/applicationmanager/launch-intents/apps/launch-intents.blue/main.qml +++ b/examples/applicationmanager/launch-intents/apps/launch-intents.blue/main.qml @@ -1,8 +1,8 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.12 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application ApplicationManagerWindow { color: "blue" diff --git a/examples/applicationmanager/launch-intents/apps/launch-intents.green/main.qml b/examples/applicationmanager/launch-intents/apps/launch-intents.green/main.qml index e928eda3..70d38e68 100644 --- a/examples/applicationmanager/launch-intents/apps/launch-intents.green/main.qml +++ b/examples/applicationmanager/launch-intents/apps/launch-intents.green/main.qml @@ -1,8 +1,8 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.12 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application ApplicationManagerWindow { color: "green" diff --git a/examples/applicationmanager/launch-intents/apps/launch-intents.red/main.qml b/examples/applicationmanager/launch-intents/apps/launch-intents.red/main.qml index a5c2db96..cda7482d 100644 --- a/examples/applicationmanager/launch-intents/apps/launch-intents.red/main.qml +++ b/examples/applicationmanager/launch-intents/apps/launch-intents.red/main.qml @@ -1,8 +1,8 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.12 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application ApplicationManagerWindow { color: "red" diff --git a/examples/applicationmanager/launch-intents/system-ui.qml b/examples/applicationmanager/launch-intents/system-ui.qml index e3fc40d4..d0114bc7 100644 --- a/examples/applicationmanager/launch-intents/system-ui.qml +++ b/examples/applicationmanager/launch-intents/system-ui.qml @@ -1,9 +1,9 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.12 -import QtApplicationManager 2.0 -import QtApplicationManager.SystemUI 2.0 +import QtQuick +import QtApplicationManager +import QtApplicationManager.SystemUI Item { width: 800 diff --git a/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml index ec7cdf77..6c6e9975 100644 --- a/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml +++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml @@ -3,8 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application ApplicationManagerWindow { id: root diff --git a/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml index c076d3ea..df247737 100644 --- a/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml +++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml @@ -3,8 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application ApplicationManagerWindow { color: ApplicationInterface.systemProperties.light ? "#B0808080" : "black" diff --git a/examples/applicationmanager/minidesk/system-ui/Readme.qml b/examples/applicationmanager/minidesk/system-ui/Readme.qml index afbd3296..f1b6ab38 100644 --- a/examples/applicationmanager/minidesk/system-ui/Readme.qml +++ b/examples/applicationmanager/minidesk/system-ui/Readme.qml @@ -3,7 +3,7 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 +import QtQuick Item { anchors.fill: parent diff --git a/examples/applicationmanager/minidesk/system-ui/main.qml b/examples/applicationmanager/minidesk/system-ui/main.qml index f9279649..556952bf 100644 --- a/examples/applicationmanager/minidesk/system-ui/main.qml +++ b/examples/applicationmanager/minidesk/system-ui/main.qml @@ -5,9 +5,9 @@ pragma ComponentBehavior: Bound -import QtQuick 2.11 -import QtQuick.Window 2.11 -import QtApplicationManager.SystemUI 2.0 +import QtQuick +import QtQuick.Window +import QtApplicationManager.SystemUI Window { title: "Minidesk - QtApplicationManager Example" diff --git a/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml b/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml index 32990251..0913bf1a 100644 --- a/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml +++ b/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml @@ -3,8 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application ApplicationManagerWindow { id: root diff --git a/examples/applicationmanager/multi-views/system-ui/Readme.qml b/examples/applicationmanager/multi-views/system-ui/Readme.qml index 94ef9743..ff122536 100644 --- a/examples/applicationmanager/multi-views/system-ui/Readme.qml +++ b/examples/applicationmanager/multi-views/system-ui/Readme.qml @@ -3,7 +3,7 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 +import QtQuick Item { anchors.fill: parent diff --git a/examples/applicationmanager/multi-views/system-ui/main.qml b/examples/applicationmanager/multi-views/system-ui/main.qml index 506bd1d4..6765f92a 100644 --- a/examples/applicationmanager/multi-views/system-ui/main.qml +++ b/examples/applicationmanager/multi-views/system-ui/main.qml @@ -5,8 +5,8 @@ pragma ComponentBehavior: Bound -import QtQuick 2.4 -import QtApplicationManager.SystemUI 2.0 +import QtQuick +import QtApplicationManager.SystemUI Rectangle { width: 1024 diff --git a/examples/applicationmanager/process-status/apps/process-status.cpu-hog/main.qml b/examples/applicationmanager/process-status/apps/process-status.cpu-hog/main.qml index 18dfbef4..2e9cb03d 100644 --- a/examples/applicationmanager/process-status/apps/process-status.cpu-hog/main.qml +++ b/examples/applicationmanager/process-status/apps/process-status.cpu-hog/main.qml @@ -3,8 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application ApplicationManagerWindow { color: "red" diff --git a/examples/applicationmanager/process-status/apps/process-status.mem-hog/main.qml b/examples/applicationmanager/process-status/apps/process-status.mem-hog/main.qml index 84ec099d..8a495da3 100644 --- a/examples/applicationmanager/process-status/apps/process-status.mem-hog/main.qml +++ b/examples/applicationmanager/process-status/apps/process-status.mem-hog/main.qml @@ -3,8 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application ApplicationManagerWindow { id: root diff --git a/examples/applicationmanager/process-status/apps/process-status.slim/main.qml b/examples/applicationmanager/process-status/apps/process-status.slim/main.qml index 270b0cb4..86d79cf1 100644 --- a/examples/applicationmanager/process-status/apps/process-status.slim/main.qml +++ b/examples/applicationmanager/process-status/apps/process-status.slim/main.qml @@ -3,8 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.11 -import QtApplicationManager.Application 2.0 +import QtQuick +import QtApplicationManager.Application ApplicationManagerWindow { color: "blue" diff --git a/examples/applicationmanager/process-status/system-ui/ApplicationDisplay.qml b/examples/applicationmanager/process-status/system-ui/ApplicationDisplay.qml index 8c1b0b6b..3a8e73b2 100644 --- a/examples/applicationmanager/process-status/system-ui/ApplicationDisplay.qml +++ b/examples/applicationmanager/process-status/system-ui/ApplicationDisplay.qml @@ -3,10 +3,10 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 -import QtApplicationManager.SystemUI 2.0 -import QtQuick.Controls 2.4 -import QtQuick.Layouts 1.11 +import QtQuick +import QtApplicationManager.SystemUI +import QtQuick.Controls +import QtQuick.Layouts Frame { id: root diff --git a/examples/applicationmanager/process-status/system-ui/CpuGraph.qml b/examples/applicationmanager/process-status/system-ui/CpuGraph.qml index a137812f..ea4960c3 100644 --- a/examples/applicationmanager/process-status/system-ui/CpuGraph.qml +++ b/examples/applicationmanager/process-status/system-ui/CpuGraph.qml @@ -5,10 +5,10 @@ pragma ComponentBehavior: Bound -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtApplicationManager 2.0 -import QtApplicationManager.SystemUI 2.0 +import QtQuick +import QtQuick.Controls +import QtApplicationManager +import QtApplicationManager.SystemUI /* This file shows how to use ProcessStatus inside a MonitorModel to draw a graph diff --git a/examples/applicationmanager/process-status/system-ui/MemoryText.qml b/examples/applicationmanager/process-status/system-ui/MemoryText.qml index fd340669..952b7348 100644 --- a/examples/applicationmanager/process-status/system-ui/MemoryText.qml +++ b/examples/applicationmanager/process-status/system-ui/MemoryText.qml @@ -3,8 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 -import QtQuick.Controls 2.4 +import QtQuick +import QtQuick.Controls Label { property var value diff --git a/examples/applicationmanager/process-status/system-ui/Stats.qml b/examples/applicationmanager/process-status/system-ui/Stats.qml index 550d0585..8dc47c1e 100644 --- a/examples/applicationmanager/process-status/system-ui/Stats.qml +++ b/examples/applicationmanager/process-status/system-ui/Stats.qml @@ -3,9 +3,9 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.4 -import QtQuick.Controls 2.4 -import QtApplicationManager.SystemUI 2.0 +import QtQuick +import QtQuick.Controls +import QtApplicationManager.SystemUI /* This file shows how to use ProcessStatus alongside a Timer (instead of putting it inside a MonitorModel) diff --git a/examples/applicationmanager/process-status/system-ui/main.qml b/examples/applicationmanager/process-status/system-ui/main.qml index 9f839d02..4580f3e3 100644 --- a/examples/applicationmanager/process-status/system-ui/main.qml +++ b/examples/applicationmanager/process-status/system-ui/main.qml @@ -5,9 +5,9 @@ pragma ComponentBehavior: Bound -import QtQuick 2.4 -import QtQuick.Controls 2.4 -import QtApplicationManager.SystemUI 2.0 +import QtQuick +import QtQuick.Controls +import QtApplicationManager.SystemUI Pane { width: 900 diff --git a/src/intent-server-lib/intentmodel.cpp b/src/intent-server-lib/intentmodel.cpp index 3daefaa7..89341996 100644 --- a/src/intent-server-lib/intentmodel.cpp +++ b/src/intent-server-lib/intentmodel.cpp @@ -38,8 +38,8 @@ com.pelagicore.test package: \qml - import QtQuick 2.6 - import QtApplicationManager.SystemUI 2.0 + import QtQuick + import QtApplicationManager.SystemUI ListView { model: IntentModel { diff --git a/src/launcher-lib/applicationmanagerwindow.cpp b/src/launcher-lib/applicationmanagerwindow.cpp index 7e58bfa1..e10501b7 100644 --- a/src/launcher-lib/applicationmanagerwindow.cpp +++ b/src/launcher-lib/applicationmanagerwindow.cpp @@ -35,13 +35,13 @@ public: The QML import for this item is - \c{import QtApplicationManager.Application 2.0} + \c{import QtApplicationManager.Application} After importing, you can instantiate the QML item like so: \qml - import QtQuick 2.0 - import QtApplicationManager.Application 2.0 + import QtQuick + import QtApplicationManager.Application ApplicationManagerWindow { Text { @@ -60,7 +60,7 @@ public: \li Add a second file named \c ApplicationManagerWindow.qml, with the following content \qml - import QtQuick 2.0 + import QtQuick Item { width: 1280 // use your screen width here diff --git a/src/manager-lib/applicationmanager.cpp b/src/manager-lib/applicationmanager.cpp index c30d0a2e..8752d1ed 100644 --- a/src/manager-lib/applicationmanager.cpp +++ b/src/manager-lib/applicationmanager.cpp @@ -146,8 +146,8 @@ After importing, you can just use the ApplicationManager singleton as follows: \qml - import QtQuick 2.0 - import QtApplicationManager.SystemUI 2.0 + import QtQuick + import QtApplicationManager.SystemUI ListView { id: appList diff --git a/src/manager-lib/applicationmodel.cpp b/src/manager-lib/applicationmodel.cpp index b8060a1f..701801fc 100644 --- a/src/manager-lib/applicationmodel.cpp +++ b/src/manager-lib/applicationmodel.cpp @@ -38,8 +38,8 @@ The following code snippet displays all the icons of non-aliased applications in a list: \qml - import QtQuick 2.6 - import QtApplicationManager.SystemUI 2.0 + import QtQuick + import QtApplicationManager.SystemUI ListView { model: ApplicationModel { diff --git a/src/manager-lib/processstatus.cpp b/src/manager-lib/processstatus.cpp index bbba640e..2a1f971e 100644 --- a/src/manager-lib/processstatus.cpp +++ b/src/manager-lib/processstatus.cpp @@ -28,9 +28,9 @@ application process. \qml - import QtQuick 2.11 - import QtApplicationManager 2.0 - import QtApplicationManager.SystemUI 2.0 + import QtQuick + import QtApplicationManager + import QtApplicationManager.SystemUI Item { id: root @@ -56,9 +56,9 @@ values over time: \qml - import QtQuick 2.11 - import QtApplicationManager 2.0 - import QtApplicationManager.SystemUI 2.0 + import QtQuick + import QtApplicationManager + import QtApplicationManager.SystemUI ... MonitorModel { running: true diff --git a/src/shared-main-lib/cpustatus.cpp b/src/shared-main-lib/cpustatus.cpp index b38ccce2..273ea0b1 100644 --- a/src/shared-main-lib/cpustatus.cpp +++ b/src/shared-main-lib/cpustatus.cpp @@ -20,8 +20,8 @@ previous values over time. \qml - import QtQuick 2.11 - import QtApplicationManager 2.0 + import QtQuick + import QtApplicationManager ... MonitorModel { CpuStatus {} @@ -31,8 +31,8 @@ You can also use it alongside a Timer for instance, when you're only interested in its current value. \qml - import QtQuick 2.11 - import QtApplicationManager 2.0 + import QtQuick + import QtApplicationManager ... CpuStatus { id: cpuStatus } Timer { diff --git a/src/shared-main-lib/frametimer.cpp b/src/shared-main-lib/frametimer.cpp index af81d72f..30e0a4ee 100644 --- a/src/shared-main-lib/frametimer.cpp +++ b/src/shared-main-lib/frametimer.cpp @@ -21,8 +21,8 @@ The following snippet shows how to use FrameTimer to display the frame-rate of a Window: \qml - import QtQuick 2.11 - import QtApplicationManager 1.0 + import QtQuick + import QtApplicationManager Window { id: toplevelWindow @@ -42,8 +42,8 @@ previous values over time: \qml - import QtQuick 2.11 - import QtApplicationManager 1.0 + import QtQuick + import QtApplicationManager Window { id: toplevelWindow diff --git a/src/shared-main-lib/gpustatus.cpp b/src/shared-main-lib/gpustatus.cpp index 7c829894..2436064c 100644 --- a/src/shared-main-lib/gpustatus.cpp +++ b/src/shared-main-lib/gpustatus.cpp @@ -17,8 +17,8 @@ You can use it alongside a Timer for instance to periodically query the status of the GPU: \qml - import QtQuick 2.11 - import QtApplicationManager 2.0 + import QtQuick + import QtApplicationManager ... GpuStatus { id: gpuStatus } Timer { @@ -37,8 +37,8 @@ previous values over time: \qml - import QtQuick 2.11 - import QtApplicationManager 2.0 + import QtQuick + import QtApplicationManager ... MonitorModel { GpuStatus {} diff --git a/src/shared-main-lib/iostatus.cpp b/src/shared-main-lib/iostatus.cpp index e4d23245..a2b77a78 100644 --- a/src/shared-main-lib/iostatus.cpp +++ b/src/shared-main-lib/iostatus.cpp @@ -20,8 +20,8 @@ previous values over time. \qml - import QtQuick 2.11 - import QtApplicationManager 2.0 + import QtQuick + import QtApplicationManager ... MonitorModel { IoStatus { @@ -33,8 +33,8 @@ You can also use it alongside a Timer for instance, when you're only interested in its current value. \qml - import QtQuick 2.11 - import QtApplicationManager 2.0 + import QtQuick + import QtApplicationManager ... IoStatus { id: ioStatus diff --git a/src/shared-main-lib/memorystatus.cpp b/src/shared-main-lib/memorystatus.cpp index 2b630dc1..c1f6d794 100644 --- a/src/shared-main-lib/memorystatus.cpp +++ b/src/shared-main-lib/memorystatus.cpp @@ -18,8 +18,8 @@ previous values over time. \qml - import QtQuick 2.11 - import QtApplicationManager 2.0 + import QtQuick + import QtApplicationManager ... MonitorModel { MemoryStatus {} @@ -29,8 +29,8 @@ You can also use it alongside a Timer for instance, when you're only interested in its current value. \qml - import QtQuick 2.11 - import QtApplicationManager 2.0 + import QtQuick + import QtApplicationManager ... MemoryStatus { id: memoryStatus } Timer { diff --git a/src/shared-main-lib/monitormodel.cpp b/src/shared-main-lib/monitormodel.cpp index 3986c8bd..bcf19f8c 100644 --- a/src/shared-main-lib/monitormodel.cpp +++ b/src/shared-main-lib/monitormodel.cpp @@ -27,8 +27,8 @@ The snippet below shows how to use it for plotting a system's CPU load in a simple bar graph: \qml - import QtQuick 2.11 - import QtApplicationManager 2.0 + import QtQuick + import QtApplicationManager ListView { id: listView diff --git a/src/tools/launcher-qml/launcher-qml.cpp b/src/tools/launcher-qml/launcher-qml.cpp index 8ca08bb7..7fd5392f 100644 --- a/src/tools/launcher-qml/launcher-qml.cpp +++ b/src/tools/launcher-qml/launcher-qml.cpp @@ -239,7 +239,7 @@ Controller::Controller(LauncherMain *launcher, bool quickLaunched, const QPair<Q // property will fail with [unknown property type]. First seen when trying to // write a nested Wayland-compositor where assigning to WaylandOutput.window failed. { - static const char registerWindowQml[] = "import QtQuick 2.0\nimport QtQuick.Window 2.2\nQtObject { }\n"; + static const char registerWindowQml[] = "import QtQuick\nimport QtQuick.Window\nQtObject { }\n"; QQmlComponent registerWindowComp(&m_engine); registerWindowComp.setData(QByteArray::fromRawData(registerWindowQml, sizeof(registerWindowQml) - 1), QUrl()); std::unique_ptr<QObject> dummy(registerWindowComp.create()); diff --git a/src/window-lib/windowitem.cpp b/src/window-lib/windowitem.cpp index 5d540624..98bdd240 100644 --- a/src/window-lib/windowitem.cpp +++ b/src/window-lib/windowitem.cpp @@ -350,7 +350,7 @@ void WindowItem::InProcessImpl::setupSecondaryView() QQmlEngine *engine = QQmlEngine::contextForObject(q)->engine(); QQmlComponent component(engine); - component.setData("import QtQuick 2.7\nShaderEffectSource { anchors.fill: parent }", QUrl()); + component.setData("import QtQuick\nShaderEffectSource { anchors.fill: parent }", QUrl()); m_shaderEffectSource = qobject_cast<QQuickItem *>(component.create()); m_shaderEffectSource->setParent(q); m_shaderEffectSource->setParentItem(q); diff --git a/src/window-lib/windowmanager.cpp b/src/window-lib/windowmanager.cpp index 907f314a..2c59dea8 100644 --- a/src/window-lib/windowmanager.cpp +++ b/src/window-lib/windowmanager.cpp @@ -95,8 +95,8 @@ for window show and hide animations: \qml - import QtQuick 2.10 - import QtApplicationManager.SystemUI 2.0 + import QtQuick + import QtApplicationManager.SystemUI // Simple solution for a full-screen setup Item { @@ -536,7 +536,7 @@ int WindowManager::indexOfWindow(Window *window) const only be added, once ApplicationManager::windowManagerCompositorReady is true, for example: \code - import QtWayland.Compositor.TextureSharingExtension 1.0 + import QtWayland.Compositor.TextureSharingExtension Component { id: texshare |