Remove versioning from PlasmaCore module imports

It's unneeded in Qt6 and can cause subtle issues.
2026-11-03 22:59:45 -09:00 · 2023-09-05 09:21:36 -06:00 · 2023-09-05 09:21:36 -06:00 · a09a1b523a
commit a09a1b523a
parent 3eff69d6b2
65 changed files with 65 additions and 65 deletions
--- a/applets/keyboardlayout/contents/ui/main.qml
+++ b/applets/keyboardlayout/contents/ui/main.qml
@ -7,7 +7,7 @@ import QtQuick 2.15
 import Qt.labs.platform 1.1

 import org.kde.plasma.plasmoid 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 PlasmaComponents3
 import org.kde.plasma.workspace.components 2.0
 import org.kde.plasma.private.kcm_keyboard as KCMKeyboard
--- a/applets/kicker/package/contents/ui/CompactRepresentation.qml
+++ b/applets/kicker/package/contents/ui/CompactRepresentation.qml
@ -7,7 +7,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15

-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.core as PlasmaCore
 import org.kde.plasma.plasmoid 2.0
 import org.kde.kirigami 2.20 as Kirigami

--- a/applets/kicker/package/contents/ui/ConfigGeneral.qml
+++ b/applets/kicker/package/contents/ui/ConfigGeneral.qml
@ -10,7 +10,7 @@ import QtQuick.Controls 2.15
 import org.kde.draganddrop 2.0 as DragDrop
 import org.kde.kirigami 2.5 as Kirigami
 import org.kde.iconthemes as KIconThemes
-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.ksvg 1.0 as KSvg
 import org.kde.plasma.plasmoid 2.0
--- a/applets/kicker/package/contents/ui/DashboardRepresentation.qml
+++ b/applets/kicker/package/contents/ui/DashboardRepresentation.qml
@ -12,7 +12,7 @@ import QtQml 2.15
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.kwindowsystem 1.0
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.plasma.core 2.1 as PlasmaCore
+import org.kde.plasma.core as PlasmaCore
 import org.kde.ksvg 1.0 as KSvg
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import org.kde.plasma.private.shell 2.0
--- a/applets/kicker/package/contents/ui/ItemGridDelegate.qml
+++ b/applets/kicker/package/contents/ui/ItemGridDelegate.qml
@ -7,7 +7,7 @@
 import QtQuick 2.15

 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.kirigami 2.20 as Kirigami

 import "code/tools.js" as Tools
--- a/applets/kicker/package/contents/ui/ItemListDialog.qml
+++ b/applets/kicker/package/contents/ui/ItemListDialog.qml
@ -6,7 +6,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.plasmoid 2.0
 import org.kde.kirigami 2.20 as Kirigami

--- a/applets/kicker/package/contents/ui/MenuRepresentation.qml
+++ b/applets/kicker/package/contents/ui/MenuRepresentation.qml
@ -9,7 +9,7 @@ import QtQuick.Layouts 1.15
 // Deliberately imported after QtQuick to avoid missing restoreMode property in Binding. Fix in Qt 6.
 import QtQml 2.15

-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.plasma.extras 2.0 as PlasmaExtras
 import org.kde.kirigami 2.20 as Kirigami
--- a/applets/kicker/package/contents/ui/SideBarItem.qml
+++ b/applets/kicker/package/contents/ui/SideBarItem.qml
@ -7,7 +7,7 @@
 import QtQuick 2.15

 import org.kde.kquickcontrolsaddons 2.0
-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.plasma.plasmoid 2.0

--- a/applets/kicker/package/contents/ui/main.qml
+++ b/applets/kicker/package/contents/ui/main.qml
@ -8,7 +8,7 @@ import QtQuick 2.15
 import QtQuick.Layouts 1.15

 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.ksvg 1.0 as KSvg
 import org.kde.plasma.plasmoid 2.0
 import org.kde.kirigami 2.20 as Kirigami
--- a/applets/kickoff/package/contents/ui/AbstractKickoffItemDelegate.qml
+++ b/applets/kickoff/package/contents/ui/AbstractKickoffItemDelegate.qml
@ -13,7 +13,7 @@ import QtQuick 2.15
 import QtQml 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Templates 2.15 as T
-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.kirigami 2.20 as Kirigami
 import "code/tools.js" as Tools
--- a/applets/kickoff/package/contents/ui/ActionMenu.qml
+++ b/applets/kickoff/package/contents/ui/ActionMenu.qml
@ -10,7 +10,7 @@
 pragma Singleton // NOTE: Singletons are shared between all instances of a plasmoid

 import QtQuick 2.15
-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.core as PlasmaCore
 import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import "code/tools.js" as Tools
--- a/applets/kickoff/package/contents/ui/ConfigGeneral.qml
+++ b/applets/kickoff/package/contents/ui/ConfigGeneral.qml
@ -11,7 +11,7 @@ import QtQuick 2.15
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.5

-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.iconthemes as KIconThemes
 import org.kde.kirigami 2.20 as Kirigami
--- a/applets/kickoff/package/contents/ui/Kickoff.qml
+++ b/applets/kickoff/package/contents/ui/Kickoff.qml
@ -14,7 +14,7 @@ import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
 import QtQml 2.15
 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.ksvg 1.0 as KSvg
 import org.kde.plasma.components 3.0 as PC3
 import org.kde.plasma.private.kicker 0.1 as Kicker
--- a/applets/kickoff/package/contents/ui/KickoffDropArea.qml
+++ b/applets/kickoff/package/contents/ui/KickoffDropArea.qml
@ -5,7 +5,7 @@

 import QtQuick 2.15
 import QtQml 2.15
-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.core as PlasmaCore
 import org.kde.plasma.plasmoid 2.0

 DropArea {
--- a/applets/kickoff/package/contents/ui/LeaveButtons.qml
+++ b/applets/kickoff/package/contents/ui/LeaveButtons.qml
@ -9,7 +9,7 @@ import QtQuick.Layouts 1.15
 import org.kde.plasma.private.kicker 0.1 as Kicker
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 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
 import org.kde.kirigami 2.20 as Kirigami
 import org.kde.kitemmodels 1.0 as KItemModels
 import org.kde.plasma.plasmoid 2.0
--- a/applets/kickoff/package/contents/ui/ListOfGridsView.qml
+++ b/applets/kickoff/package/contents/ui/ListOfGridsView.qml
@ -6,7 +6,7 @@

 import QtQuick 2.15
 import QtQml 2.15
-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.core as PlasmaCore
 import org.kde.kitemmodels 1.0 as KItemModels

 KickoffListView {
--- a/applets/kickoff/package/contents/ui/code/tools.js
+++ b/applets/kickoff/package/contents/ui/code/tools.js
@ -8,7 +8,7 @@
 */

 .pragma library
-.import org.kde.plasma.core 2.1 as PlasmaCore
+.import org.kde.plasma.core as PlasmaCore

 const defaultIconName = "start-here-kde-symbolic";

--- a/applets/kimpanel/package/contents/ui/ActionMenu.qml
+++ b/applets/kimpanel/package/contents/ui/ActionMenu.qml
@ -7,7 +7,7 @@

 import QtQuick 2.0

-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.core as PlasmaCore
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import org.kde.plasma.plasmoid 2.0

--- a/applets/kimpanel/package/contents/ui/ConfigAppearance.qml
+++ b/applets/kimpanel/package/contents/ui/ConfigAppearance.qml
@ -11,7 +11,7 @@ import QtQuick.Layouts 1.0
 import org.kde.plasma.plasmoid 2.0

 import org.kde.kirigami 2.20 as Kirigami
-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.core as PlasmaCore

 Kirigami.FormLayout {
    id: iconsPage
--- a/applets/kimpanel/package/contents/ui/ContextMenu.qml
+++ b/applets/kimpanel/package/contents/ui/ContextMenu.qml
@ -7,7 +7,7 @@

 import QtQuick 2.0

-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.core as PlasmaCore
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import org.kde.plasma.plasmoid 2.0

--- a/applets/kimpanel/package/contents/ui/InputPanel.qml
+++ b/applets/kimpanel/package/contents/ui/InputPanel.qml
@ -7,7 +7,7 @@
 import QtQuick 2.6
 import QtQuick.Layouts 1.1
 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 PlasmaComponents3
 import org.kde.plasma.private.kimpanel 0.1 as Kimpanel
 import org.kde.kirigami 2.20 as Kirigami
--- a/applets/kimpanel/package/contents/ui/StatusIcon.qml
+++ b/applets/kimpanel/package/contents/ui/StatusIcon.qml
@ -7,7 +7,7 @@
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
 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 PlasmaComponents3
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.kirigami 2.20 as Kirigami
--- a/applets/kimpanel/package/contents/ui/main.qml
+++ b/applets/kimpanel/package/contents/ui/main.qml
@ -7,7 +7,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.1
 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.kimpanel 0.1 as Kimpanel
 import org.kde.kirigami 2.20 as Kirigami
--- a/applets/margins-separator/contents/ui/main.qml
+++ b/applets/margins-separator/contents/ui/main.qml
@ -7,7 +7,7 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.0
 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.kirigami 2.20 as Kirigami
 import org.kde.ksvg 1.0 as KSvg

--- a/applets/pager/package/contents/ui/main.qml
+++ b/applets/pager/package/contents/ui/main.qml
@ -9,7 +9,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.1
 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.ksvg 1.0 as KSvg
 import org.kde.plasma.components 3.0 as PlasmaComponents3
 import org.kde.draganddrop 2.0
--- a/applets/showActivityManager/package/contents/ui/ConfigAppearance.qml
+++ b/applets/showActivityManager/package/contents/ui/ConfigAppearance.qml
@ -9,7 +9,7 @@ import QtQuick.Controls 2.5

 import org.kde.kirigami 2.5 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

 Kirigami.FormLayout {
    anchors.left: parent.left
--- a/applets/showActivityManager/package/contents/ui/main.qml
+++ b/applets/showActivityManager/package/contents/ui/main.qml
@ -8,7 +8,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.1
 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 PlasmaComponents3
 import org.kde.draganddrop 2.0 as DND

--- a/applets/showdesktop/package/contents/ui/main.qml
+++ b/applets/showdesktop/package/contents/ui/main.qml
@ -9,7 +9,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.1

-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.ksvg 1.0 as KSvg

--- a/applets/taskmanager/package/contents/ui/ConfigAppearance.qml
+++ b/applets/taskmanager/package/contents/ui/ConfigAppearance.qml
@ -9,7 +9,7 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.19 as Kirigami
-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.core as PlasmaCore
 import org.kde.plasma.plasmoid 2.0

 Kirigami.FormLayout {
--- a/applets/taskmanager/package/contents/ui/ConfigBehavior.qml
+++ b/applets/taskmanager/package/contents/ui/ConfigBehavior.qml
@ -9,7 +9,7 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.19 as Kirigami
-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.core as PlasmaCore
 import org.kde.plasma.plasmoid 2.0

 import org.kde.plasma.private.taskmanager 0.1 as TaskManagerApplet
--- a/applets/taskmanager/package/contents/ui/ContextMenu.qml
+++ b/applets/taskmanager/package/contents/ui/ContextMenu.qml
@ -9,7 +9,7 @@ import QtQuick 2.15

 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.extras 2.0 as PlasmaExtras

 import org.kde.taskmanager 0.1 as TaskManager
--- a/applets/taskmanager/package/contents/ui/GroupDialog.qml
+++ b/applets/taskmanager/package/contents/ui/GroupDialog.qml
@ -11,7 +11,7 @@ import QtQml 2.15
 import QtQml.Models 2.15
 import QtQuick.Window 2.15

-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.draganddrop 2.0
 import org.kde.kirigami 2.20 as Kirigami
--- a/applets/taskmanager/package/contents/ui/GroupExpanderOverlay.qml
+++ b/applets/taskmanager/package/contents/ui/GroupExpanderOverlay.qml
@ -6,7 +6,7 @@

 import QtQuick 2.15

-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.plasma.plasmoid 2.0

--- a/applets/taskmanager/package/contents/ui/Task.qml
+++ b/applets/taskmanager/package/contents/ui/Task.qml
@ -6,7 +6,7 @@

 import QtQuick 2.15

-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.plasma.extras 2.0 as PlasmaExtras
 import org.kde.plasma.components 3.0 as PlasmaComponents3
--- a/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml
+++ b/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml
@ -13,7 +13,7 @@ import QtQuick.Window 2.15
 import QtQml.Models 2.15
 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 PlasmaComponents3
 import org.kde.kirigami 2.20 as Kirigami

--- a/applets/taskmanager/package/contents/ui/ToolTipInstance.qml
+++ b/applets/taskmanager/package/contents/ui/ToolTipInstance.qml
@ -13,7 +13,7 @@ import QtQuick.Layouts 1.15
 import Qt5Compat.GraphicalEffects

 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 PlasmaComponents3
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import org.kde.kirigami 2.20 as Kirigami
--- a/applets/taskmanager/package/contents/ui/code/tools.js
+++ b/applets/taskmanager/package/contents/ui/code/tools.js
@ -8,7 +8,7 @@
 .pragma library

 .import org.kde.taskmanager 0.1 as TaskManager
-.import org.kde.plasma.core 2.0 as PlasmaCore // Needed by TaskManager
+.import org.kde.plasma.core as PlasmaCore // Needed by TaskManager

 var windowViewAvailable = false;
 var taskManagerInstanceCount = 0;
--- a/applets/taskmanager/package/contents/ui/main.qml
+++ b/applets/taskmanager/package/contents/ui/main.qml
@ -10,7 +10,7 @@ import QtQml 2.15

 import org.kde.plasma.plasmoid 2.0
 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.ksvg 1.0 as KSvg
 import org.kde.plasma.plasma5support 2.0 as P5Support
 import org.kde.kirigami 2.20 as Kirigami
--- a/applets/trash/package/contents/ui/main.qml
+++ b/applets/trash/package/contents/ui/main.qml
@ -9,7 +9,7 @@ import QtQuick 2.15
 import QtQuick.Layouts 1.1

 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.workspace.components 2.0 as WorkspaceComponents
 import org.kde.draganddrop 2.0 as DragDrop
 import org.kde.plasma.private.trash 1.0 as TrashPrivate
--- a/applets/window-list/contents/ui/ConfigGeneral.qml
+++ b/applets/window-list/contents/ui/ConfigGeneral.qml
@ -9,7 +9,7 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.13

 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.kirigami 2.20 as Kirigami


--- a/applets/window-list/contents/ui/MenuButton.qml
+++ b/applets/window-list/contents/ui/MenuButton.qml
@ -7,7 +7,7 @@
 import QtQuick 2.10
 import QtQuick.Layouts 1.10
 import QtQuick.Controls 2.10
-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.plasma.components 3.0 as PC3
 import org.kde.kirigami 2.20 as Kirigami
--- a/applets/window-list/contents/ui/main.qml
+++ b/applets/window-list/contents/ui/main.qml
@ -8,7 +8,7 @@ import QtQuick 2.15
 import QtQuick.Layouts 1.10

 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.extras 2.0 as PlasmaExtras
 import org.kde.kirigami 2.20 as Kirigami

--- a/containments/desktop/package/contents/ui/CompactRepresentation.qml
+++ b/containments/desktop/package/contents/ui/CompactRepresentation.qml
@ -8,7 +8,7 @@ import QtQuick 2.0
 import QtQuick.Layouts 1.1

 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.draganddrop 2.0 as DragDrop
 import org.kde.kirigami 2.20 as Kirigami

--- a/containments/desktop/package/contents/ui/ConfigFilter.qml
+++ b/containments/desktop/package/contents/ui/ConfigFilter.qml
@ -9,7 +9,7 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.20 as Kirigami
-import org.kde.plasma.core 2.1 as PlasmaCore
+import org.kde.plasma.core as PlasmaCore
 import org.kde.private.desktopcontainment.folder 0.1 as Folder
 import org.kde.kitemmodels 1.0 as KItemModels

--- a/containments/desktop/package/contents/ui/ConfigIcons.qml
+++ b/containments/desktop/package/contents/ui/ConfigIcons.qml
@ -10,7 +10,7 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15

 import org.kde.plasma.plasmoid 2.0
-import org.kde.plasma.core 2.1 as PlasmaCore
+import org.kde.plasma.core as PlasmaCore
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import org.kde.iconthemes as KIconThemes
 import org.kde.config // for KAuthorized
--- a/containments/desktop/package/contents/ui/ConfigOverlay.qml
+++ b/containments/desktop/package/contents/ui/ConfigOverlay.qml
@ -8,7 +8,7 @@ import QtQuick 2.15
 import QtQuick.Layouts 1.15

 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.kirigami 2.20 as Kirigami
 import org.kde.ksvg 1.0 as KSvg

--- a/containments/desktop/package/contents/ui/FolderItemDelegate.qml
+++ b/containments/desktop/package/contents/ui/FolderItemDelegate.qml
@ -10,7 +10,7 @@ import Qt5Compat.GraphicalEffects

 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.kirigami 2.20 as Kirigami
 import org.kde.ksvg 1.0 as KSvg
 import org.kde.plasma.workspace.components 2.0 as WorkspaceComponents
--- a/containments/desktop/package/contents/ui/FolderViewDialog.qml
+++ b/containments/desktop/package/contents/ui/FolderViewDialog.qml
@ -7,7 +7,7 @@
 import QtQuick 2.15

 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.kirigami 2.20 as Kirigami

 import org.kde.private.desktopcontainment.folder 0.1 as Folder
--- a/containments/desktop/package/contents/ui/FolderViewLayer.qml
+++ b/containments/desktop/package/contents/ui/FolderViewLayer.qml
@ -8,7 +8,7 @@ import QtQuick 2.15
 import QtQml 2.15

 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.config // for KAuthorized
 import org.kde.kirigami 2.20 as Kirigami
--- a/containments/desktop/package/contents/ui/main.qml
+++ b/containments/desktop/package/contents/ui/main.qml
@ -10,7 +10,7 @@ import QtQuick 2.15
 import QtQuick.Layouts 1.15

 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.ksvg 1.0 as KSvg
 import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 import org.kde.kirigami 2.20 as Kirigami
--- a/containments/panel/contents/ui/ConfigOverlay.qml
+++ b/containments/panel/contents/ui/ConfigOverlay.qml
@ -10,7 +10,7 @@ import QtQuick 2.5
 import QtQuick.Layouts 1.0

 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 PlasmaComponents3
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import org.kde.kquickcontrolsaddons 2.0
--- a/containments/panel/contents/ui/main.qml
+++ b/containments/panel/contents/ui/main.qml
@ -9,7 +9,7 @@ import QtQuick 2.1
 import QtQuick.Layouts 1.1
 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.ksvg 1.0 as KSvg
 import org.kde.plasma.components 3.0 as PlasmaComponents
 import org.kde.kquickcontrolsaddons 2.0
--- a/desktoppackage/contents/applet/AppletError.qml
+++ b/desktoppackage/contents/applet/AppletError.qml
@ -8,7 +8,7 @@ import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
 import QtQuick.Controls 2.15 as QQC2
-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.kirigami 2.20 as Kirigami
 import org.kde.plasma.plasmoid 2.0
--- a/desktoppackage/contents/applet/CompactApplet.qml
+++ b/desktoppackage/contents/applet/CompactApplet.qml
@ -7,7 +7,7 @@ import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15

-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.plasma.plasmoid 2.0
 import org.kde.kquickcontrolsaddons 2.0
--- a/desktoppackage/contents/applet/DefaultCompactRepresentation.qml
+++ b/desktoppackage/contents/applet/DefaultCompactRepresentation.qml
@ -7,7 +7,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15

-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.core as PlasmaCore
 import org.kde.plasma.plasmoid 2.0
 import org.kde.kirigami 2.20 as Kirigami

--- a/desktoppackage/contents/configuration/PanelConfiguration.qml
+++ b/desktoppackage/contents/configuration/PanelConfiguration.qml
@ -6,7 +6,7 @@

 import QtQuick 2.0
 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.kirigami 2.20 as Kirigami
 import org.kde.ksvg 1.0 as KSvg
 import org.kde.plasma.configuration 2.0
--- a/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml
+++ b/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml
@ -10,7 +10,7 @@ import QtQuick.Layouts 1.0
 import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.components 3.0 as PC3
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-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.plasma.shell.panel 0.1 as Panel
 import org.kde.kquickcontrols 2.0
--- a/desktoppackage/contents/configuration/panelconfiguration/PanelRepresentation.qml
+++ b/desktoppackage/contents/configuration/panelconfiguration/PanelRepresentation.qml
@ -3,7 +3,7 @@ import QtQuick.Layouts 1.0
 import QtQuick.Window 2.15

 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
 import org.kde.ksvg 1.0 as KSvg
 import org.kde.plasma.shell.panel 0.1 as Panel
 import org.kde.kirigami 2.20 as Kirigami
--- a/desktoppackage/contents/configuration/panelconfiguration/ToolBar.qml
+++ b/desktoppackage/contents/configuration/panelconfiguration/ToolBar.qml
@ -10,7 +10,7 @@ import QtQuick.Layouts 1.0
 import QtQuick.Window 2.15
 import org.kde.plasma.plasmoid 2.0
 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.ksvg 1.0 as KSvg
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import org.kde.plasma.configuration 2.0
--- a/desktoppackage/contents/explorer/AppletAlternatives.qml
+++ b/desktoppackage/contents/explorer/AppletAlternatives.qml
@ -8,7 +8,7 @@ import QtQuick 2.15
 import QtQuick.Controls 2.5 as QQC2
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.1
-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.extras 2.0 as PlasmaExtras
 import org.kde.kirigami 2.20 as Kirigami
--- a/desktoppackage/contents/explorer/WidgetExplorer.qml
+++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
@ -8,7 +8,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.5 as QQC2

 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
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.kwindowsystem 1.0
--- a/desktoppackage/contents/views/Desktop.qml
+++ b/desktoppackage/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.kwindowsystem 1.0
 import org.kde.plasma.activityswitcher 1.0 as ActivitySwitcher
 import "../activitymanager"
--- a/desktoppackage/contents/views/Panel.qml
+++ b/desktoppackage/contents/views/Panel.qml
@ -9,7 +9,7 @@ import QtQuick.Window 2.15
 import QtQuick.Layouts 1.1
 import QtQml 2.15

-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.taskmanager 0.1 as TaskManager
 import org.kde.kwindowsystem 1.0
--- a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
+++ b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
@ -9,7 +9,7 @@
 import QtQuick 2.0
 import QtQuick.Layouts 1.1

-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.core as PlasmaCore
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import org.kde.plasma.plasma5support 2.0 as P5Support
 import org.kde.kirigami 2.20 as Kirigami
--- a/toolboxes/paneltoolbox/contents/ui/main.qml
+++ b/toolboxes/paneltoolbox/contents/ui/main.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.plasmoid 2.0
 import org.kde.kirigami 2.20 as Kirigami