Switch some uses of IconItem to Kirigami.Icon, and fix some theme porting

components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml

@@ -80,7 +80,9 @@ Components.BaseItem {
                 Layout.fillWidth: true
                 Layout.preferredHeight: Components.Constants.topPanelHeight + Kirigami.Units.gridUnit * 0.8
                 
-                colorGroup: Kirigami.Theme.Window
+                Kirigami.Theme.colorSet: Kirigami.Theme.Window
+                Kirigami.Theme.inherit: false
+
                 backgroundColor: "transparent"
                 showSecondRow: true
                 showDropShadow: false

components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml

@@ -63,7 +63,9 @@ Components.BaseItem {
                 Layout.preferredHeight: Kirigami.Units.gridUnit * 1.5
                 Layout.maximumHeight: Kirigami.Units.gridUnit * 1.5
                 
-                colorGroup: Kirigami.Theme.Window
+                Kirigami.Theme.colorSet: Kirigami.Theme.Window
+                Kirigami.Theme.inherit: false
+
                 backgroundColor: "transparent"
                 showSecondRow: false
                 showDropShadow: false

components/mobileshell/qml/components/StartupFeedback.qml

@@ -6,7 +6,6 @@ import QtQuick
 import QtQuick.Effects
 import QtQuick.Layouts
 import QtQuick.Window
-import org.kde.plasma.core 2.0 as PlasmaCore
 
 import org.kde.kirigami as Kirigami
 
@@ -183,10 +182,9 @@ MouseArea { // use mousearea to ensure clicks don't go behind
             width: Kirigami.Units.iconSizes.enormous
             height: width
 
-            PlasmaCore.IconItem {
+            Kirigami.Icon {
                 id: icon
                 anchors.fill: parent
-                colorGroup: Kirigami.Theme.ComplementaryColorGroup
             }
 
             MultiEffect {

components/mobileshell/qml/navigationpanel/NavigationPanelButton.qml

@@ -70,6 +70,5 @@ Controls.AbstractButton {
             fill: parent
             margins: Math.round((side - side * iconSizeFactor * 0.6) / 2)
         }
-        colorSet: Kirigami.Theme.colorSet
     }
 }

components/mobileshell/qml/statusbar/ClockText.qml

@@ -12,6 +12,8 @@ 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
 
+import org.kde.kirigami as Kirigami
+
 import "indicators" as Indicators
 
 PlasmaComponents.Label {

components/mobileshell/qml/statusbar/StatusBar.qml

@@ -12,7 +12,7 @@ import QtQuick.Effects
 import QtQuick.Controls as Controls
 import QtQml.Models
 
-import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigami as Kirigami
 
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.plasma5support 2.0 as P5Support
@@ -25,11 +25,6 @@ import "../components" as Components
 Item {
     id: root
     
-    /**
-     * The color group used for status bar elements.
-     */
-    required property var colorGroup
-    
     /**
      * Whether to show a drop shadow under the status bar.
      */
@@ -55,7 +50,7 @@ Item {
      */
     property bool disableSystemTray: false
     
-    property alias colorScopeColor: icons.backgroundColor
+    property color colorScopeColor: Kirigami.Theme.backgroundColor
     
     readonly property real textPixelSize: 11
     readonly property real smallerTextPixelSize: 9
@@ -102,8 +97,6 @@ Item {
     Item {
         id: icons
         z: 1
-        Kirigami.Theme.colorSet: root.Kirigami.Theme.colorSet
-        Kirigami.Theme.inherit: false
         anchors.fill: parent
         
         Controls.Control {
@@ -115,6 +108,7 @@ Item {
             
             anchors.fill: parent
             background: Rectangle {
+                id: panelBackground
                 color: backgroundColor
             }
             

components/mobileshell/qml/statusbar/TaskWidget.qml

@@ -4,9 +4,8 @@
  *   SPDX-License-Identifier: LGPL-2.0-or-later
  */
 
-import QtQuick 2.1
+import QtQuick
-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.kirigami as Kirigami
-import org.kde.kirigami 2.20 as Kirigami
 
 Item {
     id: taskIcon
@@ -23,13 +22,12 @@ Item {
         }
     }
 
-    PlasmaCore.IconItem {
+    Kirigami.Icon {
         id: icon
         source: IconName ? IconName : Icon
         width: Math.min(parent.width, parent.height)
         height: width
         anchors.centerIn: parent
-        colorSet: Kirigami.Theme.colorSet
     }
 
     MouseArea {

components/mobileshell/qml/statusbar/indicators/BluetoothIndicator.qml

@@ -9,19 +9,17 @@
 import QtQuick
 import QtQuick.Layouts
 
-import org.kde.plasma.core as PlasmaCore
 import org.kde.kirigami 2.20 as Kirigami
 import org.kde.bluezqt as BluezQt
 
 import "../../dataproviders" as DataProviders
 
-PlasmaCore.IconItem {
+Kirigami.Icon {
     id: connectionIcon
     
     readonly property var provider: DataProviders.BluetoothInfo {}
 
     source: "network-bluetooth" // provider.icon
-    colorSet: Kirigami.Theme.colorSet
 
     visible: provider.isVisible
 }

components/mobileshell/qml/statusbar/indicators/InternetIndicator.qml

@@ -8,12 +8,11 @@
 
 import QtQuick
 import QtQuick.Layouts
-import org.kde.plasma.core as PlasmaCore
 import org.kde.plasma.components 3.0 as PlasmaComponents
 import org.kde.plasma.networkmanagement 0.2 as PlasmaNM
-import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigami as Kirigami
 
-PlasmaCore.IconItem {
+Kirigami.Icon {
     id: connectionIcon
     
     // data
@@ -40,7 +39,6 @@ PlasmaCore.IconItem {
     // implementation
     
     source: icon
-    colorSet: Kirigami.Theme.colorSet
 
     PlasmaComponents.BusyIndicator {
         id: connectingIndicator

components/mobileshell/qml/statusbar/indicators/SignalStrengthIndicator.qml

@@ -10,7 +10,7 @@ import QtQuick.Layouts
 
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 3.0 as PlasmaComponents
-import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigami as Kirigami
 
 import "../../dataproviders" as DataProviders
 
@@ -28,9 +28,8 @@ Item {
     width: strengthIcon.width + label.width
     Layout.minimumWidth: strengthIcon.width + label.width
 
-    PlasmaCore.IconItem {
+    Kirigami.Icon {
         id: strengthIcon
-        colorSet: Kirigami.Theme.colorSet
         anchors.left: parent.left
         anchors.verticalCenter: parent.verticalCenter
         width: height

components/mobileshell/qml/statusbar/indicators/VolumeIndicator.qml

@@ -9,19 +9,16 @@
 import QtQuick
 import QtQuick.Layouts
 
-import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.private.volume 0.1
-import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigami as Kirigami
 
 import "../../dataproviders" as DataProviders
 
-PlasmaCore.IconItem {
+Kirigami.Icon {
     id: paIcon
     readonly property var provider: DataProviders.AudioInfo {}
     
     source: provider.icon
 
-    colorSet: Kirigami.Theme.colorSet
-
     visible: provider.isVisible
 }

containments/panel/package/contents/ui/main.qml

@@ -77,8 +77,10 @@ ContainmentItem {
         id: topPanel
         anchors.fill: parent
 
+        Kirigami.Theme.colorSet: root.showingApp ? Kirigami.Theme.Header : Kirigami.Theme.Complementary
+        Kirigami.Theme.inherit: false
+
         showDropShadow: !root.showingApp
-        colorGroup: root.showingApp ? Kirigami.Theme.HeaderColorGroup : Kirigami.Theme.ComplementaryColorGroup
         backgroundColor: !root.showingApp ? "transparent" : root.backgroundColor
     }
 

containments/taskpanel/package/contents/ui/NavigationPanelComponent.qml

@@ -6,6 +6,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 
 import org.kde.plasma.plasmoid
+import org.kde.plasma.core as PlasmaCore
 import org.kde.plasma.workspace.keyboardlayout as Keyboards
 
 import org.kde.plasma.private.mobileshell as MobileShell
@@ -13,6 +14,8 @@ import org.kde.plasma.private.mobileshell.state as MobileShellState
 import org.kde.taskmanager as TaskManager
 import org.kde.plasma.private.mobileshell.windowplugin as WindowPlugin
 
+import org.kde.kirigami as Kirigami
+
 MobileShell.NavigationPanel {
     id: root
     required property bool opaqueBar
@@ -22,7 +25,7 @@ MobileShell.NavigationPanel {
     // - translucent if the task switcher is open
     // - transparent if on the homescreen
     backgroundColor: (Keyboards.KWinVirtualKeyboard.visible || opaqueBar) ? Kirigami.Theme.backgroundColor : "transparent";
-    foregroundColorGroup: opaqueBar ? Kirigami.Theme.Window : Kirigami.Theme.ComplementaryColorGroup
+    foregroundColorGroup: opaqueBar ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup
     shadow: !opaqueBar
         
     TaskManager.VirtualDesktopInfo {

initialstart/qml/Wizard.qml

@@ -122,7 +122,6 @@ Kirigami.Page {
 
         height: Kirigami.Units.gridUnit * 1.25
 
-        colorGroup: Kirigami.Theme.ComplementaryColorGroup
         backgroundColor: "transparent"
 
         showSecondRow: false

kwin/mobiletaskswitcher/qml/TaskSwitcher.qml

@@ -161,7 +161,7 @@ FocusScope {
         z: 1
         visible: ShellSettings.Settings.navigationPanelEnabled
         backgroundColor: Qt.rgba(0, 0, 0, 0.1)
-        foregroundColorGroup: Kirigami.Theme.ComplementaryColorGroup
+        foregroundColorGroup: PlasmaCore.Theme.ComplementaryColorGroup
         shadow: false
 
         leftAction: MobileShell.NavigationPanelAction {