Hello community,
here is the log from the commit of package qqc2-desktop-style for
openSUSE:Factory checked in at 2018-07-22 23:03:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old)
and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style"
Sun Jul 22 23:03:56 2018 rev:11 rq:623330 version:5.48.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes
2018-06-23 19:59:12.167598648 +0200
+++
/work/SRC/openSUSE:Factory/.qqc2-desktop-style.new/qqc2-desktop-style.changes
2018-07-22 23:04:01.784935189 +0200
@@ -1,0 +2,16 @@
+Mon Jul 16 04:37:49 UTC 2018 - [email protected]
+
+- Update to 5.48.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.48.0.php
+- Changes since 5.47.0:
+ * no pixel values in checkindicator
+ * own sizehit for sliders
+ * use RadioIndicator for everybody
+ * Don't overflow around popups
+ * on Qt<5.11 the control palette is completely ignored
+ * import kirigami 2.4
+ * anchor button background
+
+-------------------------------------------------------------------
Old:
----
qqc2-desktop-style-5.47.0.tar.xz
New:
----
qqc2-desktop-style-5.48.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qqc2-desktop-style.spec ++++++
--- /var/tmp/diff_new_pack.9Qlcrl/_old 2018-07-22 23:04:02.272935008 +0200
+++ /var/tmp/diff_new_pack.9Qlcrl/_new 2018-07-22 23:04:02.276935007 +0200
@@ -16,9 +16,9 @@
#
-%define _tar_path 5.47
+%define _tar_path 5.48
Name: qqc2-desktop-style
-Version: 5.47.0
+Version: 5.48.0
Release: 0
Summary: A Qt Quick Controls 2 Style for Desktop UIs
License: GPL-2.0-or-later
++++++ qqc2-desktop-style-5.47.0.tar.xz -> qqc2-desktop-style-5.48.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.47.0/CMakeLists.txt
new/qqc2-desktop-style-5.48.0/CMakeLists.txt
--- old/qqc2-desktop-style-5.47.0/CMakeLists.txt 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/CMakeLists.txt 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/BusyIndicator.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/BusyIndicator.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/BusyIndicator.qml
2018-06-02 18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/BusyIndicator.qml
2018-07-07 23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.47.0/org.kde.desktop/Button.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/Button.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/Button.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/Button.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/CheckBox.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/CheckBox.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/CheckBox.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/CheckBox.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/CheckDelegate.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/CheckDelegate.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/CheckDelegate.qml
2018-06-02 18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/CheckDelegate.qml
2018-07-07 23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/CheckIndicator.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/CheckIndicator.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/CheckIndicator.qml
2018-06-02 18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/CheckIndicator.qml
2018-07-07 23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/ComboBox.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/ComboBox.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/ComboBox.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/ComboBox.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/Control.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/Control.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/Control.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/Control.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/DelayButton.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/DelayButton.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/DelayButton.qml
2018-06-02 18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/DelayButton.qml
2018-07-07 23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.47.0/org.kde.desktop/Dial.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/Dial.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/Dial.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/Dial.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.47.0/org.kde.desktop/Dialog.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/Dialog.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/Dialog.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/Dialog.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/DialogButtonBox.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/DialogButtonBox.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/DialogButtonBox.qml
2018-06-02 18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/DialogButtonBox.qml
2018-07-07 23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.47.0/org.kde.desktop/Drawer.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/Drawer.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/Drawer.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/Drawer.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.47.0/org.kde.desktop/Frame.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/Frame.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/Frame.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/Frame.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/GroupBox.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/GroupBox.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/GroupBox.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/GroupBox.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/ItemDelegate.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/ItemDelegate.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/ItemDelegate.qml
2018-06-02 18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/ItemDelegate.qml
2018-07-07 23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.47.0/org.kde.desktop/Label.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/Label.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/Label.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/Label.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.47.0/org.kde.desktop/Menu.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/Menu.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/Menu.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/Menu.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/MenuBarItem.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/MenuBarItem.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/MenuBarItem.qml
2018-06-02 18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/MenuBarItem.qml
2018-07-07 23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/MenuItem.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/MenuItem.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/MenuItem.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/MenuItem.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.47.0/org.kde.desktop/Popup.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/Popup.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/Popup.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/Popup.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/ProgressBar.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/ProgressBar.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/ProgressBar.qml
2018-06-02 18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/ProgressBar.qml
2018-07-07 23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/RadioButton.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/RadioButton.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/RadioButton.qml
2018-06-02 18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/RadioButton.qml
2018-07-07 23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/RadioDelegate.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/RadioDelegate.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/RadioDelegate.qml
2018-06-02 18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/RadioDelegate.qml
2018-07-07 23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/RadioIndicator.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/RadioIndicator.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/RadioIndicator.qml
2018-06-02 18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/RadioIndicator.qml
1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-/*
- * Copyright 2017 Marco Martin <[email protected]>
- * 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/RangeSlider.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/RangeSlider.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/RangeSlider.qml
2018-06-02 18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/RangeSlider.qml
2018-07-07 23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/RoundButton.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/RoundButton.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/RoundButton.qml
2018-06-02 18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/RoundButton.qml
2018-07-07 23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/ScrollBar.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/ScrollBar.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/ScrollBar.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/ScrollBar.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/ScrollView.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/ScrollView.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/ScrollView.qml
2018-06-02 18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/ScrollView.qml
2018-07-07 23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.47.0/org.kde.desktop/Slider.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/Slider.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/Slider.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/Slider.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/SpinBox.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/SpinBox.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/SpinBox.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/SpinBox.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.47.0/org.kde.desktop/Switch.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/Switch.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/Switch.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/Switch.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/SwitchDelegate.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/SwitchDelegate.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/SwitchDelegate.qml
2018-06-02 18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/SwitchDelegate.qml
2018-07-07 23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.47.0/org.kde.desktop/TabBar.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/TabBar.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/TabBar.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/TabBar.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/TabButton.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/TabButton.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/TabButton.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/TabButton.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/TextArea.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/TextArea.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/TextArea.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/TextArea.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/TextField.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/TextField.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/TextField.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/TextField.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/ToolBar.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/ToolBar.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/ToolBar.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/ToolBar.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/ToolButton.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/ToolButton.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/ToolButton.qml
2018-06-02 18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/ToolButton.qml
2018-07-07 23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/ToolTip.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/ToolTip.qml
--- old/qqc2-desktop-style-5.47.0/org.kde.desktop/ToolTip.qml 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/org.kde.desktop/ToolTip.qml 2018-07-07
23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.47.0/org.kde.desktop/private/DefaultListItemBackground.qml
new/qqc2-desktop-style-5.48.0/org.kde.desktop/private/DefaultListItemBackground.qml
---
old/qqc2-desktop-style-5.47.0/org.kde.desktop/private/DefaultListItemBackground.qml
2018-06-02 18:30:33.000000000 +0200
+++
new/qqc2-desktop-style-5.48.0/org.kde.desktop/private/DefaultListItemBackground.qml
2018-07-07 23:54:12.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.47.0/plugin/kquickstyleitem.cpp
new/qqc2-desktop-style-5.48.0/plugin/kquickstyleitem.cpp
--- old/qqc2-desktop-style-5.47.0/plugin/kquickstyleitem.cpp 2018-06-02
18:30:33.000000000 +0200
+++ new/qqc2-desktop-style-5.48.0/plugin/kquickstyleitem.cpp 2018-07-07
23:54:12.000000000 +0200
@@ -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
}
/*
