From 4148be0d270c5a5f32fe383a3036819d716cb7ae Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Sat, 11 Mar 2023 12:29:24 +0200 Subject: [PATCH] Port to versionless QML module imports It's more convenient and Qt upstream seems to encourage to use it too, e.g. example import statements have no version. --- .../scripting/scripts/screenedgetouch.qml | 4 ++-- src/effects/desktopgrid/qml/DesktopView.qml | 10 +++++----- src/effects/desktopgrid/qml/main.qml | 12 ++++++------ src/effects/outputlocator/qml/OutputLabel.qml | 4 ++-- src/effects/overview/qml/DesktopBar.qml | 12 ++++++------ src/effects/overview/qml/DesktopView.qml | 4 ++-- src/effects/overview/qml/ScreenView.qml | 12 ++++++------ src/effects/private/qml/WindowHeap.qml | 10 +++++----- src/effects/private/qml/WindowHeapDelegate.qml | 10 +++++----- src/effects/showfps/qml/main.qml | 10 +++++----- src/effects/tileseditor/qml/ResizeCorner.qml | 10 +++++----- src/effects/tileseditor/qml/ResizeHandle.qml | 8 ++++---- src/effects/tileseditor/qml/TileDelegate.qml | 10 +++++----- src/effects/tileseditor/qml/main.qml | 12 ++++++------ src/effects/windowview/qml/main.qml | 14 +++++++------- .../decoration/package/contents/ui/ButtonGroup.qml | 4 ++-- .../decoration/package/contents/ui/Buttons.qml | 10 +++++----- .../package/contents/ui/ConfigureTitlebar.qml | 8 ++++---- src/kcms/decoration/package/contents/ui/Themes.qml | 6 +++--- src/kcms/decoration/package/contents/ui/main.qml | 10 +++++----- src/kcms/desktop/package/contents/ui/main.qml | 8 ++++---- src/kcms/effects/package/contents/ui/Effect.qml | 8 ++++---- src/kcms/effects/package/contents/ui/Video.qml | 8 ++++---- src/kcms/effects/package/contents/ui/main.qml | 14 +++++++------- .../rules/package/contents/ui/OptionsComboBox.qml | 8 ++++---- .../rules/package/contents/ui/RuleItemDelegate.qml | 6 +++--- src/kcms/rules/package/contents/ui/RulesEditor.qml | 12 ++++++------ src/kcms/rules/package/contents/ui/ValueEditor.qml | 10 +++++----- src/kcms/rules/package/contents/ui/main.qml | 10 +++++----- src/kcms/scripts/package/contents/ui/main.qml | 14 +++++++------- .../virtualkeyboard/package/contents/ui/main.qml | 8 ++++---- src/kcms/xwayland/package/contents/ui/main.qml | 12 ++++++------ .../kdecorations/aurorae/src/qml/AppMenuButton.qml | 6 +++--- .../kdecorations/aurorae/src/qml/AuroraeButton.qml | 6 +++--- .../aurorae/src/qml/AuroraeButtonGroup.qml | 6 +++--- .../aurorae/src/qml/AuroraeMaximizeButton.qml | 4 ++-- .../kdecorations/aurorae/src/qml/ButtonGroup.qml | 4 ++-- .../kdecorations/aurorae/src/qml/Decoration.qml | 4 ++-- .../aurorae/src/qml/DecorationButton.qml | 4 ++-- .../kdecorations/aurorae/src/qml/MenuButton.qml | 6 +++--- .../kdecorations/aurorae/src/qml/aurorae.qml | 6 +++--- .../plastik/package/contents/ui/PlastikButton.qml | 6 +++--- .../themes/plastik/package/contents/ui/main.qml | 6 +++--- src/qml/frames/plasma/frame_none.qml | 6 +++--- src/qml/frames/plasma/frame_styled.qml | 6 +++--- src/qml/frames/plasma/frame_unstyled.qml | 6 +++--- .../onscreennotification/plasma/dummydata/osd.qml | 2 +- src/qml/onscreennotification/plasma/main.qml | 8 ++++---- src/qml/outline/plasma/outline.qml | 8 ++++---- src/scripts/desktopchangeosd/contents/ui/main.qml | 4 ++-- src/scripts/desktopchangeosd/contents/ui/osd.qml | 10 +++++----- tests/inputmethodstest.qml | 4 ++-- tests/pointerconstraintstest.qml | 6 +++--- tests/pointergesturestest.qml | 4 ++-- tests/unmapdestroytest.qml | 8 ++++---- 55 files changed, 214 insertions(+), 214 deletions(-) diff --git a/autotests/integration/scripting/scripts/screenedgetouch.qml b/autotests/integration/scripting/scripts/screenedgetouch.qml index f82ee2da77..c9e696624a 100644 --- a/autotests/integration/scripting/scripts/screenedgetouch.qml +++ b/autotests/integration/scripting/scripts/screenedgetouch.qml @@ -1,5 +1,5 @@ -import QtQuick 2.0; -import org.kde.kwin 3.0; +import QtQuick +import org.kde.kwin ScreenEdgeHandler { edge: ScreenEdgeHandler.LeftEdge diff --git a/src/effects/desktopgrid/qml/DesktopView.qml b/src/effects/desktopgrid/qml/DesktopView.qml index 1588fa8707..96e87dc1d0 100644 --- a/src/effects/desktopgrid/qml/DesktopView.qml +++ b/src/effects/desktopgrid/qml/DesktopView.qml @@ -6,12 +6,12 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 -import org.kde.kwin 3.0 as KWinComponents -import org.kde.kwin.private.effects 1.0 -import org.kde.plasma.core 2.0 as PlasmaCore +import QtQuick +import org.kde.kwin as KWinComponents +import org.kde.kwin.private.effects +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PC3 -import org.kde.kwin.private.desktopgrid 1.0 +import org.kde.kwin.private.desktopgrid FocusScope { id: desktopView diff --git a/src/effects/desktopgrid/qml/main.qml b/src/effects/desktopgrid/qml/main.qml index 42e9cbaa06..5df0931b09 100644 --- a/src/effects/desktopgrid/qml/main.qml +++ b/src/effects/desktopgrid/qml/main.qml @@ -6,13 +6,13 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 +import QtQuick import Qt5Compat.GraphicalEffects -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import org.kde.kwin 3.0 as KWinComponents -import org.kde.kwin.private.effects 1.0 -import org.kde.plasma.core 2.0 as PlasmaCore +import QtQuick.Layouts +import QtQuick.Window +import org.kde.kwin as KWinComponents +import org.kde.kwin.private.effects +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PC3 Rectangle { diff --git a/src/effects/outputlocator/qml/OutputLabel.qml b/src/effects/outputlocator/qml/OutputLabel.qml index 0e3be3e474..8ce1cae309 100644 --- a/src/effects/outputlocator/qml/OutputLabel.qml +++ b/src/effects/outputlocator/qml/OutputLabel.qml @@ -4,8 +4,8 @@ SPDX-License-Identifier: LGPL-2.1-or-later */ -import QtQuick 2.1 -import org.kde.plasma.core 2.0 as PlasmaCore +import QtQuick +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents3 Rectangle { diff --git a/src/effects/overview/qml/DesktopBar.qml b/src/effects/overview/qml/DesktopBar.qml index 95b4dd3ac4..be7d117223 100644 --- a/src/effects/overview/qml/DesktopBar.qml +++ b/src/effects/overview/qml/DesktopBar.qml @@ -5,15 +5,15 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 +import QtQuick import Qt5Compat.GraphicalEffects -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick.Controls +import QtQuick.Layouts import org.kde.kirigami 2.20 as Kirigami -import org.kde.kwin 3.0 as KWinComponents -import org.kde.kwin.private.effects 1.0 +import org.kde.kwin as KWinComponents +import org.kde.kwin.private.effects import org.kde.plasma.components 3.0 as PC3 -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore Item { id: bar diff --git a/src/effects/overview/qml/DesktopView.qml b/src/effects/overview/qml/DesktopView.qml index 08d329fe59..bf5a5f0092 100644 --- a/src/effects/overview/qml/DesktopView.qml +++ b/src/effects/overview/qml/DesktopView.qml @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 -import org.kde.kwin 3.0 as KWinComponents +import QtQuick +import org.kde.kwin as KWinComponents Item { id: desktopView diff --git a/src/effects/overview/qml/ScreenView.qml b/src/effects/overview/qml/ScreenView.qml index a4facb563e..b1d5fe223a 100644 --- a/src/effects/overview/qml/ScreenView.qml +++ b/src/effects/overview/qml/ScreenView.qml @@ -5,15 +5,15 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 +import QtQuick import Qt5Compat.GraphicalEffects import org.kde.kirigami 2.20 as Kirigami -import org.kde.kwin 3.0 as KWinComponents -import org.kde.kwin.private.effects 1.0 -import org.kde.milou 0.3 as Milou +import org.kde.kwin as KWinComponents +import org.kde.kwin.private.effects +import org.kde.milou as Milou import org.kde.plasma.components 3.0 as PC3 -import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.extras 2.0 as PlasmaExtras +import org.kde.plasma.core as PlasmaCore +import org.kde.plasma.extras as PlasmaExtras FocusScope { id: container diff --git a/src/effects/private/qml/WindowHeap.qml b/src/effects/private/qml/WindowHeap.qml index 9e81b505e3..9ab5f04d16 100644 --- a/src/effects/private/qml/WindowHeap.qml +++ b/src/effects/private/qml/WindowHeap.qml @@ -5,13 +5,13 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 -import QtQuick.Window 2.15 +import QtQuick +import QtQuick.Window import org.kde.kirigami 2.20 as Kirigami -import org.kde.kwin 3.0 as KWinComponents -import org.kde.kwin.private.effects 1.0 +import org.kde.kwin as KWinComponents +import org.kde.kwin.private.effects import org.kde.plasma.components 3.0 as PC3 -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore FocusScope { id: heap diff --git a/src/effects/private/qml/WindowHeapDelegate.qml b/src/effects/private/qml/WindowHeapDelegate.qml index c7a138ee13..764c5c7ea8 100644 --- a/src/effects/private/qml/WindowHeapDelegate.qml +++ b/src/effects/private/qml/WindowHeapDelegate.qml @@ -5,13 +5,13 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 -import QtQuick.Window 2.15 +import QtQuick +import QtQuick.Window import org.kde.kirigami 2.20 as Kirigami -import org.kde.kwin 3.0 as KWinComponents -import org.kde.kwin.private.effects 1.0 +import org.kde.kwin as KWinComponents +import org.kde.kwin.private.effects import org.kde.plasma.components 3.0 as PC3 -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore Item { id: thumb diff --git a/src/effects/showfps/qml/main.qml b/src/effects/showfps/qml/main.qml index c17bb01677..a7f02c2664 100644 --- a/src/effects/showfps/qml/main.qml +++ b/src/effects/showfps/qml/main.qml @@ -4,13 +4,13 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import org.kde.kirigami 2.18 as Kirigami -import org.kde.quickcharts 1.0 as Charts -import org.kde.quickcharts.controls 1.0 as ChartControls +import org.kde.quickcharts as Charts +import org.kde.quickcharts.controls as ChartControls Rectangle { id: root diff --git a/src/effects/tileseditor/qml/ResizeCorner.qml b/src/effects/tileseditor/qml/ResizeCorner.qml index 3cc1a47b9d..58314a5410 100644 --- a/src/effects/tileseditor/qml/ResizeCorner.qml +++ b/src/effects/tileseditor/qml/ResizeCorner.qml @@ -4,12 +4,12 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 +import QtQuick import Qt5Compat.GraphicalEffects -import QtQuick.Layouts 1.4 -import org.kde.kwin 3.0 as KWinComponents -import org.kde.kwin.private.effects 1.0 -import org.kde.plasma.core 2.0 as PlasmaCore +import QtQuick.Layouts +import org.kde.kwin as KWinComponents +import org.kde.kwin.private.effects +import org.kde.plasma.core as PlasmaCore Rectangle { id: handle diff --git a/src/effects/tileseditor/qml/ResizeHandle.qml b/src/effects/tileseditor/qml/ResizeHandle.qml index 104d712c85..c88d2b45f9 100644 --- a/src/effects/tileseditor/qml/ResizeHandle.qml +++ b/src/effects/tileseditor/qml/ResizeHandle.qml @@ -4,10 +4,10 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 -import org.kde.kwin 3.0 as KWinComponents -import org.kde.kwin.private.effects 1.0 -import org.kde.plasma.core 2.0 as PlasmaCore +import QtQuick +import org.kde.kwin as KWinComponents +import org.kde.kwin.private.effects +import org.kde.plasma.core as PlasmaCore Rectangle { id: handle diff --git a/src/effects/tileseditor/qml/TileDelegate.qml b/src/effects/tileseditor/qml/TileDelegate.qml index fc533140f0..33bf93f3c8 100644 --- a/src/effects/tileseditor/qml/TileDelegate.qml +++ b/src/effects/tileseditor/qml/TileDelegate.qml @@ -4,11 +4,11 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 -import QtQuick.Layouts 1.4 -import org.kde.kwin 3.0 as KWinComponents -import org.kde.kwin.private.effects 1.0 -import org.kde.plasma.core 2.0 as PlasmaCore +import QtQuick +import QtQuick.Layouts +import org.kde.kwin as KWinComponents +import org.kde.kwin.private.effects +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents Item { diff --git a/src/effects/tileseditor/qml/main.qml b/src/effects/tileseditor/qml/main.qml index 0effc71c0a..a521685c48 100644 --- a/src/effects/tileseditor/qml/main.qml +++ b/src/effects/tileseditor/qml/main.qml @@ -4,14 +4,14 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 +import QtQuick import Qt5Compat.GraphicalEffects -import QtQuick.Layouts 1.4 -import org.kde.kwin 3.0 as KWinComponents -import org.kde.kwin.private.effects 1.0 -import org.kde.plasma.core 2.0 as PlasmaCore +import QtQuick.Layouts +import org.kde.kwin as KWinComponents +import org.kde.kwin.private.effects +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents -import org.kde.kitemmodels 1.0 as KitemModels +import org.kde.kitemmodels as KitemModels FocusScope { id: root diff --git a/src/effects/windowview/qml/main.qml b/src/effects/windowview/qml/main.qml index 27e6dc9b30..d86f6c738f 100644 --- a/src/effects/windowview/qml/main.qml +++ b/src/effects/windowview/qml/main.qml @@ -5,14 +5,14 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 +import QtQuick import Qt5Compat.GraphicalEffects -import QtQuick.Layouts 1.15 -import org.kde.kwin 3.0 as KWinComponents -import org.kde.kwin.private.effects 1.0 -import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.extras 2.0 as PlasmaExtras -import org.kde.KWin.Effect.WindowView 1.0 +import QtQuick.Layouts +import org.kde.kwin as KWinComponents +import org.kde.kwin.private.effects +import org.kde.plasma.core as PlasmaCore +import org.kde.plasma.extras as PlasmaExtras +import org.kde.KWin.Effect.WindowView Item { id: container diff --git a/src/kcms/decoration/package/contents/ui/ButtonGroup.qml b/src/kcms/decoration/package/contents/ui/ButtonGroup.qml index 51b1e9ea25..6f0530cdc2 100644 --- a/src/kcms/decoration/package/contents/ui/ButtonGroup.qml +++ b/src/kcms/decoration/package/contents/ui/ButtonGroup.qml @@ -3,10 +3,10 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.15 +import QtQuick import org.kde.kirigami 2.20 as Kirigami -import org.kde.kwin.private.kdecoration 1.0 as KDecoration +import org.kde.kwin.private.kdecoration as KDecoration ListView { id: view diff --git a/src/kcms/decoration/package/contents/ui/Buttons.qml b/src/kcms/decoration/package/contents/ui/Buttons.qml index a4643739d4..4926b14108 100644 --- a/src/kcms/decoration/package/contents/ui/Buttons.qml +++ b/src/kcms/decoration/package/contents/ui/Buttons.qml @@ -4,13 +4,13 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 as QQC2 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 -import org.kde.kcm 1.6 as KCM +import org.kde.kcm as KCM import org.kde.kirigami 2.20 as Kirigami -import org.kde.kwin.private.kdecoration 1.0 as KDecoration +import org.kde.kwin.private.kdecoration as KDecoration // Fake Window Rectangle { diff --git a/src/kcms/decoration/package/contents/ui/ConfigureTitlebar.qml b/src/kcms/decoration/package/contents/ui/ConfigureTitlebar.qml index 1408544923..9f24cd8236 100644 --- a/src/kcms/decoration/package/contents/ui/ConfigureTitlebar.qml +++ b/src/kcms/decoration/package/contents/ui/ConfigureTitlebar.qml @@ -5,11 +5,11 @@ SPDX-License-Identifier: LGPL-2.0-only */ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 as QQC2 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 -import org.kde.kcm 1.6 as KCM +import org.kde.kcm as KCM import org.kde.kirigami 2.20 as Kirigami KCM.AbstractKCM { diff --git a/src/kcms/decoration/package/contents/ui/Themes.qml b/src/kcms/decoration/package/contents/ui/Themes.qml index 03c49b483f..416b075f4b 100644 --- a/src/kcms/decoration/package/contents/ui/Themes.qml +++ b/src/kcms/decoration/package/contents/ui/Themes.qml @@ -4,11 +4,11 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.15 +import QtQuick -import org.kde.kcm 1.6 as KCM +import org.kde.kcm as KCM import org.kde.kirigami 2.20 as Kirigami -import org.kde.kwin.private.kdecoration 1.0 as KDecoration +import org.kde.kwin.private.kdecoration as KDecoration KCM.GridView { function updateDecoration(item, marginTopLeft, marginBottomRight) { diff --git a/src/kcms/decoration/package/contents/ui/main.qml b/src/kcms/decoration/package/contents/ui/main.qml index 5290e48f30..6e78bca5ee 100644 --- a/src/kcms/decoration/package/contents/ui/main.qml +++ b/src/kcms/decoration/package/contents/ui/main.qml @@ -5,13 +5,13 @@ SPDX-License-Identifier: LGPL-2.0-only */ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 as QQC2 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 -import org.kde.kcm 1.6 as KCM +import org.kde.kcm as KCM import org.kde.kirigami 2.20 as Kirigami -import org.kde.newstuff 1.85 as NewStuff +import org.kde.newstuff as NewStuff KCM.AbstractKCM { id: root diff --git a/src/kcms/desktop/package/contents/ui/main.qml b/src/kcms/desktop/package/contents/ui/main.qml index d328291785..2ca2d9b862 100644 --- a/src/kcms/desktop/package/contents/ui/main.qml +++ b/src/kcms/desktop/package/contents/ui/main.qml @@ -4,11 +4,11 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kcm 1.6 as KCM +import org.kde.kcm as KCM import org.kde.kirigami 2.20 as Kirigami KCM.ScrollViewKCM { diff --git a/src/kcms/effects/package/contents/ui/Effect.qml b/src/kcms/effects/package/contents/ui/Effect.qml index f8a36c03e7..86bbcdbb97 100644 --- a/src/kcms/effects/package/contents/ui/Effect.qml +++ b/src/kcms/effects/package/contents/ui/Effect.qml @@ -6,12 +6,12 @@ */ -import QtQuick 2.5 -import QtQuick.Controls 2.5 as QQC2 -import QtQuick.Layouts 1.1 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts import org.kde.kirigami 2.5 as Kirigami -import org.kde.kcm 1.5 as KCM +import org.kde.kcm as KCM Kirigami.SwipeListItem { id: listItem diff --git a/src/kcms/effects/package/contents/ui/Video.qml b/src/kcms/effects/package/contents/ui/Video.qml index f67461cc73..11c0ae30c7 100644 --- a/src/kcms/effects/package/contents/ui/Video.qml +++ b/src/kcms/effects/package/contents/ui/Video.qml @@ -8,10 +8,10 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.5 -import QtQuick.Controls 2.5 as QQC2 -import QtQuick.Layouts 1.1 -import QtMultimedia 5.0 as Multimedia +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import QtMultimedia as Multimedia Multimedia.Video { id: videoItem diff --git a/src/kcms/effects/package/contents/ui/main.qml b/src/kcms/effects/package/contents/ui/main.qml index 8b7104dfe8..7baf553e3c 100644 --- a/src/kcms/effects/package/contents/ui/main.qml +++ b/src/kcms/effects/package/contents/ui/main.qml @@ -5,16 +5,16 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.5 -import QtQuick.Controls 2.5 as QQC2 -import QtQuick.Layouts 1.1 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kcm 1.2 -import org.kde.kconfig 1.0 +import org.kde.kcm +import org.kde.kconfig import org.kde.kirigami 2.10 as Kirigami -import org.kde.newstuff 1.62 as NewStuff +import org.kde.newstuff as NewStuff -import org.kde.private.kcms.kwin.effects 1.0 as Private +import org.kde.private.kcms.kwin.effects as Private ScrollViewKCM { ConfigModule.quickHelp: i18n("This module lets you configure desktop effects.") diff --git a/src/kcms/rules/package/contents/ui/OptionsComboBox.qml b/src/kcms/rules/package/contents/ui/OptionsComboBox.qml index 26adaaf6b6..2d6a1e4a00 100644 --- a/src/kcms/rules/package/contents/ui/OptionsComboBox.qml +++ b/src/kcms/rules/package/contents/ui/OptionsComboBox.qml @@ -4,12 +4,12 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.14 -import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 as QQC2 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 import org.kde.kirigami 2.10 as Kirigami -import org.kde.kcms.kwinrules 1.0 +import org.kde.kcms.kwinrules QQC2.ComboBox { diff --git a/src/kcms/rules/package/contents/ui/RuleItemDelegate.qml b/src/kcms/rules/package/contents/ui/RuleItemDelegate.qml index 9f0ba1c41c..575214354a 100644 --- a/src/kcms/rules/package/contents/ui/RuleItemDelegate.qml +++ b/src/kcms/rules/package/contents/ui/RuleItemDelegate.qml @@ -4,9 +4,9 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.14 -import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 as QQC2 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 import org.kde.kirigami 2.10 as Kirigami Kirigami.AbstractListItem { diff --git a/src/kcms/rules/package/contents/ui/RulesEditor.qml b/src/kcms/rules/package/contents/ui/RulesEditor.qml index 61baaa7ad2..dc26cc74eb 100644 --- a/src/kcms/rules/package/contents/ui/RulesEditor.qml +++ b/src/kcms/rules/package/contents/ui/RulesEditor.qml @@ -4,13 +4,13 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 as QQC2 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 import org.kde.kirigami 2.19 as Kirigami -import org.kde.kcm 1.2 -import org.kde.kitemmodels 1.0 -import org.kde.kcms.kwinrules 1.0 +import org.kde.kcm +import org.kde.kitemmodels +import org.kde.kcms.kwinrules ScrollViewKCM { diff --git a/src/kcms/rules/package/contents/ui/ValueEditor.qml b/src/kcms/rules/package/contents/ui/ValueEditor.qml index 69af2ac4c3..07af861273 100644 --- a/src/kcms/rules/package/contents/ui/ValueEditor.qml +++ b/src/kcms/rules/package/contents/ui/ValueEditor.qml @@ -4,13 +4,13 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.14 -import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 as QQC2 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 import org.kde.kirigami 2.10 as Kirigami -import org.kde.kquickcontrols 2.0 as KQC -import org.kde.kcms.kwinrules 1.0 +import org.kde.kquickcontrols as KQC +import org.kde.kcms.kwinrules Loader { diff --git a/src/kcms/rules/package/contents/ui/main.qml b/src/kcms/rules/package/contents/ui/main.qml index ca468fda20..a1c12f6ef5 100644 --- a/src/kcms/rules/package/contents/ui/main.qml +++ b/src/kcms/rules/package/contents/ui/main.qml @@ -4,11 +4,11 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.15 -import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 as QQC2 -import QtQml.Models 2.14 -import org.kde.kcm 1.2 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 +import QtQml.Models +import org.kde.kcm import org.kde.kirigami 2.12 as Kirigami ScrollViewKCM { diff --git a/src/kcms/scripts/package/contents/ui/main.qml b/src/kcms/scripts/package/contents/ui/main.qml index 687309aa08..d662a159be 100644 --- a/src/kcms/scripts/package/contents/ui/main.qml +++ b/src/kcms/scripts/package/contents/ui/main.qml @@ -5,15 +5,15 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.5 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.1 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kcm 1.2 -import org.kde.kconfig 1.0 +import org.kde.kcm +import org.kde.kconfig import org.kde.kirigami 2.10 as Kirigami -import org.kde.newstuff 1.91 as NewStuff -import org.kde.kcmutils 1.0 as KCMUtils +import org.kde.newstuff as NewStuff +import org.kde.kcmutils as KCMUtils ScrollViewKCM { implicitWidth: Kirigami.Units.gridUnit * 22 diff --git a/src/kcms/virtualkeyboard/package/contents/ui/main.qml b/src/kcms/virtualkeyboard/package/contents/ui/main.qml index 72a2e68442..e219ec6fa0 100644 --- a/src/kcms/virtualkeyboard/package/contents/ui/main.qml +++ b/src/kcms/virtualkeyboard/package/contents/ui/main.qml @@ -5,11 +5,11 @@ */ -import QtQuick 2.1 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.3 as QQC2 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 import org.kde.kirigami 2.6 as Kirigami -import org.kde.kcm 1.3 as KCM +import org.kde.kcm as KCM KCM.GridViewKCM { id: root diff --git a/src/kcms/xwayland/package/contents/ui/main.qml b/src/kcms/xwayland/package/contents/ui/main.qml index 870632447f..5840b29936 100644 --- a/src/kcms/xwayland/package/contents/ui/main.qml +++ b/src/kcms/xwayland/package/contents/ui/main.qml @@ -5,13 +5,13 @@ */ -import QtQuick 2.1 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.3 as QQC2 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 import org.kde.kirigami 2.6 as Kirigami -import org.kde.kcm 1.3 as KCM -import org.kde.kwin.kwinxwaylandsettings 1.0 -import org.kde.kquickcontrols 2.0 +import org.kde.kcm as KCM +import org.kde.kwin.kwinxwaylandsettings +import org.kde.kquickcontrols KCM.SimpleKCM { id: root diff --git a/src/plugins/kdecorations/aurorae/src/qml/AppMenuButton.qml b/src/plugins/kdecorations/aurorae/src/qml/AppMenuButton.qml index b4bb5d8c86..fb91acadc1 100644 --- a/src/plugins/kdecorations/aurorae/src/qml/AppMenuButton.qml +++ b/src/plugins/kdecorations/aurorae/src/qml/AppMenuButton.qml @@ -3,9 +3,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.0 -import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.kwin.decoration 0.1 +import QtQuick +import org.kde.plasma.core as PlasmaCore +import org.kde.kwin.decoration DecorationButton { id: appMenuButton diff --git a/src/plugins/kdecorations/aurorae/src/qml/AuroraeButton.qml b/src/plugins/kdecorations/aurorae/src/qml/AuroraeButton.qml index 69e960365c..9ba4d6deb6 100644 --- a/src/plugins/kdecorations/aurorae/src/qml/AuroraeButton.qml +++ b/src/plugins/kdecorations/aurorae/src/qml/AuroraeButton.qml @@ -3,9 +3,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.0 -import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.kwin.decoration 0.1 +import QtQuick +import org.kde.plasma.core as PlasmaCore +import org.kde.kwin.decoration DecorationButton { function widthForButton() { diff --git a/src/plugins/kdecorations/aurorae/src/qml/AuroraeButtonGroup.qml b/src/plugins/kdecorations/aurorae/src/qml/AuroraeButtonGroup.qml index cfc53fa849..3d1880428e 100644 --- a/src/plugins/kdecorations/aurorae/src/qml/AuroraeButtonGroup.qml +++ b/src/plugins/kdecorations/aurorae/src/qml/AuroraeButtonGroup.qml @@ -3,9 +3,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.0 -import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.kwin.decoration 0.1 +import QtQuick +import org.kde.plasma.core as PlasmaCore +import org.kde.kwin.decoration Item { function createButtons() { diff --git a/src/plugins/kdecorations/aurorae/src/qml/AuroraeMaximizeButton.qml b/src/plugins/kdecorations/aurorae/src/qml/AuroraeMaximizeButton.qml index e6d3a7a2a7..e10cc3bdc5 100644 --- a/src/plugins/kdecorations/aurorae/src/qml/AuroraeMaximizeButton.qml +++ b/src/plugins/kdecorations/aurorae/src/qml/AuroraeMaximizeButton.qml @@ -3,8 +3,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.0 -import org.kde.kwin.decoration 0.1 +import QtQuick +import org.kde.kwin.decoration Item { id: button diff --git a/src/plugins/kdecorations/aurorae/src/qml/ButtonGroup.qml b/src/plugins/kdecorations/aurorae/src/qml/ButtonGroup.qml index e44c431132..d30a99d78e 100644 --- a/src/plugins/kdecorations/aurorae/src/qml/ButtonGroup.qml +++ b/src/plugins/kdecorations/aurorae/src/qml/ButtonGroup.qml @@ -3,8 +3,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.0 -import org.kde.kwin.decoration 0.1 +import QtQuick +import org.kde.kwin.decoration Item { function createButtons() { diff --git a/src/plugins/kdecorations/aurorae/src/qml/Decoration.qml b/src/plugins/kdecorations/aurorae/src/qml/Decoration.qml index a5b14690b9..66ac37d5f2 100644 --- a/src/plugins/kdecorations/aurorae/src/qml/Decoration.qml +++ b/src/plugins/kdecorations/aurorae/src/qml/Decoration.qml @@ -3,8 +3,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.0 -import org.kde.kwin.decoration 0.1 +import QtQuick +import org.kde.kwin.decoration Item { property QtObject borders: Borders { diff --git a/src/plugins/kdecorations/aurorae/src/qml/DecorationButton.qml b/src/plugins/kdecorations/aurorae/src/qml/DecorationButton.qml index ace6c188c7..22354431bb 100644 --- a/src/plugins/kdecorations/aurorae/src/qml/DecorationButton.qml +++ b/src/plugins/kdecorations/aurorae/src/qml/DecorationButton.qml @@ -3,8 +3,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.0 -import org.kde.kwin.decoration 0.1 +import QtQuick +import org.kde.kwin.decoration Item { id: button diff --git a/src/plugins/kdecorations/aurorae/src/qml/MenuButton.qml b/src/plugins/kdecorations/aurorae/src/qml/MenuButton.qml index 04b5ab1f83..f584c4bfb7 100644 --- a/src/plugins/kdecorations/aurorae/src/qml/MenuButton.qml +++ b/src/plugins/kdecorations/aurorae/src/qml/MenuButton.qml @@ -3,9 +3,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.0 -import org.kde.kwin.decoration 0.1 -import org.kde.plasma.core 2.0 as PlasmaCore +import QtQuick +import org.kde.kwin.decoration +import org.kde.plasma.core as PlasmaCore DecorationButton { property bool closeOnDoubleClick: decorationSettings.closeOnDoubleClickOnMenu diff --git a/src/plugins/kdecorations/aurorae/src/qml/aurorae.qml b/src/plugins/kdecorations/aurorae/src/qml/aurorae.qml index 41c35b4474..0e1bf527eb 100644 --- a/src/plugins/kdecorations/aurorae/src/qml/aurorae.qml +++ b/src/plugins/kdecorations/aurorae/src/qml/aurorae.qml @@ -3,9 +3,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.0 -import org.kde.kwin.decoration 0.1 -import org.kde.plasma.core 2.0 as PlasmaCore +import QtQuick +import org.kde.kwin.decoration +import org.kde.plasma.core as PlasmaCore Decoration { id: root diff --git a/src/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/PlastikButton.qml b/src/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/PlastikButton.qml index 9568527bfc..4f11871514 100644 --- a/src/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/PlastikButton.qml +++ b/src/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/PlastikButton.qml @@ -3,9 +3,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.0 -import org.kde.kwin.decoration 0.1 -import org.kde.kwin.decorations.plastik 1.0 +import QtQuick +import org.kde.kwin.decoration +import org.kde.kwin.decorations.plastik DecorationButton { id: button diff --git a/src/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/main.qml b/src/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/main.qml index 46443160b6..cfe2b2d6e5 100644 --- a/src/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/main.qml +++ b/src/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/main.qml @@ -3,9 +3,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.0 -import org.kde.kwin.decoration 0.1 -import org.kde.kwin.decorations.plastik 1.0 +import QtQuick +import org.kde.kwin.decoration +import org.kde.kwin.decorations.plastik Decoration { function readBorderSize() { diff --git a/src/qml/frames/plasma/frame_none.qml b/src/qml/frames/plasma/frame_none.qml index 88194a6117..5a6774cf66 100644 --- a/src/qml/frames/plasma/frame_none.qml +++ b/src/qml/frames/plasma/frame_none.qml @@ -5,9 +5,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 as QQC2 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 import org.kde.kirigami 2.12 as Kirigami diff --git a/src/qml/frames/plasma/frame_styled.qml b/src/qml/frames/plasma/frame_styled.qml index 28ca97d900..72067bd2eb 100644 --- a/src/qml/frames/plasma/frame_styled.qml +++ b/src/qml/frames/plasma/frame_styled.qml @@ -5,10 +5,10 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents Item { diff --git a/src/qml/frames/plasma/frame_unstyled.qml b/src/qml/frames/plasma/frame_unstyled.qml index 87ba237b29..c817f09054 100644 --- a/src/qml/frames/plasma/frame_unstyled.qml +++ b/src/qml/frames/plasma/frame_unstyled.qml @@ -5,9 +5,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 as QQC2 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 import org.kde.kirigami 2.12 as Kirigami diff --git a/src/qml/onscreennotification/plasma/dummydata/osd.qml b/src/qml/onscreennotification/plasma/dummydata/osd.qml index b7a17c2c39..c18cba89d5 100644 --- a/src/qml/onscreennotification/plasma/dummydata/osd.qml +++ b/src/qml/onscreennotification/plasma/dummydata/osd.qml @@ -1,4 +1,4 @@ -import QtQuick 2.3 +import QtQuick QtObject { property bool visible: true diff --git a/src/qml/onscreennotification/plasma/main.qml b/src/qml/onscreennotification/plasma/main.qml index 86d524c9a5..d87aa67da7 100644 --- a/src/qml/onscreennotification/plasma/main.qml +++ b/src/qml/onscreennotification/plasma/main.qml @@ -5,11 +5,11 @@ */ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window -import org.kde.plasma.core 2.1 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents3 PlasmaCore.Dialog { diff --git a/src/qml/outline/plasma/outline.qml b/src/qml/outline/plasma/outline.qml index ca4fa8230e..ce878bac26 100644 --- a/src/qml/outline/plasma/outline.qml +++ b/src/qml/outline/plasma/outline.qml @@ -4,10 +4,10 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.1 -import QtQuick.Window 2.1 -import org.kde.kwin 3.0 -import org.kde.plasma.core 2.0 as PlasmaCore +import QtQuick +import QtQuick.Window +import org.kde.kwin +import org.kde.plasma.core as PlasmaCore Window { id: window diff --git a/src/scripts/desktopchangeosd/contents/ui/main.qml b/src/scripts/desktopchangeosd/contents/ui/main.qml index c70f1c30b0..9d9911bbca 100644 --- a/src/scripts/desktopchangeosd/contents/ui/main.qml +++ b/src/scripts/desktopchangeosd/contents/ui/main.qml @@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.0; -import org.kde.kwin 3.0 +import QtQuick +import org.kde.kwin Item { id: root diff --git a/src/scripts/desktopchangeosd/contents/ui/osd.qml b/src/scripts/desktopchangeosd/contents/ui/osd.qml index 22fcc9b0e8..75e0b488ae 100644 --- a/src/scripts/desktopchangeosd/contents/ui/osd.qml +++ b/src/scripts/desktopchangeosd/contents/ui/osd.qml @@ -6,11 +6,11 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.0; -import QtQuick.Window 2.0; -import org.kde.plasma.core 2.0 as PlasmaCore; -import org.kde.plasma.extras 2.0 as PlasmaExtras -import org.kde.kwin 3.0 +import QtQuick +import QtQuick.Window +import org.kde.plasma.core as PlasmaCore; +import org.kde.plasma.extras as PlasmaExtras +import org.kde.kwin PlasmaCore.Dialog { id: dialog diff --git a/tests/inputmethodstest.qml b/tests/inputmethodstest.qml index 83bcd16722..f1213c67c7 100644 --- a/tests/inputmethodstest.qml +++ b/tests/inputmethodstest.qml @@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.2 +import QtQuick.Controls +import QtQuick.Layouts GridLayout { columns: 2 diff --git a/tests/pointerconstraintstest.qml b/tests/pointerconstraintstest.qml index 4014343d18..7f8c8b4e13 100644 --- a/tests/pointerconstraintstest.qml +++ b/tests/pointerconstraintstest.qml @@ -3,9 +3,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -import QtQuick 2.10 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.1 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ColumnLayout { /* for margins */ diff --git a/tests/pointergesturestest.qml b/tests/pointergesturestest.qml index d4beb8ba20..559adbcd2a 100644 --- a/tests/pointergesturestest.qml +++ b/tests/pointergesturestest.qml @@ -3,8 +3,8 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.0 -import org.kde.kwin.tests 1.0 +import QtQuick +import org.kde.kwin.tests Image { source: "../48-apps-kwin.png" diff --git a/tests/unmapdestroytest.qml b/tests/unmapdestroytest.qml index 82b0ff0eb0..4a69f7435d 100644 --- a/tests/unmapdestroytest.qml +++ b/tests/unmapdestroytest.qml @@ -3,10 +3,10 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.1 -import QtQuick.Window 2.1 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Window +import QtQuick.Layouts +import QtQuick.Controls /* * Small test application to test the difference between unmap and destroy.