Remove versioning from PlasmaCore module imports

It's unneeded in Qt6 and can cause subtle issues.
2026-04-26 14:23:09 +00:00 · 2023-09-05 09:34:49 -06:00 · 2023-09-05 09:34:49 -06:00 · cc50aee72d
commit cc50aee72d
parent 1ddbf3ba91
27 changed files with 27 additions and 27 deletions
--- 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
--- 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

--- 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
--- 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
--- 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

--- 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
--- 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
--- 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

--- 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
--- 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

--- 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

--- 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

--- 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

--- 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
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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
--- 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
--- 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

--- 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
--- 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

--- 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 {
--- 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
--- 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