Hello community, here is the log from the commit of package kitemmodels for openSUSE:Factory checked in at 2018-01-09 14:42:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemmodels (Old) and /work/SRC/openSUSE:Factory/.kitemmodels.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemmodels" Tue Jan 9 14:42:47 2018 rev:48 rq:559450 version:5.41.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kitemmodels/kitemmodels.changes 2017-11-16 14:38:59.823060168 +0100 +++ /work/SRC/openSUSE:Factory/.kitemmodels.new/kitemmodels.changes 2018-01-09 14:42:48.517017067 +0100 @@ -1,0 +2,11 @@ +Sun Dec 17 09:43:48 CET 2017 - lbeltr...@kde.org + +- Update to 5.41.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.41.0.php +- Changes since 5.40.0: + * Update comment for new Qt 5.10 API + * Port to qCDebug + +------------------------------------------------------------------- Old: ---- kitemmodels-5.40.0.tar.xz New: ---- kitemmodels-5.41.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemmodels.spec ++++++ --- /var/tmp/diff_new_pack.HNmO3f/_old 2018-01-09 14:42:49.200984991 +0100 +++ /var/tmp/diff_new_pack.HNmO3f/_new 2018-01-09 14:42:49.200984991 +0100 @@ -19,13 +19,13 @@ %bcond_with python %define clang_sonum 3.8 %define lname libKF5ItemModels5 -%define _tar_path 5.40 +%define _tar_path 5.41 # 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: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kitemmodels -Version: 5.40.0 +Version: 5.41.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} @@ -100,6 +100,7 @@ %defattr(-,root,root) %doc COPYING* %{_kf5_libdir}/libKF5ItemModels.so.* +%{_kf5_debugdir}/*.categories %files devel %defattr(-,root,root) ++++++ kitemmodels-5.40.0.tar.xz -> kitemmodels-5.41.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.40.0/CMakeLists.txt new/kitemmodels-5.41.0/CMakeLists.txt --- old/kitemmodels-5.40.0/CMakeLists.txt 2017-11-04 22:44:23.000000000 +0100 +++ new/kitemmodels-5.41.0/CMakeLists.txt 2017-12-02 11:15:39.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.40.0") # handled by release scripts +set(KF5_VERSION "5.41.0") # handled by release scripts project(KItemModels VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.40.0 NO_MODULE) +find_package(ECM 5.41.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -14,6 +14,7 @@ include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) +include(ECMQtDeclareLoggingCategory) set(REQUIRED_QT_VERSION 5.7.0) find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) @@ -75,4 +76,7 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) +# contains list of debug categories, for kdebugsettings +install(FILES kitemmodels.categories DESTINATION ${KDE_INSTALL_CONFDIR}) + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.40.0/kitemmodels.categories new/kitemmodels-5.41.0/kitemmodels.categories --- old/kitemmodels-5.40.0/kitemmodels.categories 1970-01-01 01:00:00.000000000 +0100 +++ new/kitemmodels-5.41.0/kitemmodels.categories 2017-12-02 11:15:39.000000000 +0100 @@ -0,0 +1 @@ +kf5.kitemmodels KItemModels diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.40.0/src/CMakeLists.txt new/kitemmodels-5.41.0/src/CMakeLists.txt --- old/kitemmodels-5.40.0/src/CMakeLists.txt 2017-11-04 22:44:23.000000000 +0100 +++ new/kitemmodels-5.41.0/src/CMakeLists.txt 2017-12-02 11:15:39.000000000 +0100 @@ -12,6 +12,8 @@ kselectionproxymodel.cpp ) +ecm_qt_declare_logging_category(kitemmodels_SRCS HEADER kitemmodels_debug.h IDENTIFIER KITEMMODELS_LOG CATEGORY_NAME kf5.kitemmodels) + add_library(KF5ItemModels ${kitemmodels_SRCS}) generate_export_header(KF5ItemModels BASE_NAME KItemModels) add_library(KF5::ItemModels ALIAS KF5ItemModels) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.40.0/src/kextracolumnsproxymodel.cpp new/kitemmodels-5.41.0/src/kextracolumnsproxymodel.cpp --- old/kitemmodels-5.40.0/src/kextracolumnsproxymodel.cpp 2017-11-04 22:44:23.000000000 +0100 +++ new/kitemmodels-5.41.0/src/kextracolumnsproxymodel.cpp 2017-12-02 11:15:39.000000000 +0100 @@ -19,8 +19,9 @@ */ #include "kextracolumnsproxymodel.h" +#include "kitemmodels_debug.h" + #include <QItemSelection> -#include <QDebug> class KExtraColumnsProxyModelPrivate { @@ -115,7 +116,7 @@ } const int column = proxyIndex.column(); if (column >= sourceModel()->columnCount()) { - qDebug() << "Returning invalid index in mapToSource"; + qCDebug(KITEMMODELS_LOG) << "Returning invalid index in mapToSource"; return QModelIndex(); } return QIdentityProxyModel::mapToSource(proxyIndex); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.40.0/src/klinkitemselectionmodel.cpp new/kitemmodels-5.41.0/src/klinkitemselectionmodel.cpp --- old/kitemmodels-5.40.0/src/klinkitemselectionmodel.cpp 2017-11-04 22:44:23.000000000 +0100 +++ new/kitemmodels-5.41.0/src/klinkitemselectionmodel.cpp 2017-12-02 11:15:39.000000000 +0100 @@ -22,11 +22,10 @@ */ #include "klinkitemselectionmodel.h" - +#include "kitemmodels_debug.h" #include "kmodelindexproxymapper.h" #include <QItemSelection> -#include <QDebug> class KLinkItemSelectionModelPrivate { @@ -52,7 +51,7 @@ { Q_FOREACH (const QItemSelectionRange &range, selection) { if (!range.isValid()) { - qDebug() << selection; + qCDebug(KITEMMODELS_LOG) << selection; } Q_ASSERT(range.isValid()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.40.0/src/kmodelindexproxymapper.cpp new/kitemmodels-5.41.0/src/kmodelindexproxymapper.cpp --- old/kitemmodels-5.40.0/src/kmodelindexproxymapper.cpp 2017-11-04 22:44:23.000000000 +0100 +++ new/kitemmodels-5.41.0/src/kmodelindexproxymapper.cpp 2017-12-02 11:15:39.000000000 +0100 @@ -22,10 +22,10 @@ */ #include "kmodelindexproxymapper.h" +#include "kitemmodels_debug.h" #include <QtCore/QAbstractItemModel> #include <QtCore/QPointer> -#include <QtCore/QDebug> #include <QAbstractProxyModel> #include <QItemSelectionModel> @@ -45,7 +45,7 @@ { Q_FOREACH (const QItemSelectionRange &range, selection) { if (!range.isValid()) { - qDebug() << selection << m_leftModel << m_rightModel << m_proxyChainDown << m_proxyChainUp; + qCDebug(KITEMMODELS_LOG) << selection << m_leftModel << m_rightModel << m_proxyChainDown << m_proxyChainUp; } Q_ASSERT(range.isValid()); } @@ -228,7 +228,7 @@ } if (selection.first().model() != d->m_leftModel) { - qDebug() << "FAIL" << selection.first().model() << d->m_leftModel << d->m_rightModel; + qCDebug(KITEMMODELS_LOG) << "FAIL" << selection.first().model() << d->m_leftModel << d->m_rightModel; } Q_ASSERT(selection.first().model() == d->m_leftModel); @@ -282,7 +282,7 @@ } if (selection.first().model() != d->m_rightModel) { - qDebug() << "FAIL" << selection.first().model() << d->m_leftModel << d->m_rightModel; + qCDebug(KITEMMODELS_LOG) << "FAIL" << selection.first().model() << d->m_leftModel << d->m_rightModel; } Q_ASSERT(selection.first().model() == d->m_rightModel); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.40.0/src/krecursivefilterproxymodel.h new/kitemmodels-5.41.0/src/krecursivefilterproxymodel.h --- old/kitemmodels-5.40.0/src/krecursivefilterproxymodel.h 2017-11-04 22:44:23.000000000 +0100 +++ new/kitemmodels-5.41.0/src/krecursivefilterproxymodel.h 2017-12-02 11:15:39.000000000 +0100 @@ -34,7 +34,7 @@ Until Qt 5.10, QSortFilterProxyModel did not recurse when invoking a filtering stage, so that if a particular row is filtered out, its children are not even checked to see if they match the filter. - If you can depend on Qt >= 5.10, then just use QSortFilterProxyModel::setRecursiveFiltering(true), + If you can depend on Qt >= 5.10, then just use QSortFilterProxyModel::setRecursiveFilteringEnabled(true), and you don't need to use KRecursiveFilterProxyModel. For example, given a source model:
