Hello community, here is the log from the commit of package qqc2-desktop-style for openSUSE:Factory checked in at 2019-12-18 14:42:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old) and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style" Wed Dec 18 14:42:29 2019 rev:29 rq:757077 version:5.65.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes 2019-11-12 11:52:22.343153398 +0100 +++ /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.4691/qqc2-desktop-style.changes 2019-12-18 14:45:05.877850236 +0100 @@ -1,0 +2,17 @@ +Sun Dec 8 11:18:57 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to 5.65.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.65.0.php +- Changes since 5.64.0: + * Fix typo in name of installed CMake Config: Deskop->Desktop + * Make it compile against qt5.14 without deprecated method + * [TabBar] Use window color instead of button color (kde#413311) + * bind enabled properties to the view enabled + * [ToolTip] Base timeout on text length + * [ComboBox] Don't dim Popup + * [ComboBox] Don't indicate focus when popup is open + * [ComboBox] Follow focusPolicy + +------------------------------------------------------------------- Old: ---- qqc2-desktop-style-5.64.0.tar.xz qqc2-desktop-style-5.64.0.tar.xz.sig New: ---- qqc2-desktop-style-5.65.0.tar.xz qqc2-desktop-style-5.65.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qqc2-desktop-style.spec ++++++ --- /var/tmp/diff_new_pack.XEmL63/_old 2019-12-18 14:45:06.553850546 +0100 +++ /var/tmp/diff_new_pack.XEmL63/_new 2019-12-18 14:45:06.557850547 +0100 @@ -1,7 +1,7 @@ # # spec file for package qqc2-desktop-style # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,11 @@ # -%define _tar_path 5.64 +%define _tar_path 5.65 # Only needed for the package signature condition %bcond_without lang Name: qqc2-desktop-style -Version: 5.64.0 +Version: 5.65.0 Release: 0 Summary: A Qt Quick Controls 2 Style for Desktop UIs License: GPL-2.0-or-later @@ -91,6 +91,8 @@ %{_kf5_qmldir}/org/kde/qqc2desktopstyle/ %files devel +%{_kf5_libdir}/cmake/KF5QQC2DesktopStyle/ +# Legacy alias with typo... %{_kf5_libdir}/cmake/KF5QQC2DeskopStyle/ %changelog ++++++ qqc2-desktop-style-5.64.0.tar.xz -> qqc2-desktop-style-5.65.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.64.0/CMakeLists.txt new/qqc2-desktop-style-5.65.0/CMakeLists.txt --- old/qqc2-desktop-style-5.64.0/CMakeLists.txt 2019-11-02 12:47:27.000000000 +0100 +++ new/qqc2-desktop-style-5.65.0/CMakeLists.txt 2019-12-07 20:46:46.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.64.0") # handled by release scripts -set(KF5_DEP_VERSION "5.64.0") # handled by release scripts +set(KF5_VERSION "5.65.0") # handled by release scripts +set(KF5_DEP_VERSION "5.65.0") # handled by release scripts project(qqc2-desktop-style VERSION ${KF5_VERSION}) @@ -21,7 +21,7 @@ ################# set KDE specific information ################# -find_package(ECM 5.64.0 REQUIRED NO_MODULE) +find_package(ECM 5.65.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}) @@ -62,6 +62,29 @@ find_package(PkgConfig) +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5QQC2DesktopStyle") + +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KF5QQC2DesktopStyleConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5QQC2DesktopStyleConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} + PATH_VARS KF5_INCLUDE_INSTALL_DIR CMAKE_INSTALL_PREFIX +) + +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KF5QQC2DesktopStyleConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KF5QQC2DesktopStyleConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel +) + + +ecm_setup_version(PROJECT + VARIABLE_PREFIX QQC2DESKTOPSTYLE + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5QQC2DesktopStyleConfigVersion.cmake" + SOVERSION 5) + +# legacy support for CMake Config files with typo KF5QQC2Desk_opStyle TODO: KF6 remove set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5QQC2DeskopStyle") configure_package_config_file( @@ -81,14 +104,13 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX QQC2DESKTOPSTYLE - VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/qqc2desktopstyle_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5QQC2DeskopStyleConfigVersion.cmake" SOVERSION 5) ######################################################################### add_definitions(-DQT_NO_FOREACH) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x060000) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x053f00) add_subdirectory(plugin) if (KF5IconThemes_FOUND AND KF5WidgetsAddons_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.64.0/KF5QQC2DesktopStyleConfig.cmake.in new/qqc2-desktop-style-5.65.0/KF5QQC2DesktopStyleConfig.cmake.in --- old/qqc2-desktop-style-5.64.0/KF5QQC2DesktopStyleConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/qqc2-desktop-style-5.65.0/KF5QQC2DesktopStyleConfig.cmake.in 2019-12-07 20:46:46.000000000 +0100 @@ -0,0 +1,9 @@ +@PACKAGE_INIT@ + +# Any changes in this ".cmake" file will be overwritten by CMake, the source is the ".cmake.in" file. + +#include("${CMAKE_CURRENT_LIST_DIR}/KF5QQC2DesktopStyleTargets.cmake") + +set(QQC2DesktopStyle_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.64.0/org.kde.desktop/ComboBox.qml new/qqc2-desktop-style-5.65.0/org.kde.desktop/ComboBox.qml --- old/qqc2-desktop-style-5.64.0/org.kde.desktop/ComboBox.qml 2019-11-02 12:47:27.000000000 +0100 +++ new/qqc2-desktop-style-5.65.0/org.kde.desktop/ComboBox.qml 2019-12-07 20:46:46.000000000 +0100 @@ -77,6 +77,10 @@ } } onPressed: { + if (controlRoot.focusPolicy & Qt.ClickFocus) { + controlRoot.forceActiveFocus(); + } + indexUnderMouse = -1; listView.currentIndex = controlRoot.highlightedIndex controlRoot.down = true; @@ -188,7 +192,7 @@ anchors.fill: parent hover: controlRoot.hovered || controlRoot.pressed on: controlRoot.pressed - hasFocus: controlRoot.activeFocus + hasFocus: controlRoot.activeFocus && !controlRoot.popup.visible enabled: controlRoot.enabled // contentHeight as in QComboBox magic numbers taken from QQC1 style contentHeight: Math.max(Math.ceil(textHeight("")), 14) + 2 @@ -207,6 +211,7 @@ Kirigami.Theme.colorSet: Kirigami.Theme.View Kirigami.Theme.inherit: controlRoot.Kirigami.Theme.inherit modal: true + dim: false closePolicy: Controls.Popup.CloseOnEscape | Controls.Popup.CloseOnPressOutside contentItem: ListView { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.64.0/org.kde.desktop/ScrollView.qml new/qqc2-desktop-style-5.65.0/org.kde.desktop/ScrollView.qml --- old/qqc2-desktop-style-5.64.0/org.kde.desktop/ScrollView.qml 2019-11-02 12:47:27.000000000 +0100 +++ new/qqc2-desktop-style-5.65.0/org.kde.desktop/ScrollView.qml 2019-12-07 20:46:46.000000000 +0100 @@ -72,6 +72,7 @@ visible: false sunken: true raised: false + enabled: controlRoot.contentItem.enabled hasFocus: controlRoot.activeFocus || controlRoot.contentItem.activeFocus hover: controlRoot.hovered //This is just for the proper margin metrics @@ -91,6 +92,7 @@ ScrollBar.vertical: ScrollBar { id: verticalScrollBar parent: controlRoot + enabled: controlRoot.contentItem.enabled x: controlRoot.mirrored ? 0 : controlRoot.width - width y: controlRoot.topPadding height: controlRoot.availableHeight @@ -99,6 +101,7 @@ ScrollBar.horizontal: ScrollBar { parent: controlRoot + enabled: controlRoot.contentItem.enabled x: controlRoot.leftPadding y: controlRoot.height - height width: controlRoot.availableWidth diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.64.0/org.kde.desktop/TabBar.qml new/qqc2-desktop-style-5.65.0/org.kde.desktop/TabBar.qml --- old/qqc2-desktop-style-5.64.0/org.kde.desktop/TabBar.qml 2019-11-02 12:47:27.000000000 +0100 +++ new/qqc2-desktop-style-5.65.0/org.kde.desktop/TabBar.qml 2019-12-07 20:46:46.000000000 +0100 @@ -29,7 +29,7 @@ id: controlRoot @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette - Kirigami.Theme.colorSet: Kirigami.Theme.Button + Kirigami.Theme.colorSet: Kirigami.Theme.Window Kirigami.Theme.inherit: false //Some QStyles seem to not return sensible pixelmetrics here diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.64.0/org.kde.desktop/ToolTip.qml new/qqc2-desktop-style-5.65.0/org.kde.desktop/ToolTip.qml --- old/qqc2-desktop-style-5.64.0/org.kde.desktop/ToolTip.qml 2019-11-02 12:47:27.000000000 +0100 +++ new/qqc2-desktop-style-5.65.0/org.kde.desktop/ToolTip.qml 2019-12-07 20:46:46.000000000 +0100 @@ -46,8 +46,9 @@ padding: 6 visible: parent && (Kirigami.Settings.tabletMode ? parent.pressed : (parent.hasOwnProperty("hovered") ? parent.hovered : parent.hasOwnProperty("containsMouse") && parent.containsMouse)) - delay: Kirigami.Settings.tabletMode ? Qt.styleHints.mousePressAndHoldInterval : 1000 - timeout: Kirigami.Units.toolTipDelay + delay: Kirigami.Settings.tabletMode ? Qt.styleHints.mousePressAndHoldInterval : Kirigami.Units.toolTipDelay + // Timeout based on text length, from QTipLabel::restartExpireTimer + timeout: 10000 + 40 * Math.max(0, text.length - 100) closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.64.0/plugin/kquickstyleitem.cpp new/qqc2-desktop-style-5.65.0/plugin/kquickstyleitem.cpp --- old/qqc2-desktop-style-5.64.0/plugin/kquickstyleitem.cpp 2019-11-02 12:47:27.000000000 +0100 +++ new/qqc2-desktop-style-5.65.0/plugin/kquickstyleitem.cpp 2019-12-07 20:46:46.000000000 +0100 @@ -105,7 +105,6 @@ m_font = qApp->font(); setFlag(QQuickItem::ItemHasContents, true); setSmooth(false); - qmlRegisterType<KQuickPadding>(); connect(this, &KQuickStyleItem::visibleChanged, this, &KQuickStyleItem::updateItem); connect(this, &KQuickStyleItem::widthChanged, this, &KQuickStyleItem::updateItem); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.64.0/plugin/qqc2desktopstyleplugin.cpp new/qqc2-desktop-style-5.65.0/plugin/qqc2desktopstyleplugin.cpp --- old/qqc2-desktop-style-5.64.0/plugin/qqc2desktopstyleplugin.cpp 2019-11-02 12:47:27.000000000 +0100 +++ new/qqc2-desktop-style-5.65.0/plugin/qqc2desktopstyleplugin.cpp 2019-12-07 20:46:46.000000000 +0100 @@ -32,7 +32,11 @@ qmlRegisterType<KQuickStyleItem>(uri, 1, 0, "StyleItem"); qmlRegisterType<KPropertyWriter>(uri, 1, 0, "PropertyWriter"); - +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + qmlRegisterType<KQuickPadding>(); +#else + qmlRegisterAnonymousType<KQuickPadding>(uri, 1); +#endif qmlProtectModule(uri, 2); }
