diff -pruN 5.94.0-1/CMakeLists.txt 5.96.0-1/CMakeLists.txt --- 5.94.0-1/CMakeLists.txt 2022-05-07 21:23:52.000000000 +0000 +++ 5.96.0-1/CMakeLists.txt 2022-07-02 15:55:14.000000000 +0000 @@ -1,31 +1,32 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.94.0") # handled by release scripts +set(KF_VERSION "5.96.0") # handled by release scripts project(KItemViews VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.93.0 NO_MODULE) +find_package(ECM 5.96.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) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(KDEInstallDirs) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) -include(KDEGitCommitHooks) - -set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) +include(KDEGitCommitHooks) include(ECMGenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMQtDeclareLoggingCategory) +include(ECMDeprecationSettings) include(ECMAddQch) +include(ECMPoQmTools) include(CMakeDependentOption) +include(CMakePackageConfigHelpers) -include(ECMPoQmTools) +set(REQUIRED_QT_VERSION 5.15.2) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") @@ -42,7 +43,11 @@ ecm_setup_version(PROJECT VARIABLE_PREFI ecm_install_po_files_as_qm(po) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) + +ecm_set_disabled_deprecation_versions( + QT 5.15.2 +) + add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(autotests) @@ -61,8 +66,6 @@ if (BUILD_QCH) set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5ItemViewsQCHTargets.cmake\")") endif() -include(CMakePackageConfigHelpers) - configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5ItemViewsConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5ItemViewsConfig.cmake" diff -pruN 5.94.0-1/debian/changelog 5.96.0-1/debian/changelog --- 5.94.0-1/debian/changelog 2022-05-19 21:59:02.000000000 +0000 +++ 5.96.0-1/debian/changelog 2022-07-31 11:32:57.000000000 +0000 @@ -1,3 +1,11 @@ +kitemviews (5.96.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (5.96.0). + * Bump Standards-Version to 4.6.1, no change required. + + -- Aurélien COUDERC Sun, 31 Jul 2022 13:32:57 +0200 + kitemviews (5.94.0-1) unstable; urgency=medium [ Aurélien COUDERC ] diff -pruN 5.94.0-1/debian/control 5.96.0-1/debian/control --- 5.94.0-1/debian/control 2022-04-29 21:01:58.000000000 +0000 +++ 5.96.0-1/debian/control 2022-07-31 11:32:57.000000000 +0000 @@ -7,13 +7,13 @@ Uploaders: Aurélien COUDERC = 3.16~), debhelper-compat (= 13), doxygen, - extra-cmake-modules (>= 5.93.0~), + extra-cmake-modules (>= 5.96.0~), libqt5sql5-sqlite:native, pkg-kde-tools (>= 0.15.15ubuntu1~), qtbase5-dev (>= 5.15.2~), qttools5-dev (>= 5.4), qttools5-dev-tools (>= 5.4), -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Homepage: https://invent.kde.org/frameworks/kitemviews Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kitemviews Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kitemviews.git diff -pruN 5.94.0-1/.kde-ci.yml 5.96.0-1/.kde-ci.yml --- 5.94.0-1/.kde-ci.yml 2022-05-07 21:23:52.000000000 +0000 +++ 5.96.0-1/.kde-ci.yml 2022-07-02 15:55:14.000000000 +0000 @@ -5,3 +5,4 @@ Dependencies: Options: test-before-installing: True + require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ] diff -pruN 5.94.0-1/po/is/kitemviews5_qt.po 5.96.0-1/po/is/kitemviews5_qt.po --- 5.94.0-1/po/is/kitemviews5_qt.po 2022-05-07 21:23:52.000000000 +0000 +++ 5.96.0-1/po/is/kitemviews5_qt.po 2022-07-02 15:55:14.000000000 +0000 @@ -6,47 +6,39 @@ # Richard Allen , 1998-2004. # Pjetur G. Hjaltason , 2003. # Arnar Leósson , 2003, 2005. -# Sveinn í Felli , 2007, 2008, 2009, 2010, 2011, 2012, 2013. +# Sveinn í Felli , 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2022. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2013-05-13 22:40+0000\n" -"Last-Translator: Sveinn í Felli \n" -"Language-Team: Icelandic \n" +"PO-Revision-Date: 2022-06-22 09:51+0000\n" +"Last-Translator: Sveinn í Felli \n" +"Language-Team: Icelandic\n" "Language: is\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 19.12.3\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" #: kfilterproxysearchline.cpp:63 -#, fuzzy -#| msgid "Search" msgctxt "KFilterProxySearchLine|@info:placeholder" msgid "Search..." -msgstr "Leita" +msgstr "Leita..." #: ktreewidgetsearchline.cpp:212 -#, fuzzy -#| msgid "Search" msgctxt "KTreeWidgetSearchLine|@info:placeholder" msgid "Search..." -msgstr "Leita" +msgstr "Leita..." #: ktreewidgetsearchline.cpp:417 -#, fuzzy -#| msgid "Search Columns" msgctxt "KTreeWidgetSearchLine|@title:menu" msgid "Search Columns" msgstr "Leitardálkar" #: ktreewidgetsearchline.cpp:419 -#, fuzzy -#| msgid "All Visible Columns" msgctxt "KTreeWidgetSearchLine|@optipn:check" msgid "All Visible Columns" msgstr "Allir sýnilegir dálkar" diff -pruN 5.94.0-1/po/ka/kitemviews5_qt.po 5.96.0-1/po/ka/kitemviews5_qt.po --- 5.94.0-1/po/ka/kitemviews5_qt.po 2022-05-07 21:23:52.000000000 +0000 +++ 5.96.0-1/po/ka/kitemviews5_qt.po 2022-07-02 15:55:14.000000000 +0000 @@ -1,46 +1,34 @@ -# KDE3 - Georgian translation of kdelibs4.po -# Gia Shervashidze , 2005. -# msgid "" msgstr "" -"Project-Id-Version: kdelibs4\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2009-12-17 02:11+0400\n" -"Last-Translator: George Machitidze \n" -"Language-Team: Georgian \n" +"Project-Id-Version: kitemviews5_qt\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: Temuri Doghonadze \n" +"Language-Team: Georgian \n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Qt-Contexts: true\n" +"X-Generator: Poedit 3.0.1\n" #: kfilterproxysearchline.cpp:63 -#, fuzzy -#| msgid "Search" msgctxt "KFilterProxySearchLine|@info:placeholder" msgid "Search..." -msgstr "ძიება" +msgstr "ძებნა..." #: ktreewidgetsearchline.cpp:212 -#, fuzzy -#| msgid "Search" msgctxt "KTreeWidgetSearchLine|@info:placeholder" msgid "Search..." -msgstr "ძიება" +msgstr "ძებნა..." #: ktreewidgetsearchline.cpp:417 -#, fuzzy -#| msgid "Search Columns" msgctxt "KTreeWidgetSearchLine|@title:menu" msgid "Search Columns" -msgstr "საძიებო სვეტები" +msgstr "სვეტების ძებნა" #: ktreewidgetsearchline.cpp:419 -#, fuzzy -#| msgid "All Visible Columns" msgctxt "KTreeWidgetSearchLine|@optipn:check" msgid "All Visible Columns" msgstr "ყველა ხილული სვეტი" diff -pruN 5.94.0-1/po/zh_CN/kitemviews5_qt.po 5.96.0-1/po/zh_CN/kitemviews5_qt.po --- 5.94.0-1/po/zh_CN/kitemviews5_qt.po 2022-05-07 21:23:52.000000000 +0000 +++ 5.96.0-1/po/zh_CN/kitemviews5_qt.po 2022-07-02 15:55:14.000000000 +0000 @@ -12,10 +12,6 @@ # Weng Xuetian , 2011, 2012, 2013. msgid "" msgstr "" -"Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2022-04-26 15:18\n" -"Language-Team: Chinese Simplified\n" -"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -26,6 +22,10 @@ msgstr "" "X-Crowdin-Language: zh-CN\n" "X-Crowdin-File: /kf5-trunk/messages/kitemviews/kitemviews5_qt.pot\n" "X-Crowdin-File-ID: 5601\n" +"Project-Id-Version: kdeorg\n" +"Language-Team: Chinese Simplified\n" +"Language: zh_CN\n" +"PO-Revision-Date: 2022-07-02 10:59\n" #: kfilterproxysearchline.cpp:63 msgctxt "KFilterProxySearchLine|@info:placeholder" diff -pruN 5.94.0-1/src/kwidgetitemdelegate.h 5.96.0-1/src/kwidgetitemdelegate.h --- 5.94.0-1/src/kwidgetitemdelegate.h 2022-05-07 21:23:52.000000000 +0000 +++ 5.96.0-1/src/kwidgetitemdelegate.h 2022-07-02 15:55:14.000000000 +0000 @@ -104,6 +104,7 @@ protected: * @param index the model index of the item currently manipulated. */ virtual void updateItemWidgets(const QList widgets, const QStyleOptionViewItem &option, const QPersistentModelIndex &index) const = 0; + // KF6 TODO: add missing reference to widgets parameter #if KITEMVIEWS_ENABLE_DEPRECATED_SINCE(4, 2) /** @@ -133,6 +134,7 @@ protected: * @param types the list of event types the widget must block */ void setBlockedEventTypes(QWidget *widget, QList types) const; + // KF6 TODO: pass types by const reference /** * Retrieves the list of blocked event types for the given widget.