Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package qqc2-desktop-style for 
openSUSE:Factory checked in at 2021-05-10 15:36:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old)
 and      /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "qqc2-desktop-style"

Mon May 10 15:36:02 2021 rev:46 rq:891795 version:5.82.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes    
2021-04-12 12:37:11.757357506 +0200
+++ 
/work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.2988/qqc2-desktop-style.changes
  2021-05-10 15:37:57.173906613 +0200
@@ -1,0 +2,14 @@
+Sat May  1 16:41:24 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.82.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/frameworks/5/5.82.0
+- Changes since 5.81.0:
+  * Draw icon in QQStyleItem
+  * [CheckBox] Rewrite to be nearly identical to RadioButton (kde#435934)
+  * [RadioButton] Correct typo
+  * Add failing test case to illustrate Bug 435934
+  * Keep context menu above other popups, use dismiss() (kde#428631)
+
+-------------------------------------------------------------------

Old:
----
  qqc2-desktop-style-5.81.0.tar.xz
  qqc2-desktop-style-5.81.0.tar.xz.sig

New:
----
  qqc2-desktop-style-5.82.0.tar.xz
  qqc2-desktop-style-5.82.0.tar.xz.sig

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qqc2-desktop-style.spec ++++++
--- /var/tmp/diff_new_pack.BSenZD/_old  2021-05-10 15:37:57.729904414 +0200
+++ /var/tmp/diff_new_pack.BSenZD/_new  2021-05-10 15:37:57.733904398 +0200
@@ -16,11 +16,11 @@
 #
 
 
-%define _tar_path 5.81
+%define _tar_path 5.82
 # Only needed for the package signature condition
 %bcond_without lang
 Name:           qqc2-desktop-style
-Version:        5.81.0
+Version:        5.82.0
 Release:        0
 Summary:        A Qt Quick Controls 2 Style for Desktop UIs
 License:        GPL-2.0-or-later
@@ -73,7 +73,7 @@
 Usually not needed as it is only a runtime dependency.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %cmake_kf5 -d build


++++++ qqc2-desktop-style-5.81.0.tar.xz -> qqc2-desktop-style-5.82.0.tar.xz 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qqc2-desktop-style-5.81.0/.gitignore 
new/qqc2-desktop-style-5.82.0/.gitignore
--- old/qqc2-desktop-style-5.81.0/.gitignore    2021-04-03 11:39:50.000000000 
+0200
+++ new/qqc2-desktop-style-5.82.0/.gitignore    2021-05-01 11:48:15.000000000 
+0200
@@ -22,3 +22,6 @@
 .cmake/
 /.clang-format
 /compile_commands.json
+.clangd
+.idea
+/cmake-build*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qqc2-desktop-style-5.81.0/CMakeLists.txt 
new/qqc2-desktop-style-5.82.0/CMakeLists.txt
--- old/qqc2-desktop-style-5.81.0/CMakeLists.txt        2021-04-03 
11:39:50.000000000 +0200
+++ new/qqc2-desktop-style-5.82.0/CMakeLists.txt        2021-05-01 
11:48:15.000000000 +0200
@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.5)
 
-set(KF_VERSION "5.81.0") # handled by release scripts
-set(KF_DEP_VERSION "5.81.0") # handled by release scripts
+set(KF_VERSION "5.82.0") # handled by release scripts
+set(KF_DEP_VERSION "5.82.0") # handled by release scripts
 
 project(qqc2-desktop-style VERSION ${KF_VERSION})
 
-set(REQUIRED_QT_VERSION 5.14.0)
+set(REQUIRED_QT_VERSION 5.15.0)
 
 ################# Disallow in-source build #################
 
@@ -21,7 +21,7 @@
 
 ################# set KDE specific information #################
 
-find_package(ECM 5.81.0 REQUIRED NO_MODULE)
+find_package(ECM 5.82.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})
@@ -110,8 +110,8 @@
 
 #########################################################################
 add_definitions(-DQT_NO_FOREACH)
-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00)
-add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055000)
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
+add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100)
 add_subdirectory(plugin)
 
 if (KF5IconThemes_FOUND AND KF5WidgetsAddons_FOUND)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qqc2-desktop-style-5.81.0/org.kde.desktop/CheckBox.qml 
new/qqc2-desktop-style-5.82.0/org.kde.desktop/CheckBox.qml
--- old/qqc2-desktop-style-5.81.0/org.kde.desktop/CheckBox.qml  2021-04-03 
11:39:50.000000000 +0200
+++ new/qqc2-desktop-style-5.82.0/org.kde.desktop/CheckBox.qml  2021-05-01 
11:48:15.000000000 +0200
@@ -9,20 +9,33 @@
 import QtQuick 2.6
 import QtQuick.Templates @QQC2_VERSION@ as T
 import QtQuick.Controls @QQC2_VERSION@
-import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
 import org.kde.kirigami 2.4 as Kirigami
+import "private"
 
 T.CheckBox {
     id: controlRoot
 
     palette: Kirigami.Theme.palette
-    implicitWidth: background.implicitWidth
-    implicitHeight: background.implicitHeight
+    implicitWidth: Math.max(background ? background.implicitWidth : 0,
+                            contentItem.implicitWidth + leftPadding + 
rightPadding)
+    implicitHeight: Math.max(background ? background.implicitHeight : 0,
+                             Math.max(contentItem.implicitHeight,
+                                      indicator ? indicator.implicitHeight : 
0) + topPadding + bottomPadding)
+    baselineOffset: contentItem.y + contentItem.baselineOffset
+
+    spacing: indicator && typeof indicator.pixelMetric === "function" ? 
indicator.pixelMetric("checkboxlabelspacing") : Kirigami.Units.smallSpacing
 
     hoverEnabled: true
 
-    contentItem: Item {}
-    indicator: Item {}
+    indicator: CheckIndicator {
+        LayoutMirroring.enabled: controlRoot.mirrored
+        LayoutMirroring.childrenInherit: true
+        anchors {
+            left: parent.left
+            verticalCenter: parent.verticalCenter
+        }
+        control: controlRoot
+    }
 
     Kirigami.MnemonicData.enabled: controlRoot.enabled && controlRoot.visible
     Kirigami.MnemonicData.controlType: Kirigami.MnemonicData.ActionElement
@@ -34,23 +47,34 @@
         onActivated: controlRoot.toggle();
     }
 
-    background: StylePrivate.StyleItem {
-        id: styleItem
-        anchors.fill: parent
-        control: controlRoot
-        elementType: "checkbox"
-        sunken: control.pressed
-        on: control.checked
-        hover: control.hovered
-        enabled: control.enabled
-        text: controlRoot.Kirigami.MnemonicData.mnemonicLabel
-        hasFocus: controlRoot.activeFocus
-        properties: {
-            "icon": controlRoot.icon && controlRoot.display !== 
T.AbstractButton.TextOnly ? (controlRoot.icon.name || controlRoot.icon.source) 
: "",
-            "iconColor": controlRoot.icon && controlRoot.icon.color.a > 0 ? 
controlRoot.icon.color : Kirigami.Theme.textColor,
-            "iconWidth": controlRoot.icon && controlRoot.icon.width ? 
controlRoot.icon.width : 0,
-            "iconHeight": controlRoot.icon && controlRoot.icon.height ? 
controlRoot.icon.height : 0,
-            "partiallyChecked": control.checkState === Qt.PartiallyChecked
+    contentItem: Label {
+        readonly property int indicatorEffectiveWidth: controlRoot.indicator 
&& typeof controlRoot.indicator.pixelMetric === "function" && 
controlRoot.icon.name == "" && controlRoot.icon.source == ""
+            ? controlRoot.indicator.pixelMetric("indicatorwidth") + 
controlRoot.spacing : controlRoot.indicator.width
+
+        leftPadding: controlRoot.indicator && !controlRoot.mirrored ? 
indicatorEffectiveWidth : 0
+        rightPadding: controlRoot.indicator && controlRoot.mirrored ? 
indicatorEffectiveWidth : 0
+        opacity: controlRoot.enabled ? 1 : 0.6
+        text: controlRoot.Kirigami.MnemonicData.richTextLabel
+        font: controlRoot.font
+        elide: Text.ElideRight
+        visible: controlRoot.text
+        horizontalAlignment: Text.AlignLeft
+        verticalAlignment: Text.AlignVCenter
+
+        FocusRect {
+            control: controlRoot
+
+            anchors {
+                leftMargin: (controlRoot.mirrored ? parent.rightPadding : 
parent.leftPadding ) - Kirigami.Units.smallSpacing / 2
+                left: parent.left
+                top: parent.top
+                bottom: parent.bottom
+                topMargin: parent.topPadding - 1
+                bottomMargin: parent.bottomPadding - 1
+            }
+
+            width: parent.paintedWidth + Kirigami.Units.smallSpacing
+            visible: control.activeFocus
         }
     }
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qqc2-desktop-style-5.81.0/org.kde.desktop/CheckDelegate.qml 
new/qqc2-desktop-style-5.82.0/org.kde.desktop/CheckDelegate.qml
--- old/qqc2-desktop-style-5.81.0/org.kde.desktop/CheckDelegate.qml     
2021-04-03 11:39:50.000000000 +0200
+++ new/qqc2-desktop-style-5.82.0/org.kde.desktop/CheckDelegate.qml     
2021-05-01 11:48:15.000000000 +0200
@@ -29,8 +29,11 @@
     bottomPadding: padding
 
     contentItem: Label {
-        leftPadding: controlRoot.mirrored ? (controlRoot.indicator ? 
controlRoot.indicator.width : 0) + controlRoot.spacing : 0
-        rightPadding: !controlRoot.mirrored ? (controlRoot.indicator ? 
controlRoot.indicator.width : 0) + controlRoot.spacing : 0
+        readonly property int indicatorEffectiveWidth: controlRoot.indicator 
&& typeof controlRoot.indicator.pixelMetric === "function" && 
controlRoot.icon.name == "" && controlRoot.icon.source == ""
+            ? controlRoot.indicator.pixelMetric("indicatorwidth") + 
controlRoot.spacing : controlRoot.indicator.width
+
+        leftPadding: controlRoot.indicator && !controlRoot.mirrored ? 
indicatorEffectiveWidth : 0
+        rightPadding: controlRoot.indicator && controlRoot.mirrored ? 
indicatorEffectiveWidth : 0
 
         text: controlRoot.text
         font: controlRoot.font
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qqc2-desktop-style-5.81.0/org.kde.desktop/CheckIndicator.qml 
new/qqc2-desktop-style-5.82.0/org.kde.desktop/CheckIndicator.qml
--- old/qqc2-desktop-style-5.81.0/org.kde.desktop/CheckIndicator.qml    
2021-04-03 11:39:50.000000000 +0200
+++ new/qqc2-desktop-style-5.82.0/org.kde.desktop/CheckIndicator.qml    
2021-05-01 11:48:15.000000000 +0200
@@ -7,14 +7,25 @@
 
 
 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.4 as Kirigami
 
 StylePrivate.StyleItem {
     id: styleitem
+
+    property bool drawIcon: true
+
     elementType: control.autoExclusive ? "radiobutton" : "checkbox"
     sunken: control.pressed
     on: control.checked
     hover: control.hovered
     enabled: control.enabled
-    properties: {"partiallyChecked": (control.checkState === 
Qt.PartiallyChecked) }
+    properties: {
+        "icon": styleitem.drawIcon && controlRoot.icon && controlRoot.display 
!== T.AbstractButton.TextOnly ? (controlRoot.icon.name || 
controlRoot.icon.source) : "",
+        "iconColor": styleitem.drawIcon && controlRoot.icon && 
controlRoot.icon.color.a > 0 ? controlRoot.icon.color : 
Kirigami.Theme.textColor,
+        "iconWidth": styleitem.drawIcon && controlRoot.icon && 
controlRoot.icon.width ? controlRoot.icon.width : 0,
+        "iconHeight": styleitem.drawIcon && controlRoot.icon && 
controlRoot.icon.height ? controlRoot.icon.height : 0,
+        "partiallyChecked": control.checkState === Qt.PartiallyChecked
+    }
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qqc2-desktop-style-5.81.0/org.kde.desktop/MenuItem.qml 
new/qqc2-desktop-style-5.82.0/org.kde.desktop/MenuItem.qml
--- old/qqc2-desktop-style-5.81.0/org.kde.desktop/MenuItem.qml  2021-04-03 
11:39:50.000000000 +0200
+++ new/qqc2-desktop-style-5.82.0/org.kde.desktop/MenuItem.qml  2021-05-01 
11:48:15.000000000 +0200
@@ -108,6 +108,8 @@
         x: controlRoot.mirrored ? controlRoot.width - width - 
controlRoot.rightPadding : controlRoot.leftPadding
         y: controlRoot.topPadding + (controlRoot.availableHeight - height) / 2
 
+        drawIcon: false // We're drawing it ourselves in this control
+
         visible: controlRoot.checkable
         on: controlRoot.checked
         control: controlRoot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qqc2-desktop-style-5.81.0/org.kde.desktop/RadioButton.qml 
new/qqc2-desktop-style-5.82.0/org.kde.desktop/RadioButton.qml
--- old/qqc2-desktop-style-5.81.0/org.kde.desktop/RadioButton.qml       
2021-04-03 11:39:50.000000000 +0200
+++ new/qqc2-desktop-style-5.82.0/org.kde.desktop/RadioButton.qml       
2021-05-01 11:48:15.000000000 +0200
@@ -23,7 +23,7 @@
                                       indicator ? indicator.implicitHeight : 
0) + topPadding + bottomPadding)
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
-    spacing: indicator && typeof indicator.pixelMetric === "function" ? 
indicator.pixelMetric("ratiobuttonlabelspacing") : Kirigami.Units.smallSpacing
+    spacing: indicator && typeof indicator.pixelMetric === "function" ? 
indicator.pixelMetric("radiobuttonlabelspacing") : Kirigami.Units.smallSpacing
 
     hoverEnabled: true
 
@@ -48,11 +48,11 @@
     }
 
     contentItem: Label {
-        readonly property int indicatorEffectiveWidth: controlRoot.indicator 
&& typeof controlRoot.indicator.pixelMetric === "function"
-            ? controlRoot.indicator.pixelMetric("exclusiveindicatorwidth") : 
controlRoot.indicator.width
+        readonly property int indicatorEffectiveWidth: controlRoot.indicator 
&& typeof controlRoot.indicator.pixelMetric === "function" && 
controlRoot.icon.name == "" && controlRoot.icon.source == ""
+            ? controlRoot.indicator.pixelMetric("exclusiveindicatorwidth") + 
controlRoot.spacing : controlRoot.indicator.width
 
-        leftPadding: controlRoot.indicator && !controlRoot.mirrored ? 
indicatorEffectiveWidth + controlRoot.spacing : 0
-        rightPadding: controlRoot.indicator && controlRoot.mirrored ? 
indicatorEffectiveWidth + controlRoot.spacing : 0
+        leftPadding: controlRoot.indicator && !controlRoot.mirrored ? 
indicatorEffectiveWidth : 0
+        rightPadding: controlRoot.indicator && controlRoot.mirrored ? 
indicatorEffectiveWidth : 0
         opacity: controlRoot.enabled ? 1 : 0.6
         text: controlRoot.Kirigami.MnemonicData.richTextLabel
         font: controlRoot.font
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qqc2-desktop-style-5.81.0/org.kde.desktop/RadioDelegate.qml 
new/qqc2-desktop-style-5.82.0/org.kde.desktop/RadioDelegate.qml
--- old/qqc2-desktop-style-5.81.0/org.kde.desktop/RadioDelegate.qml     
2021-04-03 11:39:50.000000000 +0200
+++ new/qqc2-desktop-style-5.82.0/org.kde.desktop/RadioDelegate.qml     
2021-05-01 11:48:15.000000000 +0200
@@ -29,8 +29,11 @@
     bottomPadding: padding
 
     contentItem: Label {
-        leftPadding: controlRoot.mirrored ? (controlRoot.indicator ? 
controlRoot.indicator.width : 0) + controlRoot.spacing : 0
-        rightPadding: !controlRoot.mirrored ? (controlRoot.indicator ? 
controlRoot.indicator.width : 0) + controlRoot.spacing : 0
+        readonly property int indicatorEffectiveWidth: controlRoot.indicator 
&& typeof controlRoot.indicator.pixelMetric === "function" && 
controlRoot.icon.name == "" && controlRoot.icon.source == ""
+            ? controlRoot.indicator.pixelMetric("exclusiveindicatorwidth") + 
controlRoot.spacing : controlRoot.indicator.width
+
+        leftPadding: controlRoot.indicator && !controlRoot.mirrored ? 
indicatorEffectiveWidth : 0
+        rightPadding: controlRoot.indicator && controlRoot.mirrored ? 
indicatorEffectiveWidth : 0
 
         text: controlRoot.text
         font: controlRoot.font
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qqc2-desktop-style-5.81.0/org.kde.desktop/private/TextFieldContextMenu.qml 
new/qqc2-desktop-style-5.82.0/org.kde.desktop/private/TextFieldContextMenu.qml
--- 
old/qqc2-desktop-style-5.81.0/org.kde.desktop/private/TextFieldContextMenu.qml  
    2021-04-03 11:39:50.000000000 +0200
+++ 
new/qqc2-desktop-style-5.82.0/org.kde.desktop/private/TextFieldContextMenu.qml  
    2021-05-01 11:48:15.000000000 +0200
@@ -20,52 +20,59 @@
     property int restoredSelectionEnd
     property bool persistentSelectionSetting
     Component.onCompleted: persistentSelectionSetting = 
persistentSelectionSetting // break binding
-    
+
     property var runOnMenuClose 
-    
+
+    parent: Overlay.overlay
+
     function storeCursorAndSelection() {
         contextMenu.restoredCursorPosition = target.cursorPosition;
         contextMenu.restoredSelectionStart = target.selectionStart;
         contextMenu.restoredSelectionEnd = target.selectionEnd;
     }
-    
+
     // target is pressed with mouse
     function targetClick(handlerPoint, newTarget) {
         if (handlerPoint.pressedButtons === Qt.RightButton) { // only accept 
just right click
             if (contextMenu.visible) {
                 deselectWhenMenuClosed = false; // don't deselect text if menu 
closed by right click on textfield
-                close();
+                dismiss();
             } else {
-                // only change parent text field if the menu is opening
-                contextMenu.parent = newTarget;
-                contextMenu.z = newTarget.z + 1;
                 contextMenu.target = newTarget;
-                
                 target.persistentSelection = true; // persist selection when 
menu is opened
                 storeCursorAndSelection();
-                popup(handlerPoint.position.x + 1, handlerPoint.position.y + 
1); // slightly locate context menu away from mouse so no item is selected when 
menu is opened
+                popup(contextMenu.target);
+                // slightly locate context menu away from mouse so no item is 
selected when menu is opened
+                x += 1
+                y += 1
             }
         } else {
-            close();
+            dismiss();
         }
     }
-    
+
     // context menu keyboard key
     function targetKeyPressed(event, newTarget) {
         if (event.modifiers === Qt.NoModifier && event.key === Qt.Key_Menu) {
-            // change parent text field
-            contextMenu.parent = newTarget;
-            contextMenu.z = newTarget.z + 1;
             contextMenu.target = newTarget;
-            
             target.persistentSelection = true; // persist selection when menu 
is opened
             storeCursorAndSelection();
-            popup();
+            popup(contextMenu.target);
         }
     }
-    
+
     readonly property bool targetIsPassword: target !== null && 
(target.echoMode === TextInput.PasswordEchoOnEdit || target.echoMode === 
TextInput.Password)
-    
+
+    onAboutToShow: {
+        if (Overlay.overlay) {
+            let tempZ = 0
+            for (let i in Overlay.overlay.visibleChildren) {
+                tempZ = Math.max(tempZ, Overlay.overlay.visibleChildren[i].z)
+            }
+            z = tempZ + 1
+        }
+    }
+
     // deal with whether or not text should be deselected
     onClosed: {
         // restore text field's original persistent selection setting
@@ -75,20 +82,20 @@
             target.deselect();
         }
         deselectWhenMenuClosed = true;
-        
+
         // restore cursor position
         target.forceActiveFocus();
         target.cursorPosition = restoredCursorPosition;
         target.select(restoredSelectionStart, restoredSelectionEnd);
-        
+
         // run action
         runOnMenuClose();
     }
-    
+
     onOpened: {
         runOnMenuClose = function() {};
     }
-    
+
     MenuItem {
         visible: target !== null && !target.readOnly
         action: Action {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qqc2-desktop-style-5.81.0/plugin/kquickstyleitem.cpp 
new/qqc2-desktop-style-5.82.0/plugin/kquickstyleitem.cpp
--- old/qqc2-desktop-style-5.81.0/plugin/kquickstyleitem.cpp    2021-04-03 
11:39:50.000000000 +0200
+++ new/qqc2-desktop-style-5.82.0/plugin/kquickstyleitem.cpp    2021-05-01 
11:48:15.000000000 +0200
@@ -938,7 +938,6 @@
     case CheckBox: {
         QStyleOptionButton *btn = qstyleoption_cast<QStyleOptionButton 
*>(m_styleoption);
         QSize contentSize = btn->fontMetrics.size(Qt::TextShowMnemonic, 
btn->text);
-        QSize iconSize;
         if (!btn->icon.isNull()) {
             contentSize.setWidth(contentSize.width() + btn->iconSize.width());
             contentSize.setHeight(std::max(contentSize.height(), 
btn->iconSize.height()));
@@ -1044,9 +1043,7 @@
         frame.rect = m_styleoption->rect;
         frame.styleObject = this;
 
-        size = KQuickStyleItem::style()->sizeFromContents(QStyle::CT_LineEdit,
-                                                          &frame,
-                                                          QSize(width, 
qMax(height, contentHeight)).expandedTo(QApplication::globalStrut()));
+        size = KQuickStyleItem::style()->sizeFromContents(QStyle::CT_LineEdit, 
&frame, QSize(width, qMax(height, contentHeight)));
         if (m_itemType == SpinBox) {
             
size.setWidth(KQuickStyleItem::style()->sizeFromContents(QStyle::CT_SpinBox, 
m_styleoption, QSize(width + 2, height)).width());
         }
@@ -1084,7 +1081,7 @@
     case MenuItem:
     case ComboBoxItem:
         if (static_cast<QStyleOptionMenuItem *>(m_styleoption)->menuItemType 
== QStyleOptionMenuItem::Scroller) {
-            size.setHeight(qMax(QApplication::globalStrut().height(), 
KQuickStyleItem::style()->pixelMetric(QStyle::PM_MenuScrollerHeight, nullptr, 
nullptr)));
+            
size.setHeight(KQuickStyleItem::style()->pixelMetric(QStyle::PM_MenuScrollerHeight,
 nullptr, nullptr));
         } else {
             size = 
KQuickStyleItem::style()->sizeFromContents(QStyle::CT_MenuItem, m_styleoption, 
QSize(width, height));
         }
@@ -1194,7 +1191,7 @@
         return 
KQuickStyleItem::style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth, 
nullptr);
     else if (metric == QLatin1String("checkboxlabelspacing"))
         return 
KQuickStyleItem::style()->pixelMetric(QStyle::PM_CheckBoxLabelSpacing, nullptr);
-    else if (metric == QLatin1String("ratiobuttonlabelspacing"))
+    else if (metric == QLatin1String("radiobuttonlabelspacing"))
         return 
KQuickStyleItem::style()->pixelMetric(QStyle::PM_RadioButtonLabelSpacing, 
nullptr);
     else if (metric == QLatin1String("tabvspace"))
         return 
KQuickStyleItem::style()->pixelMetric(QStyle::PM_TabBarTabVSpace, nullptr);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qqc2-desktop-style-5.81.0/tests/CheckBox.qml 
new/qqc2-desktop-style-5.82.0/tests/CheckBox.qml
--- old/qqc2-desktop-style-5.81.0/tests/CheckBox.qml    2021-04-03 
11:39:50.000000000 +0200
+++ new/qqc2-desktop-style-5.82.0/tests/CheckBox.qml    2021-05-01 
11:48:15.000000000 +0200
@@ -4,8 +4,9 @@
 
 ApplicationWindow {
     height: layout.implicitHeight
-    width: layout.implicitWidth
+    width: 300
     ColumnLayout {
+        width: parent.width
         id: layout
 
         CheckBox {
@@ -56,6 +57,11 @@
             enabled: false
             icon.name: "checkmark"
         }
+
+        CheckBox {
+            Layout.fillWidth: true
+            text: "This is a very long piece of text that really should be 
rewritten to be shorter, but sometimes life just isn't that simple."
+        }
     }
 }
 

Reply via email to