diff --git a/applets/activities/contents/ui/main.qml b/applets/activities/contents/ui/main.qml index 8f9e1a5a..830a664a 100644 --- a/applets/activities/contents/ui/main.qml +++ b/applets/activities/contents/ui/main.qml @@ -7,11 +7,12 @@ import QtQuick 2.5 import QtQuick.Layouts 1.1 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 2.0 as PlasmaComponents //Needed for Highlight +import org.kde.plasma.components 3.0 as PlasmaComponents3 import org.kde.activities 0.1 as Activities ColumnLayout { - PlasmaComponents.ToolButton { + PlasmaComponents3.ToolButton { id: newButton Layout.fillWidth: true text: i18n("New Activity...") @@ -19,7 +20,7 @@ ColumnLayout { newEdit.visible = true; newEdit.forceActiveFocus(); } - PlasmaComponents.TextField { + PlasmaComponents3.TextField { id: newEdit visible: false width: parent.width @@ -122,13 +123,13 @@ ColumnLayout { positionAnim.running = true; } - PlasmaComponents.Label { + PlasmaComponents3.Label { id: label text: model.name anchors.verticalCenter: parent.verticalCenter x: PlasmaCore.Units.smallSpacing } - PlasmaComponents.TextField { + PlasmaComponents3.TextField { id: edit visible: false text: model.name diff --git a/components/mobilehomescreencomponents/qml/DrawerDelegate.qml b/components/mobilehomescreencomponents/qml/DrawerDelegate.qml index c28a55c8..d50d9b26 100644 --- a/components/mobilehomescreencomponents/qml/DrawerDelegate.qml +++ b/components/mobilehomescreencomponents/qml/DrawerDelegate.qml @@ -11,7 +11,7 @@ import QtGraphicalEffects 1.6 import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.kquickcontrolsaddons 2.0 import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager diff --git a/components/mobilehomescreencomponents/qml/FavoriteStrip.qml b/components/mobilehomescreencomponents/qml/FavoriteStrip.qml index fe0f8ec6..56b5880d 100644 --- a/components/mobilehomescreencomponents/qml/FavoriteStrip.qml +++ b/components/mobilehomescreencomponents/qml/FavoriteStrip.qml @@ -10,7 +10,6 @@ import QtQuick.Controls 2.3 as Controls import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.kquickcontrolsaddons 2.0 diff --git a/components/mobilehomescreencomponents/qml/LauncherContainer.qml b/components/mobilehomescreencomponents/qml/LauncherContainer.qml index b167e174..47c7ee7d 100644 --- a/components/mobilehomescreencomponents/qml/LauncherContainer.qml +++ b/components/mobilehomescreencomponents/qml/LauncherContainer.qml @@ -10,7 +10,6 @@ import QtQuick.Controls 2.3 as Controls import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.kquickcontrolsaddons 2.0 import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager diff --git a/components/mobilehomescreencomponents/qml/LauncherGrid.qml b/components/mobilehomescreencomponents/qml/LauncherGrid.qml index d49c3647..f70f78c4 100644 --- a/components/mobilehomescreencomponents/qml/LauncherGrid.qml +++ b/components/mobilehomescreencomponents/qml/LauncherGrid.qml @@ -10,7 +10,6 @@ import QtQuick.Controls 2.3 as Controls import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.kquickcontrolsaddons 2.0 import org.kde.kirigami 2.10 as Kirigami import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager diff --git a/components/mobilehomescreencomponents/qml/LauncherRepeater.qml b/components/mobilehomescreencomponents/qml/LauncherRepeater.qml index e342c7f4..7284e718 100644 --- a/components/mobilehomescreencomponents/qml/LauncherRepeater.qml +++ b/components/mobilehomescreencomponents/qml/LauncherRepeater.qml @@ -11,7 +11,6 @@ import QtGraphicalEffects 1.6 import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.kquickcontrolsaddons 2.0 import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager diff --git a/components/mobilehomescreencomponents/qml/private/ActionButton.qml b/components/mobilehomescreencomponents/qml/private/ActionButton.qml index dfaa658c..60f71210 100644 --- a/components/mobilehomescreencomponents/qml/private/ActionButton.qml +++ b/components/mobilehomescreencomponents/qml/private/ActionButton.qml @@ -7,7 +7,6 @@ import QtQuick 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents PlasmaCore.ToolTipArea { id: button diff --git a/containments/panel/package/contents/ui/indicators/Bluetooth.qml b/containments/panel/package/contents/ui/indicators/Bluetooth.qml index f79e2d1e..c802f968 100644 --- a/containments/panel/package/contents/ui/indicators/Bluetooth.qml +++ b/containments/panel/package/contents/ui/indicators/Bluetooth.qml @@ -9,7 +9,6 @@ import QtQuick 2.2 import QtQuick.Layouts 1.4 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.bluezqt 1.0 as BluezQt import "providers" diff --git a/containments/panel/package/contents/ui/indicators/SignalStrength.qml b/containments/panel/package/contents/ui/indicators/SignalStrength.qml index 04b5190c..2b090bba 100644 --- a/containments/panel/package/contents/ui/indicators/SignalStrength.qml +++ b/containments/panel/package/contents/ui/indicators/SignalStrength.qml @@ -10,7 +10,7 @@ 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.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import "providers" diff --git a/containments/panel/package/contents/ui/indicators/Volume.qml b/containments/panel/package/contents/ui/indicators/Volume.qml index 23d6aa6f..ffdf04fa 100644 --- a/containments/panel/package/contents/ui/indicators/Volume.qml +++ b/containments/panel/package/contents/ui/indicators/Volume.qml @@ -9,7 +9,6 @@ import QtQuick 2.2 import QtQuick.Layouts 1.4 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.private.volume 0.1 import "providers" diff --git a/containments/panel/package/contents/ui/indicators/Wifi.qml b/containments/panel/package/contents/ui/indicators/Wifi.qml index 4e49f2ff..cae11d0c 100644 --- a/containments/panel/package/contents/ui/indicators/Wifi.qml +++ b/containments/panel/package/contents/ui/indicators/Wifi.qml @@ -9,7 +9,7 @@ import QtQuick 2.2 import QtQuick.Layouts 1.4 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.networkmanagement 0.2 as PlasmaNM import "providers" diff --git a/containments/panel/package/contents/ui/indicators/providers/BluetoothProvider.qml b/containments/panel/package/contents/ui/indicators/providers/BluetoothProvider.qml index 490154b4..daf571a3 100644 --- a/containments/panel/package/contents/ui/indicators/providers/BluetoothProvider.qml +++ b/containments/panel/package/contents/ui/indicators/providers/BluetoothProvider.qml @@ -9,7 +9,6 @@ import QtQuick 2.2 import QtQuick.Layouts 1.4 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.bluezqt 1.0 as BluezQt QtObject { diff --git a/containments/panel/package/contents/ui/indicators/providers/SignalStrengthProvider.qml b/containments/panel/package/contents/ui/indicators/providers/SignalStrengthProvider.qml index 570d30a2..44904210 100644 --- a/containments/panel/package/contents/ui/indicators/providers/SignalStrengthProvider.qml +++ b/containments/panel/package/contents/ui/indicators/providers/SignalStrengthProvider.qml @@ -7,7 +7,6 @@ */ import QtQuick 2.1 - import org.kde.plasma.mm 1.0 QtObject { diff --git a/containments/panel/package/contents/ui/indicators/providers/VolumeProvider.qml b/containments/panel/package/contents/ui/indicators/providers/VolumeProvider.qml index cecac648..9f67b235 100644 --- a/containments/panel/package/contents/ui/indicators/providers/VolumeProvider.qml +++ b/containments/panel/package/contents/ui/indicators/providers/VolumeProvider.qml @@ -9,7 +9,6 @@ import QtQuick 2.2 import QtQuick.Layouts 1.4 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.private.volume 0.1 import "../../volumeosd" diff --git a/containments/panel/package/contents/ui/indicators/providers/WifiProvider.qml b/containments/panel/package/contents/ui/indicators/providers/WifiProvider.qml index 7cabc5ba..62a0ab03 100644 --- a/containments/panel/package/contents/ui/indicators/providers/WifiProvider.qml +++ b/containments/panel/package/contents/ui/indicators/providers/WifiProvider.qml @@ -9,7 +9,6 @@ import QtQuick 2.2 import QtQuick.Layouts 1.4 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.networkmanagement 0.2 as PlasmaNM Item { diff --git a/containments/panel/package/contents/ui/quicksettings/QuickSettingsPanel.qml b/containments/panel/package/contents/ui/quicksettings/QuickSettingsPanel.qml index 53e204e9..383c955a 100644 --- a/containments/panel/package/contents/ui/quicksettings/QuickSettingsPanel.qml +++ b/containments/panel/package/contents/ui/quicksettings/QuickSettingsPanel.qml @@ -11,7 +11,6 @@ import QtQuick.Window 2.2 import QtGraphicalEffects 1.12 import org.kde.kirigami 2.12 as Kirigami import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.networkmanagement 0.2 as PlasmaNM import org.kde.bluezqt 1.0 as BluezQt import org.kde.colorcorrect 0.1 as CC diff --git a/containments/panel/package/contents/ui/quicksettings/SettingsModel.qml b/containments/panel/package/contents/ui/quicksettings/SettingsModel.qml index cb8e32dc..b83d68a5 100644 --- a/containments/panel/package/contents/ui/quicksettings/SettingsModel.qml +++ b/containments/panel/package/contents/ui/quicksettings/SettingsModel.qml @@ -10,7 +10,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.networkmanagement 0.2 as PlasmaNM import org.kde.bluezqt 1.0 as BluezQt import org.kde.plasma.private.nanoshell 2.0 as NanoShell diff --git a/containments/taskpanel/package/contents/ui/Button.qml b/containments/taskpanel/package/contents/ui/Button.qml index 85fb5f1c..0d04d95e 100644 --- a/containments/taskpanel/package/contents/ui/Button.qml +++ b/containments/taskpanel/package/contents/ui/Button.qml @@ -9,7 +9,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.components 2.0 as PlasmaComponents import org.kde.kquickcontrolsaddons 2.0 Item { diff --git a/containments/taskpanel/package/contents/ui/main.qml b/containments/taskpanel/package/contents/ui/main.qml index 213fb577..7bd02b8a 100644 --- a/containments/taskpanel/package/contents/ui/main.qml +++ b/containments/taskpanel/package/contents/ui/main.qml @@ -12,7 +12,6 @@ import QtGraphicalEffects 1.12 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.components 2.0 as PlasmaComponents import org.kde.kquickcontrolsaddons 2.0 import org.kde.plasma.private.nanoshell 2.0 as NanoShell diff --git a/look-and-feel/contents/components/DialerButton.qml b/look-and-feel/contents/components/DialerButton.qml index 87454604..a9fb8cde 100644 --- a/look-and-feel/contents/components/DialerButton.qml +++ b/look-and-feel/contents/components/DialerButton.qml @@ -7,7 +7,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.1 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents PlasmaComponents.Label { horizontalAlignment: Qt.AlignHCenter diff --git a/look-and-feel/contents/components/UserDelegate.qml b/look-and-feel/contents/components/UserDelegate.qml index bceb4a42..9ae0fc09 100644 --- a/look-and-feel/contents/components/UserDelegate.qml +++ b/look-and-feel/contents/components/UserDelegate.qml @@ -8,7 +8,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.3 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents Item { id: wrapper diff --git a/look-and-feel/contents/lockscreen/Keypad.qml b/look-and-feel/contents/lockscreen/Keypad.qml index 4845716d..d1742367 100644 --- a/look-and-feel/contents/lockscreen/Keypad.qml +++ b/look-and-feel/contents/lockscreen/Keypad.qml @@ -8,7 +8,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 import QtGraphicalEffects 1.12 -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.workspace.keyboardlayout 1.0 import org.kde.kirigami 2.12 as Kirigami diff --git a/look-and-feel/contents/lockscreen/LockScreen.qml b/look-and-feel/contents/lockscreen/LockScreen.qml index fddfb99c..2b53f4b6 100644 --- a/look-and-feel/contents/lockscreen/LockScreen.qml +++ b/look-and-feel/contents/lockscreen/LockScreen.qml @@ -9,7 +9,6 @@ import QtQuick 2.12 import QtQuick.Controls 1.1 import QtQuick.Layouts 1.1 import QtGraphicalEffects 1.12 -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.workspace.keyboardlayout 1.0 import org.kde.notificationmanager 1.1 as Notifications diff --git a/look-and-feel/contents/lockscreen/NotificationsList.qml b/look-and-feel/contents/lockscreen/NotificationsList.qml index a7c81a7a..c42bc450 100644 --- a/look-and-feel/contents/lockscreen/NotificationsList.qml +++ b/look-and-feel/contents/lockscreen/NotificationsList.qml @@ -8,7 +8,6 @@ import QtQuick 2.15 import QtQuick.Controls 1.1 import QtQuick.Layouts 1.1 import QtGraphicalEffects 1.12 -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.notificationmanager 1.1 as Notifications import org.kde.kirigami 2.13 as Kirigami diff --git a/look-and-feel/contents/lockscreen/PasswordBar.qml b/look-and-feel/contents/lockscreen/PasswordBar.qml index de4fce26..e3fc5864 100644 --- a/look-and-feel/contents/lockscreen/PasswordBar.qml +++ b/look-and-feel/contents/lockscreen/PasswordBar.qml @@ -8,7 +8,6 @@ import QtQuick 2.12 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 import QtGraphicalEffects 1.12 -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.workspace.keyboardlayout 1.0 import org.kde.kirigami 2.12 as Kirigami diff --git a/look-and-feel/contents/lockscreen/SimpleNotification.qml b/look-and-feel/contents/lockscreen/SimpleNotification.qml index 301412a2..cd35c64f 100644 --- a/look-and-feel/contents/lockscreen/SimpleNotification.qml +++ b/look-and-feel/contents/lockscreen/SimpleNotification.qml @@ -9,7 +9,6 @@ import QtQuick.Controls 1.1 import QtQuick.Layouts 1.1 import QtGraphicalEffects 1.12 -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents3 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtras diff --git a/look-and-feel/contents/lockscreen/indicators/Bluetooth.qml b/look-and-feel/contents/lockscreen/indicators/Bluetooth.qml index fc96c405..3ea5ef3c 100644 --- a/look-and-feel/contents/lockscreen/indicators/Bluetooth.qml +++ b/look-and-feel/contents/lockscreen/indicators/Bluetooth.qml @@ -8,7 +8,6 @@ import QtQuick 2.2 import QtQuick.Layouts 1.4 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.bluezqt 1.0 as BluezQt PlasmaCore.IconItem { diff --git a/look-and-feel/contents/lockscreen/indicators/SignalStrength.qml b/look-and-feel/contents/lockscreen/indicators/SignalStrength.qml index 5467e67d..8250acd9 100644 --- a/look-and-feel/contents/lockscreen/indicators/SignalStrength.qml +++ b/look-and-feel/contents/lockscreen/indicators/SignalStrength.qml @@ -9,9 +9,7 @@ import QtQuick 2.1 import QtQuick.Layouts 1.1 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents - -import "providers" +import org.kde.plasma.components 3.0 as PlasmaComponents Item { required property QtObject provider diff --git a/look-and-feel/contents/lockscreen/indicators/Volume.qml b/look-and-feel/contents/lockscreen/indicators/Volume.qml index 47e0c350..84e3eacd 100644 --- a/look-and-feel/contents/lockscreen/indicators/Volume.qml +++ b/look-and-feel/contents/lockscreen/indicators/Volume.qml @@ -8,7 +8,6 @@ import QtQuick 2.2 import QtQuick.Layouts 1.4 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.private.volume 0.1 PlasmaCore.IconItem { diff --git a/look-and-feel/contents/lockscreen/indicators/Wifi.qml b/look-and-feel/contents/lockscreen/indicators/Wifi.qml index c69217fb..7ad10ce1 100644 --- a/look-and-feel/contents/lockscreen/indicators/Wifi.qml +++ b/look-and-feel/contents/lockscreen/indicators/Wifi.qml @@ -8,7 +8,7 @@ import QtQuick 2.2 import QtQuick.Layouts 1.4 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.networkmanagement 0.2 as PlasmaNM PlasmaCore.IconItem { diff --git a/shell/contents/views/Desktop.qml b/shell/contents/views/Desktop.qml index 79b14791..85f55a1a 100644 --- a/shell/contents/views/Desktop.qml +++ b/shell/contents/views/Desktop.qml @@ -10,7 +10,6 @@ import QtGraphicalEffects 1.0 import QtQuick.Controls 2.3 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.shell 2.0 as Shell -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.workspace.components 2.0 as PlasmaWorkspace import org.kde.kquickcontrolsaddons 2.0 import org.kde.activities 0.1 as Activities diff --git a/shell/contents/views/Pin.qml b/shell/contents/views/Pin.qml index cafbf952..85f409a2 100644 --- a/shell/contents/views/Pin.qml +++ b/shell/contents/views/Pin.qml @@ -10,7 +10,7 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls 2.5 import org.kde.plasma.core 2.0 as PlasmaCore import QtGraphicalEffects 1.12 -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import MeeGo.QOfono 0.2 import "../components"