From a8b858dc3e6d90fbde78a1f57b59c964eb7dc81a Mon Sep 17 00:00:00 2001 From: Devin Lin Date: Fri, 6 Mar 2026 22:08:07 -0500 Subject: [PATCH] Remove kirigami version in imports This fixes potential issues stemming from pinning versions on Kirigami qml api imports --- components/mobileshell/qml/actiondrawer/ActionDrawer.qml | 2 +- .../mobileshell/qml/actiondrawer/private/BrightnessItem.qml | 2 +- components/mobileshell/qml/actiondrawer/private/Handle.qml | 2 +- .../qml/actiondrawer/private/LandscapeContentContainer.qml | 2 +- .../qml/actiondrawer/private/NotificationDrawer.qml | 2 +- .../qml/actiondrawer/private/PortraitContentContainer.qml | 2 +- .../mobileshell/qml/actiondrawer/private/QuickSettings.qml | 2 +- .../qml/actiondrawer/private/QuickSettingsDelegate.qml | 2 +- .../qml/actiondrawer/private/QuickSettingsDrawer.qml | 2 +- .../qml/actiondrawer/private/QuickSettingsFullDelegate.qml | 2 +- .../actiondrawer/private/QuickSettingsMinimizedDelegate.qml | 2 +- .../qml/actiondrawer/private/QuickSettingsPanel.qml | 2 +- components/mobileshell/qml/components/Constants.qml | 2 +- components/mobileshell/qml/components/MarqueeLabel.qml | 2 +- components/mobileshell/qml/components/PanelBackground.qml | 2 +- .../mobileshell/qml/components/ScreenEdgeDragEffect.qml | 2 +- components/mobileshell/qml/homescreen/WallpaperSelector.qml | 2 +- .../mobileshell/qml/navigationpanel/NavigationPanel.qml | 2 +- .../mobileshell/qml/navigationpanel/NavigationPanelButton.qml | 2 +- .../mobileshell/qml/popups/actionbuttons/ActionButton.qml | 2 +- .../qml/popups/notifications/NotificationPopup.qml | 2 +- .../qml/popups/notifications/NotificationPopupManager.qml | 2 +- components/mobileshell/qml/popups/volumeosd/AudioApplet.qml | 2 +- components/mobileshell/qml/popups/volumeosd/PopupCard.qml | 2 +- .../mobileshell/qml/popups/volumeosd/VolumeChangedPopup.qml | 2 +- components/mobileshell/qml/popups/volumeosd/VolumeOSD.qml | 2 +- .../mobileshell/qml/statusbar/indicators/BatteryIndicator.qml | 2 +- .../qml/statusbar/indicators/BluetoothIndicator.qml | 2 +- components/mobileshell/qml/widgets/krunner/KRunnerScreen.qml | 2 +- .../qml/widgets/mediacontrols/BlurredBackground.qml | 2 +- .../qml/widgets/notifications/NotificationCard.qml | 2 +- .../qml/widgets/notifications/NotificationFooterActions.qml | 2 +- .../qml/widgets/notifications/NotificationGroupHeader.qml | 2 +- .../qml/widgets/notifications/NotificationItem.qml | 2 +- .../qml/widgets/notifications/NotificationJobDetails.qml | 2 +- .../qml/widgets/notifications/NotificationJobItem.qml | 2 +- .../qml/widgets/notifications/NotificationPopupItem.qml | 2 +- .../qml/widgets/notifications/NotificationReplyField.qml | 2 +- .../qml/widgets/notifications/NotificationsWidget.qml | 2 +- .../mobileshell/qml/widgets/notifications/ThumbnailStrip.qml | 2 +- containments/homescreens/folio/qml/DelegateDragItem.qml | 2 +- containments/homescreens/folio/qml/FavouritesBar.qml | 2 +- containments/homescreens/folio/qml/FolderView.qml | 2 +- containments/homescreens/folio/qml/FolderViewTitle.qml | 2 +- containments/homescreens/folio/qml/FolioHomeScreen.qml | 2 +- containments/homescreens/folio/qml/HomeScreenPages.qml | 2 +- containments/homescreens/folio/qml/PlaceholderDelegate.qml | 2 +- .../homescreens/folio/qml/delegate/AbstractDelegate.qml | 2 +- containments/homescreens/folio/qml/delegate/AppDelegate.qml | 2 +- .../homescreens/folio/qml/delegate/DelegateAppIcon.qml | 2 +- .../homescreens/folio/qml/delegate/DelegateFolderIcon.qml | 2 +- .../homescreens/folio/qml/delegate/DelegateIconLoader.qml | 2 +- containments/homescreens/folio/qml/delegate/DelegateLabel.qml | 2 +- containments/homescreens/folio/qml/main.qml | 2 +- .../homescreens/folio/qml/private/ContextMenuLoader.qml | 2 +- .../homescreens/folio/qml/settings/SettingsComponent.qml | 2 +- containments/homescreens/halcyon/qml/Clock.qml | 2 +- containments/homescreens/halcyon/qml/FavoritesAppDelegate.qml | 2 +- containments/homescreens/halcyon/qml/FavoritesView.qml | 2 +- containments/homescreens/halcyon/qml/GridAppList.qml | 2 +- containments/homescreens/halcyon/qml/main.qml | 2 +- .../homescreens/halcyon/qml/settings/SettingsScreen.qml | 2 +- containments/taskpanel/qml/GesturePanelComponent.qml | 2 +- containments/taskpanel/qml/main.qml | 2 +- .../cellular/package/contents/ui/EditProfileDialog.qml | 2 +- initialstart/modules/finished/contents/ui/main.qml | 2 +- initialstart/modules/prepare/package/contents/ui/main.qml | 4 ++-- initialstart/modules/time/package/contents/ui/main.qml | 2 +- .../modules/wifi/package/contents/ui/PasswordField.qml | 2 +- initialstart/modules/wifi/package/contents/ui/main.qml | 4 ++-- initialstart/qml/LandingComponent.qml | 2 +- initialstart/qml/Main.qml | 2 +- kcms/info/ui/main.qml | 2 +- kcms/mobileshell/ui/QuickSettingsForm.qml | 2 +- kcms/mobileshell/ui/main.qml | 2 +- kcms/navigation/ui/AnimationHandler.qml | 2 +- kcms/navigation/ui/TutorialPhone.qml | 2 +- kcms/navigation/ui/main.qml | 2 +- kcms/time/ui/TimePickerSpinBoxButton.qml | 2 +- kcms/waydroidintegration/ui/WaydroidApplicationsPage.qml | 2 +- kcms/waydroidintegration/ui/WaydroidConfigurationForm.qml | 2 +- kcms/waydroidintegration/ui/WaydroidDownloadStatus.qml | 4 ++-- kcms/waydroidintegration/ui/WaydroidErrorPage.qml | 2 +- .../ui/WaydroidGooglePlayProtectConfigurationPage.qml | 4 ++-- .../ui/WaydroidInitialConfigurationForm.qml | 4 ++-- kcms/waydroidintegration/ui/WaydroidLoader.qml | 4 ++-- kcms/waydroidintegration/ui/main.qml | 2 +- kwin/mobiletaskswitcher/package/contents/ui/Task.qml | 2 +- kwin/mobiletaskswitcher/package/contents/ui/TaskList.qml | 2 +- kwin/mobiletaskswitcher/package/contents/ui/TaskSwitcher.qml | 2 +- .../package/contents/ui/TaskSwitcherHelpers.qml | 2 +- lookandfeel/contents/logout/ActionButton.qml | 2 +- lookandfeel/contents/logout/Logout.qml | 2 +- shell/contents/applet/AppletError.qml | 2 +- shell/contents/applet/CompactApplet.qml | 2 +- shell/contents/applet/DefaultCompactRepresentation.qml | 2 +- shell/contents/configuration/AppletConfiguration.qml | 2 +- shell/contents/configuration/ContainmentConfiguration.qml | 2 +- .../contents/configuration/private/ChangeWallpaperModule.qml | 2 +- .../configuration/private/ConfigurationAppletPage.qml | 2 +- shell/contents/configuration/private/ConfigurationKcmPage.qml | 2 +- shell/contents/lockscreen/BottomIconIndicator.qml | 2 +- shell/contents/lockscreen/Clock.qml | 2 +- shell/contents/lockscreen/FlickContainer.qml | 2 +- shell/contents/lockscreen/Keypad.qml | 2 +- shell/contents/lockscreen/LockScreen.qml | 2 +- shell/contents/lockscreen/LockScreenContent.qml | 2 +- shell/contents/lockscreen/PasswordBar.qml | 2 +- shell/contents/views/Desktop.qml | 2 +- shell/contents/views/Panel.qml | 2 +- tests/ActionDrawerTest.qml | 2 +- 111 files changed, 117 insertions(+), 117 deletions(-) diff --git a/components/mobileshell/qml/actiondrawer/ActionDrawer.qml b/components/mobileshell/qml/actiondrawer/ActionDrawer.qml index 31651454..cbe4228a 100644 --- a/components/mobileshell/qml/actiondrawer/ActionDrawer.qml +++ b/components/mobileshell/qml/actiondrawer/ActionDrawer.qml @@ -12,7 +12,7 @@ import QtQuick.Window 2.2 import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.private.nanoshell 2.0 as NanoShell -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell.quicksettingsplugin as QS import org.kde.plasma.private.mobileshell as MobileShell diff --git a/components/mobileshell/qml/actiondrawer/private/BrightnessItem.qml b/components/mobileshell/qml/actiondrawer/private/BrightnessItem.qml index 145a4aae..243348c0 100644 --- a/components/mobileshell/qml/actiondrawer/private/BrightnessItem.qml +++ b/components/mobileshell/qml/actiondrawer/private/BrightnessItem.qml @@ -8,7 +8,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PC3 diff --git a/components/mobileshell/qml/actiondrawer/private/Handle.qml b/components/mobileshell/qml/actiondrawer/private/Handle.qml index 56c14900..5b66e217 100644 --- a/components/mobileshell/qml/actiondrawer/private/Handle.qml +++ b/components/mobileshell/qml/actiondrawer/private/Handle.qml @@ -6,7 +6,7 @@ import QtQuick 2.15 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami Rectangle { id: handle diff --git a/components/mobileshell/qml/actiondrawer/private/LandscapeContentContainer.qml b/components/mobileshell/qml/actiondrawer/private/LandscapeContentContainer.qml index 413a6bd7..c674b3e5 100644 --- a/components/mobileshell/qml/actiondrawer/private/LandscapeContentContainer.qml +++ b/components/mobileshell/qml/actiondrawer/private/LandscapeContentContainer.qml @@ -6,7 +6,7 @@ import QtQuick.Controls as QQC2 import QtQuick.Layouts import QtQuick.Window -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents diff --git a/components/mobileshell/qml/actiondrawer/private/NotificationDrawer.qml b/components/mobileshell/qml/actiondrawer/private/NotificationDrawer.qml index 6407a618..290177f9 100644 --- a/components/mobileshell/qml/actiondrawer/private/NotificationDrawer.qml +++ b/components/mobileshell/qml/actiondrawer/private/NotificationDrawer.qml @@ -11,7 +11,7 @@ import QtQuick.Layouts 1.1 import org.kde.plasma.clock import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.private.mobileshell as MobileShell -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami Item { id: root diff --git a/components/mobileshell/qml/actiondrawer/private/PortraitContentContainer.qml b/components/mobileshell/qml/actiondrawer/private/PortraitContentContainer.qml index ad892d02..24ddcfde 100644 --- a/components/mobileshell/qml/actiondrawer/private/PortraitContentContainer.qml +++ b/components/mobileshell/qml/actiondrawer/private/PortraitContentContainer.qml @@ -8,7 +8,7 @@ import QtQuick.Window 2.2 import org.kde.plasma.private.mobileshell as MobileShell import org.kde.plasma.components 3.0 as PlasmaComponents -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell.quicksettingsplugin as QS /** diff --git a/components/mobileshell/qml/actiondrawer/private/QuickSettings.qml b/components/mobileshell/qml/actiondrawer/private/QuickSettings.qml index 29d41626..7f935712 100644 --- a/components/mobileshell/qml/actiondrawer/private/QuickSettings.qml +++ b/components/mobileshell/qml/actiondrawer/private/QuickSettings.qml @@ -14,7 +14,7 @@ import org.kde.plasma.private.mobileshell as MobileShell import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.private.mobileshell.quicksettingsplugin as QS -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami /** * Quick settings elements layout, change the height to clip. diff --git a/components/mobileshell/qml/actiondrawer/private/QuickSettingsDelegate.qml b/components/mobileshell/qml/actiondrawer/private/QuickSettingsDelegate.qml index 8c126c60..a98b3a0b 100644 --- a/components/mobileshell/qml/actiondrawer/private/QuickSettingsDelegate.qml +++ b/components/mobileshell/qml/actiondrawer/private/QuickSettingsDelegate.qml @@ -8,7 +8,7 @@ import QtQuick 2.1 import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.core as PlasmaCore import org.kde.plasma.private.nanoshell 2.0 as NanoShell diff --git a/components/mobileshell/qml/actiondrawer/private/QuickSettingsDrawer.qml b/components/mobileshell/qml/actiondrawer/private/QuickSettingsDrawer.qml index de09464c..2fc95e0b 100644 --- a/components/mobileshell/qml/actiondrawer/private/QuickSettingsDrawer.qml +++ b/components/mobileshell/qml/actiondrawer/private/QuickSettingsDrawer.qml @@ -5,7 +5,7 @@ import QtQuick import QtQuick.Controls as QQC2 import QtQuick.Layouts -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.ksvg 1.0 as KSvg import org.kde.plasma.core as PlasmaCore diff --git a/components/mobileshell/qml/actiondrawer/private/QuickSettingsFullDelegate.qml b/components/mobileshell/qml/actiondrawer/private/QuickSettingsFullDelegate.qml index 65397145..2f5e4efe 100644 --- a/components/mobileshell/qml/actiondrawer/private/QuickSettingsFullDelegate.qml +++ b/components/mobileshell/qml/actiondrawer/private/QuickSettingsFullDelegate.qml @@ -8,7 +8,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.core as PlasmaCore import org.kde.plasma.private.mobileshell as MobileShell diff --git a/components/mobileshell/qml/actiondrawer/private/QuickSettingsMinimizedDelegate.qml b/components/mobileshell/qml/actiondrawer/private/QuickSettingsMinimizedDelegate.qml index ff08519e..d9253311 100644 --- a/components/mobileshell/qml/actiondrawer/private/QuickSettingsMinimizedDelegate.qml +++ b/components/mobileshell/qml/actiondrawer/private/QuickSettingsMinimizedDelegate.qml @@ -7,7 +7,7 @@ import QtQuick 2.1 import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell as MobileShell import org.kde.plasma.core as PlasmaCore diff --git a/components/mobileshell/qml/actiondrawer/private/QuickSettingsPanel.qml b/components/mobileshell/qml/actiondrawer/private/QuickSettingsPanel.qml index e06a8512..9a19b0c1 100644 --- a/components/mobileshell/qml/actiondrawer/private/QuickSettingsPanel.qml +++ b/components/mobileshell/qml/actiondrawer/private/QuickSettingsPanel.qml @@ -6,7 +6,7 @@ import QtQuick.Controls as QQC2 import QtQuick.Layouts import QtQuick.Effects -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.ksvg 1.0 as KSvg import org.kde.plasma.private.mobileshell as MobileShell import org.kde.plasma.core as PlasmaCore diff --git a/components/mobileshell/qml/components/Constants.qml b/components/mobileshell/qml/components/Constants.qml index 9b0c9491..c06ba6a5 100644 --- a/components/mobileshell/qml/components/Constants.qml +++ b/components/mobileshell/qml/components/Constants.qml @@ -3,7 +3,7 @@ import QtQuick -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings import org.kde.plasma.private.mobileshell.state as MobileShellState diff --git a/components/mobileshell/qml/components/MarqueeLabel.qml b/components/mobileshell/qml/components/MarqueeLabel.qml index 0dede97b..0608d886 100644 --- a/components/mobileshell/qml/components/MarqueeLabel.qml +++ b/components/mobileshell/qml/components/MarqueeLabel.qml @@ -7,7 +7,7 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Effects -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PlasmaComponents import Qt5Compat.GraphicalEffects diff --git a/components/mobileshell/qml/components/PanelBackground.qml b/components/mobileshell/qml/components/PanelBackground.qml index d6110ea8..e505b264 100644 --- a/components/mobileshell/qml/components/PanelBackground.qml +++ b/components/mobileshell/qml/components/PanelBackground.qml @@ -3,7 +3,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami as Kirigami import QtQuick.Effects Item { diff --git a/components/mobileshell/qml/components/ScreenEdgeDragEffect.qml b/components/mobileshell/qml/components/ScreenEdgeDragEffect.qml index 219590de..115db92c 100644 --- a/components/mobileshell/qml/components/ScreenEdgeDragEffect.qml +++ b/components/mobileshell/qml/components/ScreenEdgeDragEffect.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts 1.1 import QtQuick.Window 2.15 import QtQuick.Shapes 1.8 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami Item { id: root diff --git a/components/mobileshell/qml/homescreen/WallpaperSelector.qml b/components/mobileshell/qml/homescreen/WallpaperSelector.qml index e7c09cea..7a769f06 100644 --- a/components/mobileshell/qml/homescreen/WallpaperSelector.qml +++ b/components/mobileshell/qml/homescreen/WallpaperSelector.qml @@ -7,7 +7,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls as Controls -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.wallpapers.image 2.0 as Wallpaper import org.kde.plasma.private.mobileshell.wallpaperimageplugin as WallpaperImagePlugin import org.kde.plasma.private.mobileshell as MobileShell diff --git a/components/mobileshell/qml/navigationpanel/NavigationPanel.qml b/components/mobileshell/qml/navigationpanel/NavigationPanel.qml index 77278eac..fcac9bbe 100644 --- a/components/mobileshell/qml/navigationpanel/NavigationPanel.qml +++ b/components/mobileshell/qml/navigationpanel/NavigationPanel.qml @@ -10,7 +10,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Effects -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.taskmanager 0.1 as TaskManager import org.kde.kquickcontrolsaddons 2.0 import org.kde.plasma.private.mobileshell.state as MobileShellState diff --git a/components/mobileshell/qml/navigationpanel/NavigationPanelButton.qml b/components/mobileshell/qml/navigationpanel/NavigationPanelButton.qml index 0b1e9e2e..a24c53a7 100644 --- a/components/mobileshell/qml/navigationpanel/NavigationPanelButton.qml +++ b/components/mobileshell/qml/navigationpanel/NavigationPanelButton.qml @@ -10,7 +10,7 @@ import QtQuick.Layouts import QtQuick.Controls as Controls import org.kde.plasma.core as PlasmaCore -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kquickcontrolsaddons 2.0 import org.kde.plasma.private.mobileshell as MobileShell diff --git a/components/mobileshell/qml/popups/actionbuttons/ActionButton.qml b/components/mobileshell/qml/popups/actionbuttons/ActionButton.qml index 60a5bd2b..2cba61a9 100644 --- a/components/mobileshell/qml/popups/actionbuttons/ActionButton.qml +++ b/components/mobileshell/qml/popups/actionbuttons/ActionButton.qml @@ -9,7 +9,7 @@ import QtQuick.Controls as Controls import QtQuick.Layouts import QtQuick.Effects -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell.state as MobileShellState import org.kde.plasma.private.mobileshell as MobileShell diff --git a/components/mobileshell/qml/popups/notifications/NotificationPopup.qml b/components/mobileshell/qml/popups/notifications/NotificationPopup.qml index fe0fd6e7..6b8e28a6 100644 --- a/components/mobileshell/qml/popups/notifications/NotificationPopup.qml +++ b/components/mobileshell/qml/popups/notifications/NotificationPopup.qml @@ -8,7 +8,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Window -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.private.mobileshell as MobileShell import org.kde.plasma.private.mobileshell.state as MobileShellState diff --git a/components/mobileshell/qml/popups/notifications/NotificationPopupManager.qml b/components/mobileshell/qml/popups/notifications/NotificationPopupManager.qml index 99a9e3c3..f0fc8ca1 100644 --- a/components/mobileshell/qml/popups/notifications/NotificationPopupManager.qml +++ b/components/mobileshell/qml/popups/notifications/NotificationPopupManager.qml @@ -8,7 +8,7 @@ import QtQuick 2.15 import QtQuick.Layouts import QtQuick.Window -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell as MobileShell import org.kde.plasma.private.mobileshell.state as MobileShellState diff --git a/components/mobileshell/qml/popups/volumeosd/AudioApplet.qml b/components/mobileshell/qml/popups/volumeosd/AudioApplet.qml index 8a8d50ef..30cedf63 100644 --- a/components/mobileshell/qml/popups/volumeosd/AudioApplet.qml +++ b/components/mobileshell/qml/popups/volumeosd/AudioApplet.qml @@ -10,7 +10,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls as Controls -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.kquickcontrolsaddons as KQCAddons import org.kde.plasma.private.mobileshell as MobileShell diff --git a/components/mobileshell/qml/popups/volumeosd/PopupCard.qml b/components/mobileshell/qml/popups/volumeosd/PopupCard.qml index 10448f19..11c98724 100644 --- a/components/mobileshell/qml/popups/volumeosd/PopupCard.qml +++ b/components/mobileshell/qml/popups/volumeosd/PopupCard.qml @@ -13,7 +13,7 @@ import QtQuick.Window import QtQuick.Effects import Qt5Compat.GraphicalEffects -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.ksvg 1.0 as KSvg import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.private.mobileshell as MobileShell diff --git a/components/mobileshell/qml/popups/volumeosd/VolumeChangedPopup.qml b/components/mobileshell/qml/popups/volumeosd/VolumeChangedPopup.qml index 931693b1..ab77a279 100644 --- a/components/mobileshell/qml/popups/volumeosd/VolumeChangedPopup.qml +++ b/components/mobileshell/qml/popups/volumeosd/VolumeChangedPopup.qml @@ -9,7 +9,7 @@ import QtQuick.Controls as Controls import QtQuick.Layouts import QtQuick.Window -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.private.mobileshell as MobileShell import org.kde.plasma.private.mobileshell.state as MobileShellState diff --git a/components/mobileshell/qml/popups/volumeosd/VolumeOSD.qml b/components/mobileshell/qml/popups/volumeosd/VolumeOSD.qml index ac503ef8..3e78b46a 100644 --- a/components/mobileshell/qml/popups/volumeosd/VolumeOSD.qml +++ b/components/mobileshell/qml/popups/volumeosd/VolumeOSD.qml @@ -11,7 +11,7 @@ import QtQuick.Controls as Controls import QtQuick.Layouts import QtQuick.Window -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.private.mobileshell as MobileShell import org.kde.plasma.private.mobileshell.state as MobileShellState diff --git a/components/mobileshell/qml/statusbar/indicators/BatteryIndicator.qml b/components/mobileshell/qml/statusbar/indicators/BatteryIndicator.qml index fb26fdbb..66aff7c6 100644 --- a/components/mobileshell/qml/statusbar/indicators/BatteryIndicator.qml +++ b/components/mobileshell/qml/statusbar/indicators/BatteryIndicator.qml @@ -9,7 +9,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.4 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kitemmodels import org.kde.plasma.components 3.0 as PlasmaComponents diff --git a/components/mobileshell/qml/statusbar/indicators/BluetoothIndicator.qml b/components/mobileshell/qml/statusbar/indicators/BluetoothIndicator.qml index 2321d21c..279dd96b 100644 --- a/components/mobileshell/qml/statusbar/indicators/BluetoothIndicator.qml +++ b/components/mobileshell/qml/statusbar/indicators/BluetoothIndicator.qml @@ -9,7 +9,7 @@ import QtQuick import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell as MobileShell Kirigami.Icon { diff --git a/components/mobileshell/qml/widgets/krunner/KRunnerScreen.qml b/components/mobileshell/qml/widgets/krunner/KRunnerScreen.qml index 8cbc442b..65320b3f 100644 --- a/components/mobileshell/qml/widgets/krunner/KRunnerScreen.qml +++ b/components/mobileshell/qml/widgets/krunner/KRunnerScreen.qml @@ -16,7 +16,7 @@ import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.milou as Milou -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami MouseArea { id: root diff --git a/components/mobileshell/qml/widgets/mediacontrols/BlurredBackground.qml b/components/mobileshell/qml/widgets/mediacontrols/BlurredBackground.qml index bbaf882e..1fece6de 100644 --- a/components/mobileshell/qml/widgets/mediacontrols/BlurredBackground.qml +++ b/components/mobileshell/qml/widgets/mediacontrols/BlurredBackground.qml @@ -5,7 +5,7 @@ import QtQuick import QtQuick.Effects import Qt5Compat.GraphicalEffects -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami Item { id: root diff --git a/components/mobileshell/qml/widgets/notifications/NotificationCard.qml b/components/mobileshell/qml/widgets/notifications/NotificationCard.qml index 87b88b46..6c0e4a39 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationCard.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationCard.qml @@ -6,7 +6,7 @@ import QtQuick.Effects import QtQuick.Controls import Qt5Compat.GraphicalEffects -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.private.mobileshell as MobileShell diff --git a/components/mobileshell/qml/widgets/notifications/NotificationFooterActions.qml b/components/mobileshell/qml/widgets/notifications/NotificationFooterActions.qml index 80b06c5f..afc00c1d 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationFooterActions.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationFooterActions.qml @@ -8,7 +8,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PlasmaComponents Item { diff --git a/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml b/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml index 895e654e..3205eeb6 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml @@ -9,7 +9,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents diff --git a/components/mobileshell/qml/widgets/notifications/NotificationItem.qml b/components/mobileshell/qml/widgets/notifications/NotificationItem.qml index 09ef1677..3c707819 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationItem.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationItem.qml @@ -15,7 +15,7 @@ import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.notificationmanager as NotificationManager -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.coreaddons 1.0 as KCoreAddons diff --git a/components/mobileshell/qml/widgets/notifications/NotificationJobDetails.qml b/components/mobileshell/qml/widgets/notifications/NotificationJobDetails.qml index 89a96d4b..a7f82d2b 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationJobDetails.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationJobDetails.qml @@ -6,7 +6,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.1 import org.kde.plasma.extras 2.0 as PlasmaExtras -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.coreaddons 1.0 as KCoreAddons diff --git a/components/mobileshell/qml/widgets/notifications/NotificationJobItem.qml b/components/mobileshell/qml/widgets/notifications/NotificationJobItem.qml index 138f049c..914146cf 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationJobItem.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationJobItem.qml @@ -8,7 +8,7 @@ import QtQuick.Layouts 1.1 import QtQml 2.15 import org.kde.plasma.components 3.0 as PlasmaComponents3 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell as MobileShell import org.kde.notificationmanager as NotificationManager diff --git a/components/mobileshell/qml/widgets/notifications/NotificationPopupItem.qml b/components/mobileshell/qml/widgets/notifications/NotificationPopupItem.qml index af8e194a..0e769074 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationPopupItem.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationPopupItem.qml @@ -15,7 +15,7 @@ import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.notificationmanager as NotificationManager -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.coreaddons 1.0 as KCoreAddons diff --git a/components/mobileshell/qml/widgets/notifications/NotificationReplyField.qml b/components/mobileshell/qml/widgets/notifications/NotificationReplyField.qml index 6566302f..b8813280 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationReplyField.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationReplyField.qml @@ -8,7 +8,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PlasmaComponents3 RowLayout { diff --git a/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml b/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml index d489b9d2..6caa9e4c 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml @@ -10,7 +10,7 @@ import QtQuick.Layouts 1.15 import QtQuick.Window 2.2 import Qt5Compat.GraphicalEffects -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.clock import org.kde.plasma.private.mobileshell as MobileShell diff --git a/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml b/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml index 0e82662b..89125912 100644 --- a/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml +++ b/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml @@ -8,7 +8,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Effects -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents3 import org.kde.plasma.private.mobileshell as MobileShell diff --git a/containments/homescreens/folio/qml/DelegateDragItem.qml b/containments/homescreens/folio/qml/DelegateDragItem.qml index 59e7c8b0..2d381d81 100644 --- a/containments/homescreens/folio/qml/DelegateDragItem.qml +++ b/containments/homescreens/folio/qml/DelegateDragItem.qml @@ -4,7 +4,7 @@ import QtQuick import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio import org.kde.plasma.private.mobileshell as MobileShell diff --git a/containments/homescreens/folio/qml/FavouritesBar.qml b/containments/homescreens/folio/qml/FavouritesBar.qml index 2be9b087..810e4f40 100644 --- a/containments/homescreens/folio/qml/FavouritesBar.qml +++ b/containments/homescreens/folio/qml/FavouritesBar.qml @@ -9,7 +9,7 @@ import org.kde.plasma.components 3.0 as PC3 import org.kde.plasma.private.mobileshell.state as MobileShellState import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio import org.kde.plasma.private.mobileshell as MobileShell -import org.kde.kirigami 2.10 as Kirigami +import org.kde.kirigami as Kirigami import "./private" import "./delegate" diff --git a/containments/homescreens/folio/qml/FolderView.qml b/containments/homescreens/folio/qml/FolderView.qml index f4aefef8..53576deb 100644 --- a/containments/homescreens/folio/qml/FolderView.qml +++ b/containments/homescreens/folio/qml/FolderView.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts import QtQuick.Effects import QtQuick.Controls as QQC2 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell as MobileShell import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio diff --git a/containments/homescreens/folio/qml/FolderViewTitle.qml b/containments/homescreens/folio/qml/FolderViewTitle.qml index 6bc8d645..ddb3627c 100644 --- a/containments/homescreens/folio/qml/FolderViewTitle.qml +++ b/containments/homescreens/folio/qml/FolderViewTitle.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts import QtQuick.Effects import QtQuick.Controls as QQC2 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell as MobileShell import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio diff --git a/containments/homescreens/folio/qml/FolioHomeScreen.qml b/containments/homescreens/folio/qml/FolioHomeScreen.qml index 2b11977c..2f09b6f8 100644 --- a/containments/homescreens/folio/qml/FolioHomeScreen.qml +++ b/containments/homescreens/folio/qml/FolioHomeScreen.qml @@ -7,7 +7,7 @@ import QtQuick.Layouts import QtQuick.Effects import QtQuick.Controls as QQC2 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.components 3.0 as PC3 diff --git a/containments/homescreens/folio/qml/HomeScreenPages.qml b/containments/homescreens/folio/qml/HomeScreenPages.qml index 7cd617fe..773d878f 100644 --- a/containments/homescreens/folio/qml/HomeScreenPages.qml +++ b/containments/homescreens/folio/qml/HomeScreenPages.qml @@ -7,7 +7,7 @@ import QtQuick.Layouts import org.kde.plasma.components 3.0 as PC3 import org.kde.plasma.private.mobileshell as MobileShell -import org.kde.kirigami 2.10 as Kirigami +import org.kde.kirigami as Kirigami import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio MouseArea { diff --git a/containments/homescreens/folio/qml/PlaceholderDelegate.qml b/containments/homescreens/folio/qml/PlaceholderDelegate.qml index 12acbccf..3c8cc988 100644 --- a/containments/homescreens/folio/qml/PlaceholderDelegate.qml +++ b/containments/homescreens/folio/qml/PlaceholderDelegate.qml @@ -5,7 +5,7 @@ import QtQuick import QtQuick.Layouts import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio -import org.kde.kirigami 2.10 as Kirigami +import org.kde.kirigami as Kirigami import "./delegate" diff --git a/containments/homescreens/folio/qml/delegate/AbstractDelegate.qml b/containments/homescreens/folio/qml/delegate/AbstractDelegate.qml index 40ee986c..01f23af3 100644 --- a/containments/homescreens/folio/qml/delegate/AbstractDelegate.qml +++ b/containments/homescreens/folio/qml/delegate/AbstractDelegate.qml @@ -7,7 +7,7 @@ import QtQuick.Controls 2.3 as Controls import Qt5Compat.GraphicalEffects import QtQuick.Effects -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kquickcontrolsaddons 2.0 diff --git a/containments/homescreens/folio/qml/delegate/AppDelegate.qml b/containments/homescreens/folio/qml/delegate/AppDelegate.qml index 08bb00da..45232a36 100644 --- a/containments/homescreens/folio/qml/delegate/AppDelegate.qml +++ b/containments/homescreens/folio/qml/delegate/AppDelegate.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts import QtQuick.Controls as Controls import QtQuick.Effects -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio import org.kde.plasma.private.mobileshell.state as MobileShellState diff --git a/containments/homescreens/folio/qml/delegate/DelegateAppIcon.qml b/containments/homescreens/folio/qml/delegate/DelegateAppIcon.qml index bf162046..9e01dab4 100644 --- a/containments/homescreens/folio/qml/delegate/DelegateAppIcon.qml +++ b/containments/homescreens/folio/qml/delegate/DelegateAppIcon.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts import QtQuick.Controls as Controls import QtQuick.Effects -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio diff --git a/containments/homescreens/folio/qml/delegate/DelegateFolderIcon.qml b/containments/homescreens/folio/qml/delegate/DelegateFolderIcon.qml index 80c7541a..f7e5d5fe 100644 --- a/containments/homescreens/folio/qml/delegate/DelegateFolderIcon.qml +++ b/containments/homescreens/folio/qml/delegate/DelegateFolderIcon.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts import QtQuick.Controls as Controls import QtQuick.Effects -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio import org.kde.plasma.private.mobileshell as MobileShell diff --git a/containments/homescreens/folio/qml/delegate/DelegateIconLoader.qml b/containments/homescreens/folio/qml/delegate/DelegateIconLoader.qml index 8ec41cd8..367b4a34 100644 --- a/containments/homescreens/folio/qml/delegate/DelegateIconLoader.qml +++ b/containments/homescreens/folio/qml/delegate/DelegateIconLoader.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts import QtQuick.Controls as Controls import QtQuick.Effects -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio import org.kde.plasma.private.mobileshell as MobileShell diff --git a/containments/homescreens/folio/qml/delegate/DelegateLabel.qml b/containments/homescreens/folio/qml/delegate/DelegateLabel.qml index 28ddef0d..1f4ce954 100644 --- a/containments/homescreens/folio/qml/delegate/DelegateLabel.qml +++ b/containments/homescreens/folio/qml/delegate/DelegateLabel.qml @@ -4,7 +4,7 @@ import QtQuick import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PC3 import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio diff --git a/containments/homescreens/folio/qml/main.qml b/containments/homescreens/folio/qml/main.qml index e1c24f63..85721c6d 100644 --- a/containments/homescreens/folio/qml/main.qml +++ b/containments/homescreens/folio/qml/main.qml @@ -7,7 +7,7 @@ import QtQuick.Layouts import QtQuick.Effects import Qt5Compat.GraphicalEffects -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.components 3.0 as PlasmaComponents diff --git a/containments/homescreens/folio/qml/private/ContextMenuLoader.qml b/containments/homescreens/folio/qml/private/ContextMenuLoader.qml index b039b409..434f3a19 100644 --- a/containments/homescreens/folio/qml/private/ContextMenuLoader.qml +++ b/containments/homescreens/folio/qml/private/ContextMenuLoader.qml @@ -6,7 +6,7 @@ import QtQuick.Window import QtQuick.Layouts import org.kde.plasma.components 3.0 as PC3 -import org.kde.kirigami 2.10 as Kirigami +import org.kde.kirigami as Kirigami Loader { id: root diff --git a/containments/homescreens/folio/qml/settings/SettingsComponent.qml b/containments/homescreens/folio/qml/settings/SettingsComponent.qml index 7eb34701..ea654f96 100644 --- a/containments/homescreens/folio/qml/settings/SettingsComponent.qml +++ b/containments/homescreens/folio/qml/settings/SettingsComponent.qml @@ -6,7 +6,7 @@ import QtQuick.Window import QtQuick.Layouts import QtQuick.Controls as QQC2 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PC3 import org.kde.plasma.private.mobileshell as MobileShell diff --git a/containments/homescreens/halcyon/qml/Clock.qml b/containments/homescreens/halcyon/qml/Clock.qml index d1906992..eb87314e 100644 --- a/containments/homescreens/halcyon/qml/Clock.qml +++ b/containments/homescreens/halcyon/qml/Clock.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts import QtQuick.Controls import org.kde.plasma.clock -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell as MobileShell diff --git a/containments/homescreens/halcyon/qml/FavoritesAppDelegate.qml b/containments/homescreens/halcyon/qml/FavoritesAppDelegate.qml index c552a3f4..9cc4d341 100644 --- a/containments/homescreens/halcyon/qml/FavoritesAppDelegate.qml +++ b/containments/homescreens/halcyon/qml/FavoritesAppDelegate.qml @@ -16,7 +16,7 @@ import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings import org.kde.plasma.private.mobileshell.state as MobileShellState import org.kde.plasma.plasmoid -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami Item { id: delegate diff --git a/containments/homescreens/halcyon/qml/FavoritesView.qml b/containments/homescreens/halcyon/qml/FavoritesView.qml index b22fa930..42da1390 100644 --- a/containments/homescreens/halcyon/qml/FavoritesView.qml +++ b/containments/homescreens/halcyon/qml/FavoritesView.qml @@ -9,7 +9,7 @@ import QtQml.Models 2.15 import org.kde.plasma.components 3.0 as PC3 import org.kde.draganddrop 2.0 as DragDrop -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell as MobileShell import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings diff --git a/containments/homescreens/halcyon/qml/GridAppList.qml b/containments/homescreens/halcyon/qml/GridAppList.qml index 931b9fe2..6fb5ccb8 100644 --- a/containments/homescreens/halcyon/qml/GridAppList.qml +++ b/containments/homescreens/halcyon/qml/GridAppList.qml @@ -8,7 +8,7 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls 2.15 as Controls import org.kde.plasma.components 3.0 as PC3 -import org.kde.kirigami 2.10 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell as MobileShell import org.kde.plasma.private.mobileshell.state as MobileShellState diff --git a/containments/homescreens/halcyon/qml/main.qml b/containments/homescreens/halcyon/qml/main.qml index 38840637..e5424f03 100644 --- a/containments/homescreens/halcyon/qml/main.qml +++ b/containments/homescreens/halcyon/qml/main.qml @@ -7,7 +7,7 @@ import QtQuick.Layouts import org.kde.plasma.plasmoid import org.kde.plasma.components 3.0 as PlasmaComponents -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell as MobileShell import org.kde.plasma.private.mobileshell.state as MobileShellState diff --git a/containments/homescreens/halcyon/qml/settings/SettingsScreen.qml b/containments/homescreens/halcyon/qml/settings/SettingsScreen.qml index 6b5c64e3..0736caf4 100644 --- a/containments/homescreens/halcyon/qml/settings/SettingsScreen.qml +++ b/containments/homescreens/halcyon/qml/settings/SettingsScreen.qml @@ -6,7 +6,7 @@ import QtQuick.Window import QtQuick.Layouts import QtQuick.Controls as QQC2 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PC3 import org.kde.plasma.private.mobileshell as MobileShell diff --git a/containments/taskpanel/qml/GesturePanelComponent.qml b/containments/taskpanel/qml/GesturePanelComponent.qml index dc1c79d9..57e48354 100644 --- a/containments/taskpanel/qml/GesturePanelComponent.qml +++ b/containments/taskpanel/qml/GesturePanelComponent.qml @@ -4,7 +4,7 @@ import QtQuick -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.plasmoid diff --git a/containments/taskpanel/qml/main.qml b/containments/taskpanel/qml/main.qml index a6117389..994621e6 100644 --- a/containments/taskpanel/qml/main.qml +++ b/containments/taskpanel/qml/main.qml @@ -7,7 +7,7 @@ import QtQuick.Layouts 1.1 import QtQuick.Window 2.15 import QtQuick.Shapes 1.8 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.taskmanager 0.1 as TaskManager import org.kde.plasma.plasmoid 2.0 diff --git a/initialstart/modules/cellular/package/contents/ui/EditProfileDialog.qml b/initialstart/modules/cellular/package/contents/ui/EditProfileDialog.qml index 6b9fb15f..697c7e2e 100644 --- a/initialstart/modules/cellular/package/contents/ui/EditProfileDialog.qml +++ b/initialstart/modules/cellular/package/contents/ui/EditProfileDialog.qml @@ -5,7 +5,7 @@ import QtQuick 2.12 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.12 as Controls -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.networkmanagement.cellular as Cellular diff --git a/initialstart/modules/finished/contents/ui/main.qml b/initialstart/modules/finished/contents/ui/main.qml index eebdaed1..28b88669 100644 --- a/initialstart/modules/finished/contents/ui/main.qml +++ b/initialstart/modules/finished/contents/ui/main.qml @@ -5,7 +5,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.mobileinitialstart.initialstart diff --git a/initialstart/modules/prepare/package/contents/ui/main.qml b/initialstart/modules/prepare/package/contents/ui/main.qml index ba6718ea..2c1ee238 100644 --- a/initialstart/modules/prepare/package/contents/ui/main.qml +++ b/initialstart/modules/prepare/package/contents/ui/main.qml @@ -5,7 +5,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kirigamiaddons.formcard 1.0 as FormCard import org.kde.plasma.mobileinitialstart.prepare 1.0 as Prepare import org.kde.plasma.private.mobileshell.screenbrightnessplugin as ScreenBrightness @@ -145,4 +145,4 @@ InitialStartModule { } } } -} \ No newline at end of file +} diff --git a/initialstart/modules/time/package/contents/ui/main.qml b/initialstart/modules/time/package/contents/ui/main.qml index ef2cf0f2..00233c1d 100644 --- a/initialstart/modules/time/package/contents/ui/main.qml +++ b/initialstart/modules/time/package/contents/ui/main.qml @@ -5,7 +5,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kirigamiaddons.formcard 1.0 as FormCard import org.kde.plasma.mobileinitialstart.time 1.0 as Time diff --git a/initialstart/modules/wifi/package/contents/ui/PasswordField.qml b/initialstart/modules/wifi/package/contents/ui/PasswordField.qml index 4f442178..5aa2b563 100644 --- a/initialstart/modules/wifi/package/contents/ui/PasswordField.qml +++ b/initialstart/modules/wifi/package/contents/ui/PasswordField.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL import QtQuick 2.15 -import org.kde.kirigami 2.10 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.networkmanagement as PlasmaNM Kirigami.PasswordField { diff --git a/initialstart/modules/wifi/package/contents/ui/main.qml b/initialstart/modules/wifi/package/contents/ui/main.qml index 8c14e344..b6333834 100644 --- a/initialstart/modules/wifi/package/contents/ui/main.qml +++ b/initialstart/modules/wifi/package/contents/ui/main.qml @@ -6,7 +6,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kirigamiaddons.formcard 1.0 as FormCard import org.kde.plasma.networkmanagement as PlasmaNM import org.kde.plasma.mobileinitialstart.wifi 1.0 as WiFi @@ -130,4 +130,4 @@ InitialStartModule { } } } -} \ No newline at end of file +} diff --git a/initialstart/qml/LandingComponent.qml b/initialstart/qml/LandingComponent.qml index a908c393..8e978e62 100644 --- a/initialstart/qml/LandingComponent.qml +++ b/initialstart/qml/LandingComponent.qml @@ -6,7 +6,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.mobileinitialstart.initialstart import org.kde.plasma.mobileinitialstart.prepare 1.0 as Prepare diff --git a/initialstart/qml/Main.qml b/initialstart/qml/Main.qml index 2c161819..4386d97a 100644 --- a/initialstart/qml/Main.qml +++ b/initialstart/qml/Main.qml @@ -5,7 +5,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import initialstart 1.0 as InitialStart diff --git a/kcms/info/ui/main.qml b/kcms/info/ui/main.qml index 15dab334..24e46131 100644 --- a/kcms/info/ui/main.qml +++ b/kcms/info/ui/main.qml @@ -9,7 +9,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.2 as Controls import org.kde.kcmutils as KCM -import org.kde.kirigami 2.10 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kirigamiaddons.formcard 1 as FormCard KCM.SimpleKCM { diff --git a/kcms/mobileshell/ui/QuickSettingsForm.qml b/kcms/mobileshell/ui/QuickSettingsForm.qml index b10961a9..787571d5 100644 --- a/kcms/mobileshell/ui/QuickSettingsForm.qml +++ b/kcms/mobileshell/ui/QuickSettingsForm.qml @@ -7,7 +7,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 as QQC2 -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kcmutils as KCM import org.kde.kirigamiaddons.formcard as FormCard import org.kde.plasma.private.mobileshell.quicksettingsplugin as QS diff --git a/kcms/mobileshell/ui/main.qml b/kcms/mobileshell/ui/main.qml index 4ece9ec7..8ad07d0d 100644 --- a/kcms/mobileshell/ui/main.qml +++ b/kcms/mobileshell/ui/main.qml @@ -7,7 +7,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 as QQC2 -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kcmutils as KCM import org.kde.kirigamiaddons.formcard 1.0 as FormCard import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings diff --git a/kcms/navigation/ui/AnimationHandler.qml b/kcms/navigation/ui/AnimationHandler.qml index a57079f4..c610fa07 100644 --- a/kcms/navigation/ui/AnimationHandler.qml +++ b/kcms/navigation/ui/AnimationHandler.qml @@ -6,7 +6,7 @@ pragma ComponentBehavior: Bound import QtQuick import QtQuick.Layouts -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami Item { id: root diff --git a/kcms/navigation/ui/TutorialPhone.qml b/kcms/navigation/ui/TutorialPhone.qml index e0203fd7..52014b70 100644 --- a/kcms/navigation/ui/TutorialPhone.qml +++ b/kcms/navigation/ui/TutorialPhone.qml @@ -7,7 +7,7 @@ import QtQuick import QtQuick.Layouts import org.kde.plasma.components 3.0 as PlasmaComponents -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami Item { id: root diff --git a/kcms/navigation/ui/main.qml b/kcms/navigation/ui/main.qml index 0c2dd39a..64ec62a8 100644 --- a/kcms/navigation/ui/main.qml +++ b/kcms/navigation/ui/main.qml @@ -8,7 +8,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 as Controls -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kcmutils as KCM import org.kde.kirigamiaddons.formcard 1.0 as FormCard import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings diff --git a/kcms/time/ui/TimePickerSpinBoxButton.qml b/kcms/time/ui/TimePickerSpinBoxButton.qml index c9792180..d2707046 100644 --- a/kcms/time/ui/TimePickerSpinBoxButton.qml +++ b/kcms/time/ui/TimePickerSpinBoxButton.qml @@ -3,7 +3,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 as QQC2 -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami QQC2.Button { id: root diff --git a/kcms/waydroidintegration/ui/WaydroidApplicationsPage.qml b/kcms/waydroidintegration/ui/WaydroidApplicationsPage.qml index d3fcca32..7ee54b11 100644 --- a/kcms/waydroidintegration/ui/WaydroidApplicationsPage.qml +++ b/kcms/waydroidintegration/ui/WaydroidApplicationsPage.qml @@ -8,7 +8,7 @@ import QtQuick.Layouts import QtQuick.Controls as QQC2 import QtQuick.Dialogs -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kcmutils as KCM import org.kde.kirigamiaddons.formcard 1.0 as FormCard import org.kde.plasma.components 3.0 as PC3 diff --git a/kcms/waydroidintegration/ui/WaydroidConfigurationForm.qml b/kcms/waydroidintegration/ui/WaydroidConfigurationForm.qml index 8f1370ae..88b51696 100644 --- a/kcms/waydroidintegration/ui/WaydroidConfigurationForm.qml +++ b/kcms/waydroidintegration/ui/WaydroidConfigurationForm.qml @@ -7,7 +7,7 @@ import QtQuick import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 as QQC2 -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kirigamiaddons.formcard 1.0 as FormCard import org.kde.plasma.components 3.0 as PC3 import org.kde.plasma.private.mobileshell.waydroidintegrationplugin as AIP diff --git a/kcms/waydroidintegration/ui/WaydroidDownloadStatus.qml b/kcms/waydroidintegration/ui/WaydroidDownloadStatus.qml index b922d07d..0db76c4c 100644 --- a/kcms/waydroidintegration/ui/WaydroidDownloadStatus.qml +++ b/kcms/waydroidintegration/ui/WaydroidDownloadStatus.qml @@ -7,7 +7,7 @@ import QtQuick import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 as QQC2 -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PC3 ColumnLayout { @@ -50,4 +50,4 @@ ColumnLayout { return i18n("%1kB/s", speed.toFixed(0)) } } -} \ No newline at end of file +} diff --git a/kcms/waydroidintegration/ui/WaydroidErrorPage.qml b/kcms/waydroidintegration/ui/WaydroidErrorPage.qml index f0b4eb59..4eff949f 100644 --- a/kcms/waydroidintegration/ui/WaydroidErrorPage.qml +++ b/kcms/waydroidintegration/ui/WaydroidErrorPage.qml @@ -7,7 +7,7 @@ import QtQuick import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 as QQC2 -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PC3 ColumnLayout { diff --git a/kcms/waydroidintegration/ui/WaydroidGooglePlayProtectConfigurationPage.qml b/kcms/waydroidintegration/ui/WaydroidGooglePlayProtectConfigurationPage.qml index 564ec1ad..1087bcb4 100644 --- a/kcms/waydroidintegration/ui/WaydroidGooglePlayProtectConfigurationPage.qml +++ b/kcms/waydroidintegration/ui/WaydroidGooglePlayProtectConfigurationPage.qml @@ -7,7 +7,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls as QQC2 -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kcmutils as KCM import org.kde.kirigamiaddons.formcard 1.0 as FormCard import org.kde.plasma.private.mobileshell.waydroidintegrationplugin as AIP @@ -76,4 +76,4 @@ KCM.SimpleKCM { } } } -} \ No newline at end of file +} diff --git a/kcms/waydroidintegration/ui/WaydroidInitialConfigurationForm.qml b/kcms/waydroidintegration/ui/WaydroidInitialConfigurationForm.qml index 35fbb440..548e68f1 100644 --- a/kcms/waydroidintegration/ui/WaydroidInitialConfigurationForm.qml +++ b/kcms/waydroidintegration/ui/WaydroidInitialConfigurationForm.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 as QQC2 -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kirigamiaddons.formcard 1.0 as FormCard import org.kde.plasma.components 3.0 as PC3 import org.kde.plasma.private.mobileshell.waydroidintegrationplugin as AIP @@ -38,4 +38,4 @@ ColumnLayout { onClicked: AIP.WaydroidDBusClient.initialize(systemType.currentValue, AIP.WaydroidDBusClient.Lineage) } -} \ No newline at end of file +} diff --git a/kcms/waydroidintegration/ui/WaydroidLoader.qml b/kcms/waydroidintegration/ui/WaydroidLoader.qml index 863fbf28..84a27978 100644 --- a/kcms/waydroidintegration/ui/WaydroidLoader.qml +++ b/kcms/waydroidintegration/ui/WaydroidLoader.qml @@ -7,7 +7,7 @@ import QtQuick import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 as QQC2 -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PC3 ColumnLayout { @@ -31,4 +31,4 @@ ColumnLayout { horizontalAlignment: Text.AlignHCenter Layout.alignment: Qt.AlignHCenter } -} \ No newline at end of file +} diff --git a/kcms/waydroidintegration/ui/main.qml b/kcms/waydroidintegration/ui/main.qml index 4ac62514..6e5b618a 100644 --- a/kcms/waydroidintegration/ui/main.qml +++ b/kcms/waydroidintegration/ui/main.qml @@ -7,7 +7,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 as QQC2 -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kcmutils as KCM import org.kde.kirigamiaddons.formcard 1.0 as FormCard import org.kde.plasma.components 3.0 as PC3 diff --git a/kwin/mobiletaskswitcher/package/contents/ui/Task.qml b/kwin/mobiletaskswitcher/package/contents/ui/Task.qml index b9c45b7a..c2c33995 100644 --- a/kwin/mobiletaskswitcher/package/contents/ui/Task.qml +++ b/kwin/mobiletaskswitcher/package/contents/ui/Task.qml @@ -8,7 +8,7 @@ pragma ComponentBehavior: Bound import QtQuick import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.kwin 3.0 as KWinComponents diff --git a/kwin/mobiletaskswitcher/package/contents/ui/TaskList.qml b/kwin/mobiletaskswitcher/package/contents/ui/TaskList.qml index 8b74aa93..812bee5d 100644 --- a/kwin/mobiletaskswitcher/package/contents/ui/TaskList.qml +++ b/kwin/mobiletaskswitcher/package/contents/ui/TaskList.qml @@ -7,7 +7,7 @@ pragma ComponentBehavior: Bound import QtQuick import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.kwin 3.0 as KWinComponents diff --git a/kwin/mobiletaskswitcher/package/contents/ui/TaskSwitcher.qml b/kwin/mobiletaskswitcher/package/contents/ui/TaskSwitcher.qml index 9188e9df..e6146392 100644 --- a/kwin/mobiletaskswitcher/package/contents/ui/TaskSwitcher.qml +++ b/kwin/mobiletaskswitcher/package/contents/ui/TaskSwitcher.qml @@ -8,7 +8,7 @@ pragma ComponentBehavior: Bound import QtQuick import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.private.mobileshell as MobileShell diff --git a/kwin/mobiletaskswitcher/package/contents/ui/TaskSwitcherHelpers.qml b/kwin/mobiletaskswitcher/package/contents/ui/TaskSwitcherHelpers.qml index 678b5aeb..0ae14159 100644 --- a/kwin/mobiletaskswitcher/package/contents/ui/TaskSwitcherHelpers.qml +++ b/kwin/mobiletaskswitcher/package/contents/ui/TaskSwitcherHelpers.qml @@ -6,7 +6,7 @@ pragma ComponentBehavior: Bound import QtQuick 2.15 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell.taskswitcherplugin as TaskSwitcherPlugin import org.kde.kwin 3.0 as KWinComponents diff --git a/lookandfeel/contents/logout/ActionButton.qml b/lookandfeel/contents/logout/ActionButton.qml index 7b560950..87bdbb8d 100644 --- a/lookandfeel/contents/logout/ActionButton.qml +++ b/lookandfeel/contents/logout/ActionButton.qml @@ -9,7 +9,7 @@ import QtQuick 2.8 import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents3 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami Item { id: root diff --git a/lookandfeel/contents/logout/Logout.qml b/lookandfeel/contents/logout/Logout.qml index 1bc0e7da..090b44a1 100644 --- a/lookandfeel/contents/logout/Logout.qml +++ b/lookandfeel/contents/logout/Logout.qml @@ -11,7 +11,7 @@ import QtQuick 2.12 import QtQuick.Layouts 1.12 import QtQuick.Controls 2.8 as Controls -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.coreaddons 1.0 as KCoreAddons import org.kde.plasma.private.sessions 2.0 diff --git a/shell/contents/applet/AppletError.qml b/shell/contents/applet/AppletError.qml index cd391065..25b74dad 100644 --- a/shell/contents/applet/AppletError.qml +++ b/shell/contents/applet/AppletError.qml @@ -14,7 +14,7 @@ import QtQuick.Window 2.15 import QtQuick.Controls 2.15 as QQC2 import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PC3 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.plasmoid 2.0 PlasmoidItem { diff --git a/shell/contents/applet/CompactApplet.qml b/shell/contents/applet/CompactApplet.qml index 3a00d237..f57f9e4e 100644 --- a/shell/contents/applet/CompactApplet.qml +++ b/shell/contents/applet/CompactApplet.qml @@ -12,7 +12,7 @@ import org.kde.ksvg 1.0 as KSvg import org.kde.kquickcontrolsaddons 2.0 import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.private.nanoshell 2.0 as NanoShell -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami Item { id: root diff --git a/shell/contents/applet/DefaultCompactRepresentation.qml b/shell/contents/applet/DefaultCompactRepresentation.qml index 488378bf..1f8324ad 100644 --- a/shell/contents/applet/DefaultCompactRepresentation.qml +++ b/shell/contents/applet/DefaultCompactRepresentation.qml @@ -13,7 +13,7 @@ import QtQuick.Layouts 1.15 import org.kde.plasma.core as PlasmaCore import org.kde.plasma.plasmoid 2.0 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami Kirigami.Icon { property PlasmoidItem plasmoidItem diff --git a/shell/contents/configuration/AppletConfiguration.qml b/shell/contents/configuration/AppletConfiguration.qml index 2d3f32da..256cf2ab 100644 --- a/shell/contents/configuration/AppletConfiguration.qml +++ b/shell/contents/configuration/AppletConfiguration.qml @@ -8,7 +8,7 @@ import QtQuick.Layouts 1.15 import QtQuick.Window 2.15 import org.kde.plasma.plasmoid -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.configuration 2.0 import org.kde.kitemmodels 1.0 as KItemModels diff --git a/shell/contents/configuration/ContainmentConfiguration.qml b/shell/contents/configuration/ContainmentConfiguration.qml index 9d87f62f..bf5b1dff 100644 --- a/shell/contents/configuration/ContainmentConfiguration.qml +++ b/shell/contents/configuration/ContainmentConfiguration.qml @@ -7,7 +7,7 @@ import QtQuick.Layouts 1.0 import QtQuick.Window 2.2 import QtQuick.Controls 2.15 as Controls -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PlasmaComponents3 import org.kde.plasma.core as PlasmaCore import org.kde.plasma.configuration 2.0 diff --git a/shell/contents/configuration/private/ChangeWallpaperModule.qml b/shell/contents/configuration/private/ChangeWallpaperModule.qml index 02d4b1a1..2f27550a 100644 --- a/shell/contents/configuration/private/ChangeWallpaperModule.qml +++ b/shell/contents/configuration/private/ChangeWallpaperModule.qml @@ -9,7 +9,7 @@ import QtQuick.Layouts 1.15 import org.kde.plasma.plasmoid import org.kde.newstuff 1.62 as NewStuff -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.kirigamiaddons.formcard 1.0 as FormCard ColumnLayout { diff --git a/shell/contents/configuration/private/ConfigurationAppletPage.qml b/shell/contents/configuration/private/ConfigurationAppletPage.qml index 5dde6d37..6b96e241 100644 --- a/shell/contents/configuration/private/ConfigurationAppletPage.qml +++ b/shell/contents/configuration/private/ConfigurationAppletPage.qml @@ -4,7 +4,7 @@ import QtQuick 2.0 import org.kde.plasma.plasmoid -import org.kde.kirigami 2.10 as Kirigami +import org.kde.kirigami as Kirigami Kirigami.Page { id: root diff --git a/shell/contents/configuration/private/ConfigurationKcmPage.qml b/shell/contents/configuration/private/ConfigurationKcmPage.qml index a5851a91..deb15089 100644 --- a/shell/contents/configuration/private/ConfigurationKcmPage.qml +++ b/shell/contents/configuration/private/ConfigurationKcmPage.qml @@ -5,7 +5,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.2 as QQC2 -import org.kde.kirigami 2.5 as Kirigami +import org.kde.kirigami as Kirigami Kirigami.Page { id: container diff --git a/shell/contents/lockscreen/BottomIconIndicator.qml b/shell/contents/lockscreen/BottomIconIndicator.qml index 227fec7f..78e6c78a 100644 --- a/shell/contents/lockscreen/BottomIconIndicator.qml +++ b/shell/contents/lockscreen/BottomIconIndicator.qml @@ -5,7 +5,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami Loader { id: root diff --git a/shell/contents/lockscreen/Clock.qml b/shell/contents/lockscreen/Clock.qml index 6ab35641..180b57b1 100644 --- a/shell/contents/lockscreen/Clock.qml +++ b/shell/contents/lockscreen/Clock.qml @@ -8,7 +8,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.clock import org.kde.plasma.components 3.0 as PC3 import org.kde.plasma.private.mobileshell as MobileShell diff --git a/shell/contents/lockscreen/FlickContainer.qml b/shell/contents/lockscreen/FlickContainer.qml index e84573cd..71743f88 100644 --- a/shell/contents/lockscreen/FlickContainer.qml +++ b/shell/contents/lockscreen/FlickContainer.qml @@ -4,7 +4,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell as MobileShell MobileShell.SwipeArea { diff --git a/shell/contents/lockscreen/Keypad.qml b/shell/contents/lockscreen/Keypad.qml index 417ae09b..7a435e05 100644 --- a/shell/contents/lockscreen/Keypad.qml +++ b/shell/contents/lockscreen/Keypad.qml @@ -11,7 +11,7 @@ import org.kde.plasma.core as PlasmaCore import org.kde.plasma.workspace.keyboardlayout 1.0 import org.kde.plasma.private.mobileshell as MobileShell -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami as Kirigami Item { id: root diff --git a/shell/contents/lockscreen/LockScreen.qml b/shell/contents/lockscreen/LockScreen.qml index 3d7b9584..9aeb2cf1 100644 --- a/shell/contents/lockscreen/LockScreen.qml +++ b/shell/contents/lockscreen/LockScreen.qml @@ -14,7 +14,7 @@ import org.kde.plasma.private.mobileshell.dpmsplugin as DPMS import org.kde.plasma.components 3.0 as PC3 import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami as Kirigami /** * Lockscreen component that is loaded after the device is locked. diff --git a/shell/contents/lockscreen/LockScreenContent.qml b/shell/contents/lockscreen/LockScreenContent.qml index 8e5d04a2..434e7edc 100644 --- a/shell/contents/lockscreen/LockScreenContent.qml +++ b/shell/contents/lockscreen/LockScreenContent.qml @@ -5,7 +5,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Effects -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.workspace.keyboardlayout 1.0 import org.kde.notificationmanager as Notifications import org.kde.plasma.private.mobileshell as MobileShell diff --git a/shell/contents/lockscreen/PasswordBar.qml b/shell/contents/lockscreen/PasswordBar.qml index 1f52feb7..0c3b9684 100644 --- a/shell/contents/lockscreen/PasswordBar.qml +++ b/shell/contents/lockscreen/PasswordBar.qml @@ -8,7 +8,7 @@ import QtQuick.Layouts import org.kde.plasma.workspace.keyboardlayout 1.0 import org.kde.plasma.workspace.keyboardlayout 1.0 as Keyboards -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami as Kirigami Rectangle { id: root diff --git a/shell/contents/views/Desktop.qml b/shell/contents/views/Desktop.qml index fc4154f0..a6fb4c17 100644 --- a/shell/contents/views/Desktop.qml +++ b/shell/contents/views/Desktop.qml @@ -10,7 +10,7 @@ import QtQuick 2.15 import org.kde.plasma.core as PlasmaCore import org.kde.kquickcontrolsaddons 2.0 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell as MobileShell import org.kde.plasma.private.mobileshell.state as MobileShellState diff --git a/shell/contents/views/Panel.qml b/shell/contents/views/Panel.qml index b5a82f3c..fc195a85 100644 --- a/shell/contents/views/Panel.qml +++ b/shell/contents/views/Panel.qml @@ -13,7 +13,7 @@ import org.kde.plasma.core as PlasmaCore import org.kde.ksvg 1.0 as KSvg import org.kde.taskmanager 0.1 as TaskManager import org.kde.kwindowsystem 1.0 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.shell.panel 0.1 as Panel import org.kde.plasma.plasmoid 2.0 diff --git a/tests/ActionDrawerTest.qml b/tests/ActionDrawerTest.qml index e90d7a01..9054dae6 100644 --- a/tests/ActionDrawerTest.qml +++ b/tests/ActionDrawerTest.qml @@ -8,7 +8,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.components 3.0 as PC3 import org.kde.plasma.private.mobileshell as MobileShell