diff --git a/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml b/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml index dfd400bd..ba966a0a 100644 --- a/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml +++ b/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml @@ -11,7 +11,7 @@ import QtQuick.Window 2.2 import org.kde.kirigami 2.12 as Kirigami -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.plasma5support 2.0 as P5Support import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.private.mobileshell 1.0 as MobileShell diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/BrightnessItem.qml b/components/mobileshell/qml/actiondrawer/quicksettings/BrightnessItem.qml index b9e96840..c544105e 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/BrightnessItem.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/BrightnessItem.qml @@ -10,7 +10,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.1 import org.kde.kirigami 2.20 as Kirigami -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.plasma5support 2.0 as P5Support import org.kde.plasma.components 3.0 as PC3 diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDelegate.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDelegate.qml index 69a73f6e..099cb4e9 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDelegate.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDelegate.qml @@ -10,7 +10,7 @@ import QtQuick.Layouts 1.1 import org.kde.kirigami 2.12 as Kirigami -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.private.nanoshell 2.0 as NanoShell import org.kde.plasma.private.mobileshell as MobileShell import org.kde.plasma.private.mobileshell.state as MobileShellState diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml index a6a75b50..74886dc3 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml @@ -11,7 +11,7 @@ import QtQuick.Layouts import org.kde.kirigami 2.12 as Kirigami import org.kde.ksvg 1.0 as KSvg -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import "../../statusbar" as StatusBar import "../../components" as Components diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml index 7eb4cece..7447c691 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml @@ -10,7 +10,7 @@ import QtQuick.Layouts 1.1 import org.kde.kirigami 2.12 as Kirigami -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings import org.kde.plasma.components 3.0 as PlasmaComponents diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml index 6103ecca..cb4f39b3 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml @@ -9,7 +9,7 @@ import QtQuick.Layouts 1.1 import org.kde.kirigami 2.12 as Kirigami -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.private.nanoshell 2.0 as NanoShell import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings import org.kde.plasma.components 3.0 as PlasmaComponents diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml index 5ef5a965..8b96e2e4 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml @@ -11,7 +11,7 @@ import QtQuick.Layouts import org.kde.kirigami 2.12 as Kirigami import org.kde.ksvg 1.0 as KSvg -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import "../../statusbar" as StatusBar import "../../components" as Components diff --git a/components/mobileshell/qml/navigationpanel/NavigationPanelButton.qml b/components/mobileshell/qml/navigationpanel/NavigationPanelButton.qml index 22415f4f..3c493c27 100644 --- a/components/mobileshell/qml/navigationpanel/NavigationPanelButton.qml +++ b/components/mobileshell/qml/navigationpanel/NavigationPanelButton.qml @@ -9,7 +9,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls as Controls -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.kirigami 2.20 as Kirigami import org.kde.kquickcontrolsaddons 2.0 diff --git a/components/mobileshell/qml/statusbar/StatusBar.qml b/components/mobileshell/qml/statusbar/StatusBar.qml index 5c80bab9..f3a9072b 100644 --- a/components/mobileshell/qml/statusbar/StatusBar.qml +++ b/components/mobileshell/qml/statusbar/StatusBar.qml @@ -14,7 +14,7 @@ import QtQml.Models import org.kde.kirigami as Kirigami -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.plasma5support 2.0 as P5Support import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.kitemmodels as KItemModels diff --git a/components/mobileshell/qml/statusbar/indicators/SignalStrengthIndicator.qml b/components/mobileshell/qml/statusbar/indicators/SignalStrengthIndicator.qml index 149a037a..ceaa1f27 100644 --- a/components/mobileshell/qml/statusbar/indicators/SignalStrengthIndicator.qml +++ b/components/mobileshell/qml/statusbar/indicators/SignalStrengthIndicator.qml @@ -8,7 +8,7 @@ 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 import org.kde.kirigami as Kirigami diff --git a/components/mobileshell/qml/volumeosd/ListItemBase.qml b/components/mobileshell/qml/volumeosd/ListItemBase.qml index 4919733d..e6cebaeb 100644 --- a/components/mobileshell/qml/volumeosd/ListItemBase.qml +++ b/components/mobileshell/qml/volumeosd/ListItemBase.qml @@ -14,7 +14,7 @@ import QtQuick.Window 2.2 import org.kde.kirigami 2.20 as Kirigami import org.kde.ksvg 1.0 as KSvg import org.kde.kquickcontrolsaddons 2.0 -import org.kde.plasma.core 2.1 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.private.volume 0.1 diff --git a/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml b/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml index 141282e5..794a76ce 100644 --- a/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml +++ b/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml @@ -11,7 +11,7 @@ import QtQuick.Effects import QtQuick.Controls as Controls 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 import org.kde.plasma.extras 2.0 as PlasmaExtras diff --git a/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml b/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml index e6139770..440d8607 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml @@ -11,7 +11,7 @@ import QtQuick.Window 2.2 import org.kde.kirigami 2.12 as Kirigami -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.plasma5support 2.0 as P5Support 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 cb888be5..3d4864bd 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationItem.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationItem.qml @@ -9,7 +9,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 -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 import org.kde.notificationmanager 1.0 as NotificationManager diff --git a/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml b/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml index cbd19364..6886a77c 100644 --- a/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml +++ b/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml @@ -9,7 +9,7 @@ import QtQuick.Layouts import QtQuick.Effects import org.kde.kirigami 2.20 as Kirigami -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents3 import org.kde.plasma.private.mobileshell 1.0 as MobileShell diff --git a/containments/homescreens/folio/package/contents/ui/HomeDelegate.qml b/containments/homescreens/folio/package/contents/ui/HomeDelegate.qml index 80300720..bb3b2757 100644 --- a/containments/homescreens/folio/package/contents/ui/HomeDelegate.qml +++ b/containments/homescreens/folio/package/contents/ui/HomeDelegate.qml @@ -12,7 +12,7 @@ import Qt5Compat.GraphicalEffects import org.kde.kirigami 2.20 as Kirigami import org.kde.plasma.plasmoid 2.0 -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PC3 import org.kde.kquickcontrolsaddons 2.0 diff --git a/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerGridDelegate.qml b/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerGridDelegate.qml index 3a3f77f5..1c2ed76e 100644 --- a/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerGridDelegate.qml +++ b/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerGridDelegate.qml @@ -12,7 +12,7 @@ import Qt5Compat.GraphicalEffects import org.kde.kirigami 2.20 as Kirigami import org.kde.plasma.plasmoid 2.0 -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 import org.kde.kquickcontrolsaddons 2.0 diff --git a/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerListDelegate.qml b/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerListDelegate.qml index b76057df..882b5773 100644 --- a/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerListDelegate.qml +++ b/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerListDelegate.qml @@ -13,7 +13,7 @@ import Qt5Compat.GraphicalEffects import org.kde.kirigami 2.20 as Kirigami import org.kde.plasma.plasmoid 2.0 -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 import org.kde.kquickcontrolsaddons 2.0 diff --git a/containments/homescreens/folio/package/contents/ui/private/ActionButton.qml b/containments/homescreens/folio/package/contents/ui/private/ActionButton.qml index 0afc7eb9..dec9b617 100644 --- a/containments/homescreens/folio/package/contents/ui/private/ActionButton.qml +++ b/containments/homescreens/folio/package/contents/ui/private/ActionButton.qml @@ -6,7 +6,7 @@ */ import QtQuick 2.0 -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.ksvg 1.0 as KSvg import org.kde.kirigami 2.20 as Kirigami diff --git a/containments/panel/package/contents/ui/main.qml b/containments/panel/package/contents/ui/main.qml index aa92bbe1..ae21d715 100644 --- a/containments/panel/package/contents/ui/main.qml +++ b/containments/panel/package/contents/ui/main.qml @@ -10,7 +10,7 @@ import QtQml.Models import org.kde.kirigami as Kirigami import org.kde.plasma.plasmoid -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 import org.kde.plasma.private.mobileshell as MobileShell diff --git a/containments/taskpanel/package/contents/ui/main.qml b/containments/taskpanel/package/contents/ui/main.qml index 531e95ac..e4593e35 100644 --- a/containments/taskpanel/package/contents/ui/main.qml +++ b/containments/taskpanel/package/contents/ui/main.qml @@ -10,7 +10,7 @@ import org.kde.kirigami 2.20 as Kirigami import org.kde.taskmanager 0.1 as TaskManager import org.kde.plasma.plasmoid 2.0 -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.kquickcontrolsaddons 2.0 import org.kde.plasma.private.mobileshell as MobileShell diff --git a/lookandfeel/contents/lockscreen/Keypad.qml b/lookandfeel/contents/lockscreen/Keypad.qml index d3efc825..327ebc67 100644 --- a/lookandfeel/contents/lockscreen/Keypad.qml +++ b/lookandfeel/contents/lockscreen/Keypad.qml @@ -7,7 +7,7 @@ import QtQuick.Layouts import QtQuick.Effects import org.kde.plasma.components 3.0 as PlasmaComponents -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.workspace.keyboardlayout 1.0 import org.kde.plasma.private.mobileshell 1.0 as MobileShell diff --git a/lookandfeel/contents/lockscreen/LockScreen.qml b/lookandfeel/contents/lockscreen/LockScreen.qml index 4986857d..ab875ac6 100644 --- a/lookandfeel/contents/lockscreen/LockScreen.qml +++ b/lookandfeel/contents/lockscreen/LockScreen.qml @@ -6,7 +6,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.notificationmanager 1.1 as Notifications import org.kde.kirigami 2.12 as Kirigami diff --git a/lookandfeel/contents/logout/ActionButton.qml b/lookandfeel/contents/logout/ActionButton.qml index f201ba51..628aa7c0 100644 --- a/lookandfeel/contents/logout/ActionButton.qml +++ b/lookandfeel/contents/logout/ActionButton.qml @@ -7,7 +7,7 @@ import QtQuick 2.8 -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents3 import org.kde.kirigami 2.20 as Kirigami diff --git a/shell/contents/configuration/ContainmentConfiguration.qml b/shell/contents/configuration/ContainmentConfiguration.qml index 45235233..9bc4bbe5 100644 --- a/shell/contents/configuration/ContainmentConfiguration.qml +++ b/shell/contents/configuration/ContainmentConfiguration.qml @@ -9,7 +9,7 @@ import QtQuick.Controls 2.15 as Controls import org.kde.kirigami 2.20 as Kirigami import org.kde.plasma.components 3.0 as PlasmaComponents3 -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.configuration 2.0 AppletConfiguration { diff --git a/shell/contents/configuration/WallpaperSelector.qml b/shell/contents/configuration/WallpaperSelector.qml index 039163e8..e3c54905 100644 --- a/shell/contents/configuration/WallpaperSelector.qml +++ b/shell/contents/configuration/WallpaperSelector.qml @@ -6,7 +6,7 @@ import QtQuick 2.12 import QtQuick.Layouts 1.0 import QtQuick.Window 2.15 import QtQuick.Controls 2.3 as Controls -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.configuration 2.0 import org.kde.kirigami 2.20 as Kirigami diff --git a/shell/contents/views/Desktop.qml b/shell/contents/views/Desktop.qml index 67b44a0d..fcd16077 100644 --- a/shell/contents/views/Desktop.qml +++ b/shell/contents/views/Desktop.qml @@ -7,7 +7,7 @@ import QtQuick 2.15 -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.shell 2.0 as Shell import org.kde.kquickcontrolsaddons 2.0