Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2022-12-12 17:38:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Mon Dec 12 17:38:01 2022 rev:111 rq:1042114 version:5.101.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2022-11-15 13:19:10.820332789 +0100 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new.1835/kdeclarative.changes 2022-12-12 17:39:37.621158069 +0100 @@ -1,0 +2,19 @@ +Tue Dec 6 20:10:32 UTC 2022 - Christophe Marin <[email protected]> + +- Update to 5.101.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.101.0 +- Changes since 5.100.0: + * Deprecate unused parts of KWindowSystem import + * tests: add test for multiple KeySequenceItems + * Fixed KF 5.100 compilation + * SimpleKCM: Account for flickable's margins when deciding to show separators + * SimpleKCM: Clean up a bit + * Fix build + * Deprecate QIconItem + * Use const/let for JS variables as appropriate + * Sync header and footer separator code to SimpleKCM (kde#461435) + * AbstractKCM: remove KF6 TODO + +------------------------------------------------------------------- Old: ---- kdeclarative-5.100.0.tar.xz kdeclarative-5.100.0.tar.xz.sig New: ---- kdeclarative-5.101.0.tar.xz kdeclarative-5.101.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.9lzmAN/_old 2022-12-12 17:39:38.197160974 +0100 +++ /var/tmp/diff_new_pack.9lzmAN/_new 2022-12-12 17:39:38.201160994 +0100 @@ -17,18 +17,17 @@ %define lname libKF5Declarative5 -%define _tar_path 5.100 +%define _tar_path 5.101 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kdeclarative -Version: 5.100.0 +Version: 5.101.0 Release: 0 Summary: Integration of QML and KDE workspaces License: LGPL-2.1-or-later -Group: System/GUI/KDE URL: https://www.kde.org Source: %{name}-%{version}.tar.xz %if %{with released} @@ -63,7 +62,6 @@ Summary: Integration of QML and KDE workspaces # QQmlPropertyMap leaks private but exported QObjectPrivate symbol # https://bugreports.qt.io/browse/QTBUG-46433 and https://bugs.launchpad.net/bugs/1426335 -Group: System/GUI/KDE %requires_eq libQt5Core5 %description -n %{lname} @@ -71,21 +69,18 @@ %package -n libKF5QuickAddons5 Summary: Integration of QML and KDE workspaces -Group: System/GUI/KDE %description -n libKF5QuickAddons5 KDeclarative provides integration of QML and KDE workspaces. %package -n libKF5CalendarEvents5 Summary: Integration of QML and KDE workspaces -Group: System/GUI/KDE %description -n libKF5CalendarEvents5 KDeclarative provides integration of QML and KDE workspaces. %package components Summary: KDeclarative QML components -Group: System/GUI/KDE Requires: kirigami2 >= %{_kf5_bugfix_version} %description components @@ -93,14 +88,12 @@ %package tools Summary: KDeclarative tools -Group: System/GUI/KDE %description tools KDeclarative provides integration of QML and KDE workspaces. %package devel Summary: Integration of QML and KDE workspaces: Build Environment -Group: Development/Libraries/KDE Requires: %{lname} = %{version} Requires: %{name}-components = %{version} Requires: extra-cmake-modules ++++++ kdeclarative-5.100.0.tar.xz -> kdeclarative-5.101.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/CMakeLists.txt new/kdeclarative-5.101.0/CMakeLists.txt --- old/kdeclarative-5.100.0/CMakeLists.txt 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/CMakeLists.txt 2022-12-03 10:44:49.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.100.0") # handled by release scripts -set(KF_DEP_VERSION "5.100.0") # handled by release scripts +set(KF_VERSION "5.101.0") # handled by release scripts +set(KF_DEP_VERSION "5.101.0") # handled by release scripts project(KDeclarative VERSION ${KF_VERSION}) # Dependencies include(FeatureSummary) -find_package(ECM 5.100.0 NO_MODULE) +find_package(ECM 5.101.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/metainfo.yaml new/kdeclarative-5.101.0/metainfo.yaml --- old/kdeclarative-5.100.0/metainfo.yaml 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/metainfo.yaml 2022-12-03 10:44:49.000000000 +0100 @@ -7,7 +7,7 @@ - name: FreeBSD - name: Windows - name: macOS - note: The supported remote Urls depends from what runtime kio slaves plugins are installed + note: The supported remote URLs depend on the set of KIO workers installed at runtime. portingAid: false deprecated: false release: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/po/de/kdeclarative5.po new/kdeclarative-5.101.0/po/de/kdeclarative5.po --- old/kdeclarative-5.100.0/po/de/kdeclarative5.po 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/po/de/kdeclarative5.po 2022-12-03 10:44:49.000000000 +0100 @@ -9,20 +9,21 @@ # Johannes Obermayr <[email protected]>, 2010. # Panagiotis Papadopoulos <[email protected]>, 2010. # Rolf Eike Beer <[email protected]>, 2012. +# Frank Steinmetzger <[email protected]>, 2022. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-09-29 00:42+0000\n" -"PO-Revision-Date: 2022-07-11 23:45+0200\n" -"Last-Translator: Frederik Schwarzer <[email protected]>\n" +"PO-Revision-Date: 2022-11-10 20:58+0100\n" +"Last-Translator: Frank Steinmetzger <[email protected]>\n" "Language-Team: German <[email protected]>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 22.04.1\n" +"X-Generator: Lokalize 22.08.3\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -103,12 +104,10 @@ msgstr "Tastenfolge löschen" #: qmlcontrols/kquickcontrols/KeySequenceItem.qml:165 -#, fuzzy, kde-format -#| msgctxt "@info:tooltip" -#| msgid "Clear Key Sequence" +#, kde-format msgctxt "@info:tooltip" msgid "Cancel Key Sequence Recording" -msgstr "Tastenfolge löschen" +msgstr "Tastenfolgen-Aufnahme abbrechen" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:118 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/po/ia/kdeclarative5.po new/kdeclarative-5.101.0/po/ia/kdeclarative5.po --- old/kdeclarative-5.100.0/po/ia/kdeclarative5.po 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/po/ia/kdeclarative5.po 2022-12-03 10:44:49.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-09-29 00:42+0000\n" -"PO-Revision-Date: 2022-07-15 11:42+0200\n" +"PO-Revision-Date: 2022-11-29 22:45+0100\n" "Last-Translator: giovanni <[email protected]>\n" "Language-Team: Interlingua <[email protected]>\n" "Language: ia\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 21.12.3\n" +"X-Generator: Lokalize 22.11.80\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -96,12 +96,10 @@ msgstr "Clara sequentia de clave" #: qmlcontrols/kquickcontrols/KeySequenceItem.qml:165 -#, fuzzy, kde-format -#| msgctxt "@info:tooltip" -#| msgid "Clear Key Sequence" +#, kde-format msgctxt "@info:tooltip" msgid "Cancel Key Sequence Recording" -msgstr "Clara sequentia de clave" +msgstr "Clara registrar sequentia de clave" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:118 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/po/ru/kdeclarative5.po new/kdeclarative-5.101.0/po/ru/kdeclarative5.po --- old/kdeclarative-5.100.0/po/ru/kdeclarative5.po 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/po/ru/kdeclarative5.po 2022-12-03 10:44:49.000000000 +0100 @@ -21,14 +21,14 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-09-29 00:42+0000\n" -"PO-Revision-Date: 2022-02-15 16:40+0300\n" +"PO-Revision-Date: 2022-11-17 12:25+0300\n" "Last-Translator: Olesya Gerasimenko <[email protected]>\n" "Language-Team: Basealt Translation Team\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 21.12.1\n" +"X-Generator: Lokalize 22.04.3\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Environment: kde\n" @@ -67,10 +67,9 @@ msgstr "ÐоказаÑÑ ÐºÐ¾Ð½ÑекÑÑнÑÑ ÑпÑавкÑ" #: qmlcontrols/kcmcontrols/qml/private/GridViewInternal.qml:79 -#, fuzzy, kde-format -#| msgid "Not found" +#, kde-format msgid "No items found" -msgstr "Ðе найдено" +msgstr "ÐиÑего не найдено" #: qmlcontrols/kquickcontrols/ColorButton.qml:63 #, kde-format @@ -116,13 +115,13 @@ #, kde-format msgctxt "@info:tooltip" msgid "Clear Key Sequence" -msgstr "" +msgstr "ÐÑиÑÑиÑÑ Ð¿Ð¾ÑледоваÑелÑноÑÑÑ ÐºÐ»Ð°Ð²Ð¸Ñ" #: qmlcontrols/kquickcontrols/KeySequenceItem.qml:165 #, kde-format msgctxt "@info:tooltip" msgid "Cancel Key Sequence Recording" -msgstr "" +msgstr "ÐÑмениÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð¿Ð¾ÑледоваÑелÑноÑÑи клавиÑ" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:118 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/po/zh_CN/kdeclarative5.po new/kdeclarative-5.101.0/po/zh_CN/kdeclarative5.po --- old/kdeclarative-5.100.0/po/zh_CN/kdeclarative5.po 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/po/zh_CN/kdeclarative5.po 2022-12-03 10:44:49.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-09-29 00:42+0000\n" -"PO-Revision-Date: 2022-10-30 07:47\n" +"PO-Revision-Date: 2022-12-01 06:52\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -92,13 +92,13 @@ #, kde-format msgctxt "@info:tooltip" msgid "Clear Key Sequence" -msgstr "" +msgstr "æ¸ é¤å¯é¥åºå" #: qmlcontrols/kquickcontrols/KeySequenceItem.qml:165 #, kde-format msgctxt "@info:tooltip" msgid "Cancel Key Sequence Recording" -msgstr "" +msgstr "åæ¶å¯é¥åºåå½å¶" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:118 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/src/kdeclarative/kdeclarative.cpp new/kdeclarative-5.101.0/src/kdeclarative/kdeclarative.cpp --- old/kdeclarative-5.100.0/src/kdeclarative/kdeclarative.cpp 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/src/kdeclarative/kdeclarative.cpp 2022-12-03 10:44:49.000000000 +0100 @@ -26,10 +26,12 @@ { } +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 100) KDeclarative::KDeclarative() : d(new KDeclarativePrivate) { } +#endif KDeclarative::~KDeclarative() { @@ -40,6 +42,7 @@ delete d; } +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 100) void KDeclarative::setDeclarativeEngine(QQmlEngine *engine) { if (d->declarativeEngine.data() == engine) { @@ -52,6 +55,7 @@ { return d->declarativeEngine.data(); } +#endif #if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 0) void KDeclarative::initialize() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/src/qmlcontrols/kcmcontrols/qml/AbstractKCM.qml new/kdeclarative-5.101.0/src/qmlcontrols/kcmcontrols/qml/AbstractKCM.qml --- old/kdeclarative-5.100.0/src/qmlcontrols/kcmcontrols/qml/AbstractKCM.qml 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/src/qmlcontrols/kcmcontrols/qml/AbstractKCM.qml 2022-12-03 10:44:49.000000000 +0100 @@ -48,9 +48,6 @@ property bool framedView: true /** - * TODO KF6: remove this property and always have System Settings itself add - * appropriate padding above its footer, so individual KCMs don't have to - * * extraFooterTopPadding: bool * Whether to add extra top padding to an empty footer when framedView is * false. Use the default value of true for KCMs in System Settings, because @@ -135,7 +132,7 @@ Component.onCompleted: { if (footer && footer != footerParent) { - var f = footer + let f = footer footerParent.contentItem = f footer = footerParent @@ -144,7 +141,7 @@ } if (header && header != headerParent) { - var h = header + let h = header headerParent.contentItem = h header = headerParent @@ -153,8 +150,8 @@ } //Search overlaysheets in contentItem, parent to root if found - for (let i in contentItem.data) { - let child = contentItem.data[i]; + for (const i in contentItem.data) { + const child = contentItem.data[i]; if (child instanceof Kirigami.OverlaySheet) { if (!child.parent) { child.parent = root; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/src/qmlcontrols/kcmcontrols/qml/GridViewKCM.qml new/kdeclarative-5.101.0/src/qmlcontrols/kcmcontrols/qml/GridViewKCM.qml --- old/kdeclarative-5.100.0/src/qmlcontrols/kcmcontrols/qml/GridViewKCM.qml 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/src/qmlcontrols/kcmcontrols/qml/GridViewKCM.qml 2022-12-03 10:44:49.000000000 +0100 @@ -54,12 +54,12 @@ framedView: false implicitWidth: { - var width = 0; + let width = 0; // Show three columns at once, every column occupies implicitCellWidth + Units.gridUnit width += 3 * (view.implicitCellWidth + Kirigami.Units.gridUnit); - var scrollBar = scroll.QtControls.ScrollBar.vertical; + const scrollBar = scroll.QtControls.ScrollBar.vertical; width += scrollBar.width + scrollBar.leftPadding + scrollBar.rightPadding; width += scroll.leftPadding + scroll.rightPadding diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml new/kdeclarative-5.101.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml --- old/kdeclarative-5.100.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml 2022-12-03 10:44:49.000000000 +0100 @@ -36,6 +36,23 @@ readonly property int margins: 6 // Layout_ChildMarginWidth from Breeze + /** + * extraFooterTopPadding: bool + * Whether to add extra top padding to an empty footer. Use the default + * value of true for KCMs in System Settings, because otherwise the Apply, + * Help, and Defaults buttons provided by System Settings won't have enough + * top padding and the button bar will look ugly. + * When using this component outside of System Settings where there is no + * such restriction, or in System Settings KCMs that don't show Apply, Help, + * or Defaults buttons, set it to false. + * Default: true + * + * @since 5.101 + */ + property bool extraFooterTopPadding: true + + property bool __flickableOverflows: flickable.contentHeight + flickable.topMargin + flickable.bottomMargin > flickable.height + // Context properties are not reliable title: (typeof kcm !== "undefined") ? kcm.name : "" @@ -47,26 +64,101 @@ rightPadding: root.margins bottomPadding: root.margins - children: [ + header: QtControls.Control { + id: headerParent + + readonly property bool contentVisible: contentItem && contentItem.visible && contentItem.implicitHeight + + height: contentVisible ? implicitHeight : 0 + leftPadding: 0 + topPadding: 0 + rightPadding: 0 + bottomPadding: 0 + // TODO KF6: uncomment these lines. We didn't do it in KF5 times because + // it would have regressed CommandOutputKCM in KInfoCenter, which was + // created before this padding was added, and added its own. If we add + // padding in the base KCM component, CommandOutputKCM will have double + // padding and look bad. + // leftPadding: root.margins + // topPadding: root.margins + // rightPadding: root.margins + // bottomPadding: root.margins + + // When the page is scrollable, we need to add a line below the header + // ourselves to separate it from the view Kirigami.Separator { z: 999 anchors { left: parent.left right: parent.right - top: parent.top - topMargin: root.header && root.header.visible ? root.header.y + root.header.height : 0 + top: parent.bottom } - visible: root.flickable.contentHeight > root.flickable.height && !Kirigami.Settings.isMobile - }, + visible: headerParent.contentVisible || (__flickableOverflows && !Kirigami.Settings.isMobile) + } + } + + footer: QtControls.Control { + id: footerParent + + readonly property bool contentVisible: contentItem && contentItem.visible && contentItem.implicitHeight + + height: contentVisible ? implicitHeight : (root.extraFooterTopPadding ? root.margins : 0) + leftPadding: 0 + topPadding: 0 + rightPadding: 0 + bottomPadding: 0 + // TODO KF6: uncomment these lines. We didn't do it in KF5 times because + // it would have regressed CommandOutputKCM in KInfoCenter, which was + // created before this padding was added, and added its own. If we add + // padding in the base KCM component, CommandOutputKCM will have double + // padding and look bad. + // created before this padding was added and added its own. + // leftPadding: root.margins + // topPadding: root.margins + // rightPadding: root.margins + // bottomPadding: root.margins + + // When the page is scrollable, we need to add a line above the footer + // ourselves to separate it from the view Kirigami.Separator { z: 999 anchors { left: parent.left right: parent.right - bottom: parent.bottom - bottomMargin: root.footer && root.footer.visible ? root.footer.height : 0 + bottom: parent.top + } + visible: footerParent.contentVisible || (root.__flickableOverflows && !Kirigami.Settings.isMobile) + } + } + + Component.onCompleted: { + if (footer && footer !== footerParent) { + const f = footer + + footerParent.contentItem = f + footer = footerParent + footer.visible = true + f.parent = footerParent + } + + if (header && header !== headerParent) { + const h = header + + headerParent.contentItem = h + header = headerParent + header.visible = true + h.parent = headerParent + } + + //Search overlaysheets in contentItem, parent to root if found + for (let i in contentItem.data) { + let child = contentItem.data[i]; + if (child instanceof Kirigami.OverlaySheet) { + if (!child.parent) { + child.parent = root; + } + root.data.push(child); } - visible: root.flickable.contentHeight > root.flickable.height && !Kirigami.Settings.isMobile } - ] + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/src/qmlcontrols/kquickcontrols/ColorButton.qml new/kdeclarative-5.101.0/src/qmlcontrols/kquickcontrols/ColorButton.qml --- old/kdeclarative-5.100.0/src/qmlcontrols/kquickcontrols/ColorButton.qml 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/src/qmlcontrols/kquickcontrols/ColorButton.qml 2022-12-03 10:44:49.000000000 +0100 @@ -71,15 +71,15 @@ visible: colorDialog.color.a < 1 onPaint: { - var ctx = getContext('2d'); + const ctx = getContext('2d'); ctx.fillStyle = "white"; ctx.fillRect(0,0, ctx.width, ctx.height) ctx.fillStyle = "black"; //in blocks of 16x16 draw two black squares of 8x8 in top left and bottom right - for (var j=0;j<width;j+=16) { - for (var i=0;i<height;i+=16) { + for (let j=0;j<width;j+=16) { + for (let i=0;i<height;i+=16) { //top left, bottom right ctx.fillRect(j,i,8,8); ctx.fillRect(j+8,i+8,8,8); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.cpp new/kdeclarative-5.101.0/src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.cpp --- old/kdeclarative-5.100.0/src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.cpp 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.cpp 2022-12-03 10:44:49.000000000 +0100 @@ -25,6 +25,8 @@ #include "plotter.h" #endif +#include "../../kdeclarative/kdeclarative_export.h" + static QObject *kcmshell_singleton_provider(QQmlEngine *engine, QJSEngine *scriptEngine) { Q_UNUSED(engine); @@ -39,7 +41,9 @@ qmlRegisterType<QPixmapItem>(uri, 2, 0, "QPixmapItem"); qmlRegisterType<QImageItem>(uri, 2, 0, "QImageItem"); +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) qmlRegisterType<QIconItem>(uri, 2, 0, "QIconItem"); +#endif qmlRegisterType<MouseEventListener>(uri, 2, 0, "MouseEventListener"); qmlRegisterAnonymousType<KDeclarativeMouseEvent>(uri, 1); qmlRegisterAnonymousType<KDeclarativeWheelEvent>(uri, 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.cpp new/kdeclarative-5.101.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.cpp --- old/kdeclarative-5.100.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.cpp 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.cpp 2022-12-03 10:44:49.000000000 +0100 @@ -12,6 +12,8 @@ #include <quickaddons/imagetexturescache.h> #include <quickaddons/managedtexturenode.h> +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) + Q_GLOBAL_STATIC(ImageTexturesCache, s_iconImageCache) QIconItem::QIconItem(QQuickItem *parent) @@ -164,3 +166,4 @@ QQuickItem::geometryChange(newGeometry, oldGeometry); #endif } +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h new/kdeclarative-5.101.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h --- old/kdeclarative-5.100.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h 2022-12-03 10:44:49.000000000 +0100 @@ -11,6 +11,13 @@ #include <QQuickItem> #include <QVariant> +#include "../../kdeclarative/kdeclarative_export.h" + +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) + +/** + * @deprecated since 5.101, use Kirigami.Icon or PlasmaCore.IconItem instead + */ class QIconItem : public QQuickItem { Q_OBJECT @@ -71,3 +78,4 @@ }; #endif +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/src/qmlcontrols/kwindowsystemplugin/CMakeLists.txt new/kdeclarative-5.101.0/src/qmlcontrols/kwindowsystemplugin/CMakeLists.txt --- old/kdeclarative-5.100.0/src/qmlcontrols/kwindowsystemplugin/CMakeLists.txt 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/src/qmlcontrols/kwindowsystemplugin/CMakeLists.txt 2022-12-03 10:44:49.000000000 +0100 @@ -13,6 +13,8 @@ KF5::WindowSystem ) +target_include_directories(kwindowsystem PRIVATE ${CMAKE_BINARY_DIR}) + if(WIN32 AND BUILD_SHARED_LIBS) set_target_properties(kwindowsystem PROPERTIES PREFIX "") endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.cpp new/kdeclarative-5.101.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.cpp --- old/kdeclarative-5.100.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.cpp 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.cpp 2022-12-03 10:44:49.000000000 +0100 @@ -27,10 +27,15 @@ return; } + if (signal == QMetaMethod::fromSignal(&KWindowSystemProxy::showingDesktopChanged)) { + connect(KWindowSystem::self(), &KWindowSystem::showingDesktopChanged, this, &KWindowSystemProxy::showingDesktopChanged); + m_initialized = true; + } + +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) if (signal == QMetaMethod::fromSignal(&KWindowSystemProxy::currentDesktopChanged) || signal == QMetaMethod::fromSignal(&KWindowSystemProxy::desktopNamesChanged) || signal == QMetaMethod::fromSignal(&KWindowSystemProxy::numberOfDesktopsChanged) - || signal == QMetaMethod::fromSignal(&KWindowSystemProxy::showingDesktopChanged) || signal == QMetaMethod::fromSignal(&KWindowSystemProxy::compositingActiveChanged)) { connect(KWindowSystem::self(), &KWindowSystem::currentDesktopChanged, this, [this](int currentDesktop) { Q_EMIT currentDesktopChanged(currentDesktop); @@ -43,32 +48,40 @@ }); connect(KWindowSystem::self(), &KWindowSystem::numberOfDesktopsChanged, this, &KWindowSystemProxy::numberOfDesktopsChanged); - connect(KWindowSystem::self(), &KWindowSystem::showingDesktopChanged, this, &KWindowSystemProxy::showingDesktopChanged); connect(KWindowSystem::self(), &KWindowSystem::compositingChanged, this, &KWindowSystemProxy::compositingActiveChanged); m_initialized = true; } +#endif } +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) int KWindowSystemProxy::currentDesktop() const { return KWindowSystem::currentDesktop(); } +#endif +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) void KWindowSystemProxy::setCurrentDesktop(int desktop) { KWindowSystem::setCurrentDesktop(desktop); } +#endif +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) QString KWindowSystemProxy::currentDesktopName() const { return KWindowSystem::desktopName(KWindowSystem::currentDesktop()); } +#endif +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) int KWindowSystemProxy::numberOfDesktops() const { return KWindowSystem::numberOfDesktops(); } +#endif bool KWindowSystemProxy::showingDesktop() const { @@ -95,6 +108,7 @@ return KWindowSystem::isPlatformWayland(); } +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) bool KWindowSystemProxy::hasWindow(QWindow *window) const { if (!window) { @@ -103,6 +117,7 @@ return KWindowSystem::hasWId(window->winId()); } +#endif void KWindowSystemProxy::forceActivateWindow(QWindow *window, long time) { @@ -111,33 +126,43 @@ } } +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) void KWindowSystemProxy::setOnAllDesktops(QWindow *window, bool onAllDesktops) { if (window) { KWindowSystem::setOnAllDesktops(window->winId(), onAllDesktops); } } +#endif +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) void KWindowSystemProxy::setOnDesktop(QWindow *window, int desktop) { if (window) { KWindowSystem::setOnDesktop(window->winId(), desktop); } } +#endif +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) void KWindowSystemProxy::setOnActivities(QWindow *window, const QStringList &activities) { if (window) { KWindowSystem::setOnActivities(window->winId(), activities); } } +#endif +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) QString KWindowSystemProxy::desktopName(int desktop) const { return KWindowSystem::desktopName(desktop); } +#endif +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) void KWindowSystemProxy::setDesktopName(int desktop, const QString &name) { KWindowSystem::setDesktopName(desktop, name); } +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.h new/kdeclarative-5.101.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.h --- old/kdeclarative-5.100.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.h 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.h 2022-12-03 10:44:49.000000000 +0100 @@ -10,6 +10,8 @@ #include <QObject> #include <QString> +#include "kdeclarative/kdeclarative_export.h" + class QMetaMethod; class QWindow; @@ -43,18 +45,27 @@ { Q_OBJECT +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) /** * @brief The number of the current desktop */ Q_PROPERTY(int currentDesktop READ currentDesktop WRITE setCurrentDesktop NOTIFY currentDesktopChanged) +#endif + +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) /** * @brief The name of the current desktop */ Q_PROPERTY(QString currentDesktopName READ currentDesktopName NOTIFY currentDesktopNameChanged) +#endif + +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) /** * @brief The number of desktops */ Q_PROPERTY(int numberOfDesktops READ numberOfDesktops NOTIFY numberOfDesktopsChanged) +#endif + /** * @brief Whether "show desktop" is currently active */ @@ -86,11 +97,15 @@ explicit KWindowSystemProxy(QObject *parent = nullptr); ~KWindowSystemProxy() override; +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) int currentDesktop() const; void setCurrentDesktop(int desktop); +#endif +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) QString currentDesktopName() const; int numberOfDesktops() const; +#endif bool showingDesktop() const; void setShowingDesktop(bool showingDesktop); @@ -100,11 +115,13 @@ bool isPlatformX11() const; bool isPlatformWayland() const; +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) /** * Test to see if @p window still managed at present. * @param window the window to test */ Q_INVOKABLE bool hasWindow(QWindow *window) const; +#endif /** * Sets window @p window to be the active window. @@ -119,6 +136,7 @@ */ Q_INVOKABLE void forceActivateWindow(QWindow *window, long time = 0); +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) /** * Sets window @p window to be present on all virtual desktops if @p * onAllDesktops true. Otherwise the window lives only on one single desktop. @@ -127,6 +145,9 @@ * @param onAllDesktops true to show the window on all desktops, false otherwise */ Q_INVOKABLE void setOnAllDesktops(QWindow *window, bool onAllDesktops); +#endif + +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) /** * Moves window @p window to desktop @p desktop. * @@ -134,6 +155,9 @@ * @param desktop the number of the new desktop */ Q_INVOKABLE void setOnDesktop(QWindow *window, int desktop); +#endif + +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) /** * Moves window @p window to activities @p activities. * @@ -141,7 +165,9 @@ * @param activities the list of activity UUIDs */ Q_INVOKABLE void setOnActivities(QWindow *window, const QStringList &activities); +#endif +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) /** * Returns the name of the specified desktop. * @see currentDesktopName @@ -149,19 +175,34 @@ * @return the name of the desktop **/ Q_INVOKABLE QString desktopName(int desktop) const; +#endif + +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) /** * Sets the name of the specified desktop. * @param desktop the number of the desktop * @param name the new name for the desktop **/ Q_INVOKABLE void setDesktopName(int desktop, const QString &name); +#endif Q_SIGNALS: +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) void currentDesktopChanged(int desktop); +#endif + +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) void currentDesktopNameChanged(); +#endif +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) void desktopNamesChanged(); +#endif + +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) void numberOfDesktopsChanged(int numberOfDesktops); +#endif + void showingDesktopChanged(bool showingDesktop); void compositingActiveChanged(bool compositingActive); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/src/quickaddons/CMakeLists.txt new/kdeclarative-5.101.0/src/quickaddons/CMakeLists.txt --- old/kdeclarative-5.100.0/src/quickaddons/CMakeLists.txt 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/src/quickaddons/CMakeLists.txt 2022-12-03 10:44:49.000000000 +0100 @@ -28,7 +28,9 @@ add_library(KF5::QuickAddons ALIAS KF5QuickAddons) # Apps must include <KQuickAddons/File> or <kquickaddons/file.h> -target_include_directories(KF5QuickAddons INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KDeclarative>") +target_include_directories(KF5QuickAddons INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KDeclarative>" + PUBLIC "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>" # for kdeclarative/kdeclarative_export.h +) target_link_libraries(KF5QuickAddons PUBLIC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/src/quickaddons/managedtexturenode.cpp new/kdeclarative-5.101.0/src/quickaddons/managedtexturenode.cpp --- old/kdeclarative-5.100.0/src/quickaddons/managedtexturenode.cpp 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/src/quickaddons/managedtexturenode.cpp 2022-12-03 10:44:49.000000000 +0100 @@ -6,6 +6,8 @@ #include "managedtexturenode.h" +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) + ManagedTextureNode::ManagedTextureNode() { } @@ -15,3 +17,5 @@ m_texture = texture; QSGSimpleTextureNode::setTexture(texture.data()); } + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/src/quickaddons/managedtexturenode.h new/kdeclarative-5.101.0/src/quickaddons/managedtexturenode.h --- old/kdeclarative-5.100.0/src/quickaddons/managedtexturenode.h 2022-11-05 13:25:25.000000000 +0100 +++ new/kdeclarative-5.101.0/src/quickaddons/managedtexturenode.h 2022-12-03 10:44:49.000000000 +0100 @@ -13,6 +13,10 @@ #include <QSharedPointer> #include <qglobal.h> +#include "kdeclarative/kdeclarative_export.h" + +#if KDECLARATIVE_BUILD_DEPRECATED_SINCE(5, 101) + /** * @class ManagedTextureNode managedtexturenode.h KQuickAddons/ManagedTextureNode * @@ -42,3 +46,4 @@ }; #endif +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.100.0/tests/manykeysequenceitemtest.qml new/kdeclarative-5.101.0/tests/manykeysequenceitemtest.qml --- old/kdeclarative-5.100.0/tests/manykeysequenceitemtest.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.101.0/tests/manykeysequenceitemtest.qml 2022-12-03 10:44:49.000000000 +0100 @@ -0,0 +1,28 @@ +import QtQuick 2.15 +import QtQuick.Window 2.15 +import QtQuick.Layouts 1.15 + +import org.kde.kirigami 2.11 as Kirigami +import org.kde.kquickcontrols 2.0 + +Kirigami.ApplicationWindow { + width: 640 + height: 480 + visible: true + title: qsTr("Test") + + ColumnLayout { + KeySequenceItem { + checkForConflictsAgainst: ShortcutType.None + modifierlessAllowed: true + } + KeySequenceItem { + checkForConflictsAgainst: ShortcutType.None + modifierlessAllowed: true + } + KeySequenceItem { + checkForConflictsAgainst: ShortcutType.None + modifierlessAllowed: true + } + } +}
