diff -Nru qqc2-desktop-style-5.47.0/CMakeLists.txt qqc2-desktop-style-5.48.0/CMakeLists.txt
--- qqc2-desktop-style-5.47.0/CMakeLists.txt	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/CMakeLists.txt	2018-07-07 21:54:12.000000000 +0000
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 
-set(KF5_VERSION "5.47.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.47.0") # handled by release scripts
+set(KF5_VERSION "5.48.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.48.0") # handled by release scripts
 
 project(qqc2-desktop-style VERSION ${KF5_VERSION})
 
@@ -21,7 +21,7 @@
 
 ################# set KDE specific information #################
 
-find_package(ECM 5.47.0 REQUIRED NO_MODULE)
+find_package(ECM 5.48.0 REQUIRED NO_MODULE)
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
diff -Nru qqc2-desktop-style-5.47.0/debian/changelog qqc2-desktop-style-5.48.0/debian/changelog
--- qqc2-desktop-style-5.47.0/debian/changelog	2018-06-22 16:15:55.000000000 +0000
+++ qqc2-desktop-style-5.48.0/debian/changelog	2018-07-10 09:04:13.000000000 +0000
@@ -1,8 +1,9 @@
-qqc2-desktop-style (5.47.0-0ubuntu2~ubuntu18.04~ppa1) bionic; urgency=medium
+qqc2-desktop-style (5.48.0-0ubuntu1~ubuntu18.04~ppa10) bionic; urgency=medium
 
   * No change rebuild against Qt 5.10
+  * New upstream release (5.48.0)
 
- -- Rik Mills <rikmills@kubuntu.org>  Fri, 22 Jun 2018 17:15:55 +0100
+ -- Rik Mills <rikmills@kubuntu.org>  Tue, 10 Jul 2018 09:04:13 +0000
 
 qqc2-desktop-style (5.47.0-0ubuntu1) cosmic; urgency=medium
 
diff -Nru qqc2-desktop-style-5.47.0/debian/control qqc2-desktop-style-5.48.0/debian/control
--- qqc2-desktop-style-5.47.0/debian/control	2018-06-22 16:15:55.000000000 +0000
+++ qqc2-desktop-style-5.48.0/debian/control	2018-07-10 09:04:13.000000000 +0000
@@ -6,9 +6,9 @@
 Build-Depends: cmake (>= 3.0~),
                dbus-x11,
                debhelper (>= 11~),
-               extra-cmake-modules (>= 5.47.0~),
-               kirigami2-dev (>= 5.47.0~),
-               libkf5iconthemes-dev (>= 5.47.0~),
+               extra-cmake-modules (>= 5.48.0~),
+               kirigami2-dev (>= 5.48.0~),
+               libkf5iconthemes-dev (>= 5.48.0~),
                libqt5x11extras5-dev (>= 5.8.0~),
                pkg-config,
                pkg-kde-tools (>= 0.15.18~),
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/BusyIndicator.qml qqc2-desktop-style-5.48.0/org.kde.desktop/BusyIndicator.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/BusyIndicator.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/BusyIndicator.qml	2018-07-07 21:54:12.000000000 +0000
@@ -21,7 +21,7 @@
 
 
 import QtQuick 2.6
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 import QtQuick.Templates @QQC2_VERSION@ as T
 
 T.BusyIndicator {
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/Button.qml qqc2-desktop-style-5.48.0/org.kde.desktop/Button.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/Button.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/Button.qml	2018-07-07 21:54:12.000000000 +0000
@@ -22,7 +22,7 @@
 import QtQuick 2.6
 import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
-import org.kde.kirigami 2.3 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.Button {
     id: controlRoot
@@ -48,6 +48,7 @@
     }
     background: StylePrivate.StyleItem {
         id: styleitem
+        anchors.fill: parent
         control: controlRoot
         elementType: "button"
         sunken: controlRoot.pressed || (controlRoot.checkable && controlRoot.checked)
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/CheckBox.qml qqc2-desktop-style-5.48.0/org.kde.desktop/CheckBox.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/CheckBox.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/CheckBox.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,7 +23,7 @@
 import QtQuick 2.6
 import QtQuick.Templates @QQC2_VERSION@ as T
 import QtQuick.Controls @QQC2_VERSION@
-import org.kde.kirigami 2.3 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 import "private"
 
 T.CheckBox {
@@ -38,6 +38,7 @@
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
     padding: 1
+    spacing: Kirigami.Units.smallSpacing
 
     hoverEnabled: true
 
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/CheckDelegate.qml qqc2-desktop-style-5.48.0/org.kde.desktop/CheckDelegate.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/CheckDelegate.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/CheckDelegate.qml	2018-07-07 21:54:12.000000000 +0000
@@ -22,7 +22,7 @@
 
 import QtQuick 2.5
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 import "private"
 
 T.CheckDelegate {
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/CheckIndicator.qml qqc2-desktop-style-5.48.0/org.kde.desktop/CheckIndicator.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/CheckIndicator.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/CheckIndicator.qml	2018-07-07 21:54:12.000000000 +0000
@@ -31,7 +31,7 @@
     hover: control.hovered
     enabled: control.enabled
     properties: {"partiallyChecked": (control.checkState === Qt.PartiallyChecked) }
-    implicitWidth: pixelMetric("indicatorwidth") + 4
+    implicitWidth: pixelMetric("indicatorwidth")
     implicitHeight : implicitWidth
 }
 
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/ComboBox.qml qqc2-desktop-style-5.48.0/org.kde.desktop/ComboBox.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/ComboBox.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/ComboBox.qml	2018-07-07 21:54:12.000000000 +0000
@@ -26,7 +26,7 @@
 import QtQuick.Controls @QQC2_VERSION@ as Controls
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
 import QtGraphicalEffects 1.0
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.ComboBox {
     id: controlRoot
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/Control.qml qqc2-desktop-style-5.48.0/org.kde.desktop/Control.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/Control.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/Control.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,7 +23,7 @@
 import QtQuick 2.6
 import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
-import org.kde.kirigami 2.3 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.Control {
     id: control
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/DelayButton.qml qqc2-desktop-style-5.48.0/org.kde.desktop/DelayButton.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/DelayButton.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/DelayButton.qml	2018-07-07 21:54:12.000000000 +0000
@@ -22,7 +22,7 @@
 import QtQuick 2.6
 import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.DelayButton {
     id: controlRoot
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/DialogButtonBox.qml qqc2-desktop-style-5.48.0/org.kde.desktop/DialogButtonBox.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/DialogButtonBox.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/DialogButtonBox.qml	2018-07-07 21:54:12.000000000 +0000
@@ -22,7 +22,7 @@
 
 import QtQuick 2.6
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.3 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.DialogButtonBox {
     id: control
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/Dialog.qml qqc2-desktop-style-5.48.0/org.kde.desktop/Dialog.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/Dialog.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/Dialog.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,7 +23,7 @@
 import QtQuick 2.6
 import QtGraphicalEffects 1.0
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.Dialog {
     id: control
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/Dial.qml qqc2-desktop-style-5.48.0/org.kde.desktop/Dial.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/Dial.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/Dial.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,7 +23,7 @@
 import QtQuick 2.6
 import QtQuick.Controls @QQC2_VERSION@
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
 
 T.Dial {
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/Drawer.qml qqc2-desktop-style-5.48.0/org.kde.desktop/Drawer.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/Drawer.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/Drawer.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,7 +23,7 @@
 import QtQuick 2.6
 import QtQuick.Controls @QQC2_VERSION@
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.Drawer {
     id: control
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/Frame.qml qqc2-desktop-style-5.48.0/org.kde.desktop/Frame.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/Frame.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/Frame.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,7 +23,7 @@
 import QtQuick 2.6
 import QtQuick.Controls @QQC2_VERSION@
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.Frame {
     id: control
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/GroupBox.qml qqc2-desktop-style-5.48.0/org.kde.desktop/GroupBox.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/GroupBox.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/GroupBox.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,7 +23,7 @@
 import QtQuick 2.6
 import QtQuick.Controls @QQC2_VERSION@
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.GroupBox {
     id: control
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/ItemDelegate.qml qqc2-desktop-style-5.48.0/org.kde.desktop/ItemDelegate.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/ItemDelegate.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/ItemDelegate.qml	2018-07-07 21:54:12.000000000 +0000
@@ -22,7 +22,7 @@
 
 import QtQuick 2.5
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 import "private"
 
 T.ItemDelegate {
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/Label.qml qqc2-desktop-style-5.48.0/org.kde.desktop/Label.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/Label.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/Label.qml	2018-07-07 21:54:12.000000000 +0000
@@ -24,7 +24,7 @@
 import QtQuick.Window 2.2
 import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.Label {
     id: control
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/MenuBarItem.qml qqc2-desktop-style-5.48.0/org.kde.desktop/MenuBarItem.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/MenuBarItem.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/MenuBarItem.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,7 +23,7 @@
 import QtQuick 2.6
 import QtQuick.Layouts 1.2
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.3 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.MenuBarItem {
     id: controlRoot
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/MenuItem.qml qqc2-desktop-style-5.48.0/org.kde.desktop/MenuItem.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/MenuItem.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/MenuItem.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,7 +23,7 @@
 import QtQuick 2.6
 import QtQuick.Layouts 1.2
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.3 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.MenuItem {
     id: controlRoot
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/Menu.qml qqc2-desktop-style-5.48.0/org.kde.desktop/Menu.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/Menu.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/Menu.qml	2018-07-07 21:54:12.000000000 +0000
@@ -25,7 +25,7 @@
 import QtGraphicalEffects 1.0
 import QtQuick.Controls @QQC2_VERSION@
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.Menu {
     id: control
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/Popup.qml qqc2-desktop-style-5.48.0/org.kde.desktop/Popup.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/Popup.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/Popup.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,7 +23,7 @@
 import QtQuick 2.6
 import QtGraphicalEffects 1.0
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.Popup {
     id: control
@@ -38,6 +38,7 @@
     contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0)
 
     padding: 12
+    clip: true
 
     enter: Transition {
         NumberAnimation {
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/private/DefaultListItemBackground.qml qqc2-desktop-style-5.48.0/org.kde.desktop/private/DefaultListItemBackground.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/private/DefaultListItemBackground.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/private/DefaultListItemBackground.qml	2018-07-07 21:54:12.000000000 +0000
@@ -21,7 +21,7 @@
 
 
 import QtQuick 2.1
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 Rectangle {
     id: background
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/ProgressBar.qml qqc2-desktop-style-5.48.0/org.kde.desktop/ProgressBar.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/ProgressBar.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/ProgressBar.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,7 +23,7 @@
 import QtQuick 2.6
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.3 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.ProgressBar {
     id: controlRoot
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/RadioButton.qml qqc2-desktop-style-5.48.0/org.kde.desktop/RadioButton.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/RadioButton.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/RadioButton.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,7 +23,7 @@
 import QtQuick 2.6
 import QtQuick.Templates @QQC2_VERSION@ as T
 import QtQuick.Controls @QQC2_VERSION@
-import org.kde.kirigami 2.3 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 import "private"
 
 T.RadioButton {
@@ -38,10 +38,11 @@
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
     padding: 1
+    spacing: Kirigami.Units.smallSpacing
 
     hoverEnabled: true
 
-    indicator: RadioIndicator {
+    indicator: CheckIndicator {
         LayoutMirroring.enabled: controlRoot.mirrored
         LayoutMirroring.childrenInherit: true
         anchors {
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/RadioDelegate.qml qqc2-desktop-style-5.48.0/org.kde.desktop/RadioDelegate.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/RadioDelegate.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/RadioDelegate.qml	2018-07-07 21:54:12.000000000 +0000
@@ -22,7 +22,7 @@
 
 import QtQuick 2.5
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 import "private"
 
 T.RadioDelegate {
@@ -51,7 +51,7 @@
         verticalAlignment: Text.AlignVCenter
     }
 
-    indicator: RadioIndicator {
+    indicator: CheckIndicator {
         x: controlRoot.mirrored ? controlRoot.leftPadding : controlRoot.width - width - controlRoot.rightPadding
         y: controlRoot.topPadding + (controlRoot.availableHeight - height) / 2
 
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/RadioIndicator.qml qqc2-desktop-style-5.48.0/org.kde.desktop/RadioIndicator.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/RadioIndicator.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/RadioIndicator.qml	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright 2017 Marco Martin <mart@kde.org>
- * Copyright 2017 The Qt Company Ltd.
- *
- * GNU Lesser General Public License Usage
- * Alternatively, this file may be used under the terms of the GNU Lesser
- * General Public License version 3 as published by the Free Software
- * Foundation and appearing in the file LICENSE.LGPLv3 included in the
- * packaging of this file. Please review the following information to
- * ensure the GNU Lesser General Public License version 3 requirements
- * will be met: https://www.gnu.org/licenses/lgpl.html.
- *
- * GNU General Public License Usage
- * Alternatively, this file may be used under the terms of the GNU
- * General Public License version 2.0 or later as published by the Free
- * Software Foundation and appearing in the file LICENSE.GPL included in
- * the packaging of this file. Please review the following information to
- * ensure the GNU General Public License version 2.0 requirements will be
- * met: http://www.gnu.org/licenses/gpl-2.0.html.
- */
-
-
-import QtQuick 2.6
-import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
-
-StylePrivate.StyleItem {
-    id: styleitem
-    elementType: "radiobutton"
-    sunken: control.pressed
-    on: control.checked || control.pressed
-    hover: control.hovered
-    enabled: control.enabled
-    implicitWidth: pixelMetric("indicatorwidth") + 4
-    implicitHeight : implicitWidth
-}
-
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/RangeSlider.qml qqc2-desktop-style-5.48.0/org.kde.desktop/RangeSlider.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/RangeSlider.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/RangeSlider.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,7 +23,7 @@
 import QtQuick 2.6
 import QtQuick.Controls @QQC2_VERSION@
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.RangeSlider {
     id: control
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/RoundButton.qml qqc2-desktop-style-5.48.0/org.kde.desktop/RoundButton.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/RoundButton.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/RoundButton.qml	2018-07-07 21:54:12.000000000 +0000
@@ -24,7 +24,7 @@
 import QtQuick.Templates @QQC2_VERSION@ as T
 import QtQuick.Controls @QQC2_VERSION@ as Controls
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.RoundButton {
     id: controlRoot
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/ScrollBar.qml qqc2-desktop-style-5.48.0/org.kde.desktop/ScrollBar.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/ScrollBar.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/ScrollBar.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,7 +23,7 @@
 import QtQuick 2.6
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.ScrollBar {
     id: controlRoot
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/ScrollView.qml qqc2-desktop-style-5.48.0/org.kde.desktop/ScrollView.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/ScrollView.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/ScrollView.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,7 +23,7 @@
 import QtQuick 2.9
 import QtQuick.Controls @QQC2_VERSION@
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
 
 T.ScrollView {
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/Slider.qml qqc2-desktop-style-5.48.0/org.kde.desktop/Slider.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/Slider.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/Slider.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,14 +23,14 @@
 import QtQuick 2.6
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.Slider {
     id: controlRoot
     @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
     Kirigami.Theme.colorSet: Kirigami.Theme.Button
 
-    implicitWidth: background.implicitWidth
+    implicitWidth: Kirigami.Units.gridUnit * 12
     implicitHeight: background.implicitHeight
 
     hoverEnabled: true
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/SpinBox.qml qqc2-desktop-style-5.48.0/org.kde.desktop/SpinBox.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/SpinBox.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/SpinBox.qml	2018-07-07 21:54:12.000000000 +0000
@@ -22,7 +22,7 @@
 
 import QtQuick 2.6
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
 
 T.SpinBox {
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/SwitchDelegate.qml qqc2-desktop-style-5.48.0/org.kde.desktop/SwitchDelegate.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/SwitchDelegate.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/SwitchDelegate.qml	2018-07-07 21:54:12.000000000 +0000
@@ -21,7 +21,7 @@
 
 
 import QtQuick 2.5
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 import QtQuick.Templates @QQC2_VERSION@ as T
 import "private"
 
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/Switch.qml qqc2-desktop-style-5.48.0/org.kde.desktop/Switch.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/Switch.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/Switch.qml	2018-07-07 21:54:12.000000000 +0000
@@ -22,7 +22,7 @@
 
 import QtQuick 2.6
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.3 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.CheckBox {
     id: control
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/TabBar.qml qqc2-desktop-style-5.48.0/org.kde.desktop/TabBar.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/TabBar.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/TabBar.qml	2018-07-07 21:54:12.000000000 +0000
@@ -22,7 +22,7 @@
 
 import QtQuick 2.6
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 import QtQuick.Templates @QQC2_VERSION@ as T
 
 T.TabBar {
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/TabButton.qml qqc2-desktop-style-5.48.0/org.kde.desktop/TabButton.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/TabButton.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/TabButton.qml	2018-07-07 21:54:12.000000000 +0000
@@ -26,7 +26,7 @@
 import QtQuick.Controls @QQC2_VERSION@
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.3 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.TabButton {
     id: controlRoot
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/TextArea.qml qqc2-desktop-style-5.48.0/org.kde.desktop/TextArea.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/TextArea.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/TextArea.qml	2018-07-07 21:54:12.000000000 +0000
@@ -23,7 +23,7 @@
 import QtQuick 2.6
 import QtQuick.Window 2.1
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
 
 T.TextArea {
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/TextField.qml qqc2-desktop-style-5.48.0/org.kde.desktop/TextField.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/TextField.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/TextField.qml	2018-07-07 21:54:12.000000000 +0000
@@ -24,7 +24,7 @@
 import QtQuick.Window 2.1
 import QtQuick.Controls @QQC2_VERSION@ as Controls
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
 
 T.TextField {
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/ToolBar.qml qqc2-desktop-style-5.48.0/org.kde.desktop/ToolBar.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/ToolBar.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/ToolBar.qml	2018-07-07 21:54:12.000000000 +0000
@@ -22,7 +22,7 @@
 
 import QtQuick 2.6
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.ToolBar {
     id: controlRoot
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/ToolButton.qml qqc2-desktop-style-5.48.0/org.kde.desktop/ToolButton.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/ToolButton.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/ToolButton.qml	2018-07-07 21:54:12.000000000 +0000
@@ -22,7 +22,7 @@
 
 import QtQuick 2.6
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.3 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
 
 T.ToolButton {
diff -Nru qqc2-desktop-style-5.47.0/org.kde.desktop/ToolTip.qml qqc2-desktop-style-5.48.0/org.kde.desktop/ToolTip.qml
--- qqc2-desktop-style-5.47.0/org.kde.desktop/ToolTip.qml	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/org.kde.desktop/ToolTip.qml	2018-07-07 21:54:12.000000000 +0000
@@ -24,7 +24,7 @@
 import QtGraphicalEffects 1.0
 import QtQuick.Controls @QQC2_VERSION@ as Controls
 import QtQuick.Templates @QQC2_VERSION@ as T
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 T.ToolTip {
     id: controlRoot
diff -Nru qqc2-desktop-style-5.47.0/plugin/kquickstyleitem.cpp qqc2-desktop-style-5.48.0/plugin/kquickstyleitem.cpp
--- qqc2-desktop-style-5.47.0/plugin/kquickstyleitem.cpp	2018-06-02 16:30:33.000000000 +0000
+++ qqc2-desktop-style-5.48.0/plugin/kquickstyleitem.cpp	2018-07-07 21:54:12.000000000 +0000
@@ -713,11 +713,15 @@
         return;
 
     const QVariant controlPalette = m_control ? m_control->property("palette") : QVariant();
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
     if (controlPalette.isValid()) {
         m_styleoption->palette = controlPalette.value<QPalette>();
     } else {
         m_styleoption->palette = m_theme->palette();
     }
+#else
+    m_styleoption->palette = m_theme->palette();
+#endif
 }
 
 /*