diff --git a/lookandfeel/contents/lockscreen/HeaderComponent.qml b/lookandfeel/contents/lockscreen/HeaderComponent.qml index 92095d9b..1ae742d7 100644 --- a/lookandfeel/contents/lockscreen/HeaderComponent.qml +++ b/lookandfeel/contents/lockscreen/HeaderComponent.qml @@ -10,7 +10,7 @@ import QtQuick.Layouts 1.1 import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell 1.0 as MobileShell -import org.kde.notificationmanager 1.0 as NotificationManager +import org.kde.notificationmanager as NotificationManager Item { id: root diff --git a/lookandfeel/contents/lockscreen/LockScreen.qml b/lookandfeel/contents/lockscreen/LockScreen.qml index 9c391927..4b282bf5 100644 --- a/lookandfeel/contents/lockscreen/LockScreen.qml +++ b/lookandfeel/contents/lockscreen/LockScreen.qml @@ -7,7 +7,7 @@ import QtQuick.Controls import QtQuick.Layouts import org.kde.plasma.core as PlasmaCore -import org.kde.notificationmanager 1.1 as Notifications +import org.kde.notificationmanager as Notifications import org.kde.kirigami 2.12 as Kirigami diff --git a/lookandfeel/contents/lockscreen/LockScreenNarrowContent.qml b/lookandfeel/contents/lockscreen/LockScreenNarrowContent.qml index eb889c32..7274a90e 100644 --- a/lookandfeel/contents/lockscreen/LockScreenNarrowContent.qml +++ b/lookandfeel/contents/lockscreen/LockScreenNarrowContent.qml @@ -7,7 +7,7 @@ import QtQuick.Effects import org.kde.kirigami 2.20 as Kirigami import org.kde.plasma.workspace.keyboardlayout 1.0 -import org.kde.notificationmanager 1.1 as Notifications +import org.kde.notificationmanager as Notifications import org.kde.plasma.private.mobileshell 1.0 as MobileShell Loader { diff --git a/lookandfeel/contents/lockscreen/LockScreenWideScreenContent.qml b/lookandfeel/contents/lockscreen/LockScreenWideScreenContent.qml index e67594d3..61114250 100644 --- a/lookandfeel/contents/lockscreen/LockScreenWideScreenContent.qml +++ b/lookandfeel/contents/lockscreen/LockScreenWideScreenContent.qml @@ -7,7 +7,7 @@ import QtQuick.Effects import org.kde.kirigami 2.20 as Kirigami import org.kde.plasma.workspace.keyboardlayout 1.0 -import org.kde.notificationmanager 1.1 as Notifications +import org.kde.notificationmanager as Notifications import org.kde.plasma.private.mobileshell 1.0 as MobileShell Loader { diff --git a/lookandfeel/contents/lockscreen/NotificationsComponent.qml b/lookandfeel/contents/lockscreen/NotificationsComponent.qml index 0036377d..6dcd382f 100644 --- a/lookandfeel/contents/lockscreen/NotificationsComponent.qml +++ b/lookandfeel/contents/lockscreen/NotificationsComponent.qml @@ -4,11 +4,10 @@ import QtQuick import QtQuick.Layouts -import org.kde.notificationmanager 1.1 as Notifications import org.kde.plasma.private.mobileshell 1.0 as MobileShell import org.kde.kirigami as Kirigami -import org.kde.notificationmanager 1.0 as NotificationManager +import org.kde.notificationmanager as NotificationManager Loader { id: root diff --git a/tests/ActionDrawerTest.qml b/tests/ActionDrawerTest.qml index c9ef0642..aa61b4ce 100644 --- a/tests/ActionDrawerTest.qml +++ b/tests/ActionDrawerTest.qml @@ -11,9 +11,8 @@ import QtQuick.Controls 2.15 import org.kde.kirigami 2.20 as Kirigami import org.kde.plasma.components 3.0 as PC3 import org.kde.plasma.private.mobileshell 1.0 as MobileShell -import org.kde.notificationmanager 1.1 as Notifications -import org.kde.notificationmanager 1.0 as NotificationManager +import org.kde.notificationmanager as NotificationManager // This is a test app to conveniently test the Quick Settings that are available // on the system without having to load a full Plasma Mobile shell. @@ -67,7 +66,7 @@ ApplicationWindow { notificationSettings: NotificationManager.Settings {} notificationModelType: MobileShell.NotificationsModelType.WatchedNotificationsModel - notificationModel: Notifications.WatchedNotificationsModel {} + notificationModel: NotificationManager.WatchedNotificationsModel {} } PC3.Label { diff --git a/tests/LockScreenTest.qml b/tests/LockScreenTest.qml index e1297397..496760ad 100644 --- a/tests/LockScreenTest.qml +++ b/tests/LockScreenTest.qml @@ -6,9 +6,6 @@ import QtQuick.Controls 2.15 import org.kde.plasma.components 3.0 as PC3 import org.kde.plasma.private.mobileshell 1.0 as MobileShell -import org.kde.notificationmanager 1.1 as Notifications - -import org.kde.notificationmanager 1.0 as NotificationManager import "../lookandfeel/contents/lockscreen" as LockScreen