Hello community, here is the log from the commit of package kitemmodels for openSUSE:Factory checked in at 2020-12-15 12:29:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemmodels (Old) and /work/SRC/openSUSE:Factory/.kitemmodels.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemmodels" Tue Dec 15 12:29:00 2020 rev:86 rq:855442 version:5.77.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kitemmodels/kitemmodels.changes 2020-11-23 10:32:35.245499202 +0100 +++ /work/SRC/openSUSE:Factory/.kitemmodels.new.2328/kitemmodels.changes 2020-12-15 12:31:15.500042555 +0100 @@ -1,0 +2,12 @@ +Sat Dec 5 18:56:42 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.77.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.77.0 +- Changes since 5.76.0: + * Remove redundant setLayout() call + * Remove test app, KRecursiveFilterProxyModel is deprecated since 5.65 + * KRearrangeColumnsProxyModel: only column 0 has children + +------------------------------------------------------------------- Old: ---- kitemmodels-5.76.0.tar.xz kitemmodels-5.76.0.tar.xz.sig New: ---- kitemmodels-5.77.0.tar.xz kitemmodels-5.77.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemmodels.spec ++++++ --- /var/tmp/diff_new_pack.XBtV6x/_old 2020-12-15 12:31:16.240043151 +0100 +++ /var/tmp/diff_new_pack.XBtV6x/_new 2020-12-15 12:31:16.244043154 +0100 @@ -17,7 +17,7 @@ %define lname libKF5ItemModels5 -%define _tar_path 5.76 +%define _tar_path 5.77 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -26,7 +26,7 @@ # Only needed for the package signature condition %bcond_without lang Name: kitemmodels -Version: 5.76.0 +Version: 5.77.0 Release: 0 Summary: Set of item models extending the Qt model-view framework License: LGPL-2.1-or-later @@ -41,8 +41,8 @@ BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem -BuildRequires: cmake(Qt5Core) >= 5.12.0 -BuildRequires: cmake(Qt5Qml) >= 5.12.0 +BuildRequires: cmake(Qt5Core) >= 5.13.0 +BuildRequires: cmake(Qt5Qml) >= 5.13.0 %if %{with python} BuildRequires: python3-clang BuildRequires: python3-devel @@ -76,7 +76,7 @@ Group: Development/Libraries/KDE Requires: %{lname} = %{version} Requires: extra-cmake-modules -Requires: cmake(Qt5Core) >= 5.12.0 +Requires: cmake(Qt5Core) >= 5.13.0 %description devel KItemModels provides a set of item models extending the Qt model-view framework. @@ -99,7 +99,7 @@ %build %cmake_kf5 -d build - %make_jobs + %cmake_build %install %kf5_makeinstall -C build ++++++ kitemmodels-5.76.0.tar.xz -> kitemmodels-5.77.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.76.0/CMakeLists.txt new/kitemmodels-5.77.0/CMakeLists.txt --- old/kitemmodels-5.76.0/CMakeLists.txt 2020-11-07 12:40:03.000000000 +0100 +++ new/kitemmodels-5.77.0/CMakeLists.txt 2020-12-05 11:10:12.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.76.0") # handled by release scripts +set(KF5_VERSION "5.77.0") # handled by release scripts project(KItemModels VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.76.0 NO_MODULE) +find_package(ECM 5.77.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) @@ -16,7 +16,7 @@ include(KDECMakeSettings) include(ECMQtDeclareLoggingCategory) -set(REQUIRED_QT_VERSION 5.12.0) +set(REQUIRED_QT_VERSION 5.13.0) find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(Qt5Qml ${REQUIRED_QT_VERSION} NO_MODULE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.76.0/src/core/krearrangecolumnsproxymodel.cpp new/kitemmodels-5.77.0/src/core/krearrangecolumnsproxymodel.cpp --- old/kitemmodels-5.76.0/src/core/krearrangecolumnsproxymodel.cpp 2020-11-07 12:40:03.000000000 +0100 +++ new/kitemmodels-5.77.0/src/core/krearrangecolumnsproxymodel.cpp 2020-12-05 11:10:12.000000000 +0100 @@ -47,6 +47,9 @@ if (!sourceModel()) { return 0; } + if (parent.column() > 0) { + return 0; + } // The parent in the source model is on column 0, whatever swapping we are doing const QModelIndex sourceParent = mapToSource(parent).sibling(parent.row(), 0); return sourceModel()->rowCount(sourceParent); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.76.0/tests/proxymodeltestapp/CMakeLists.txt new/kitemmodels-5.77.0/tests/proxymodeltestapp/CMakeLists.txt --- old/kitemmodels-5.76.0/tests/proxymodeltestapp/CMakeLists.txt 2020-11-07 12:40:03.000000000 +0100 +++ new/kitemmodels-5.77.0/tests/proxymodeltestapp/CMakeLists.txt 2020-12-05 11:10:12.000000000 +0100 @@ -18,12 +18,6 @@ matchcheckingwidget.cpp descendantqmltree.cpp ) -if(NOT EXCLUDE_DEPRECATED_BEFORE_AND_AT STREQUAL "CURRENT" AND - EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.65.0) - list(APPEND proxymodeltestapp_SRCS - recursivefilterpmwidget.cpp - ) -endif() find_package(Qt5Widgets ${REQUIRED_QT_VERSION} QUIET CONFIG) find_package(Qt5Script ${REQUIRED_QT_VERSION} QUIET CONFIG) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.76.0/tests/proxymodeltestapp/mainwindow.cpp new/kitemmodels-5.77.0/tests/proxymodeltestapp/mainwindow.cpp --- old/kitemmodels-5.76.0/tests/proxymodeltestapp/mainwindow.cpp 2020-11-07 12:40:03.000000000 +0100 +++ new/kitemmodels-5.77.0/tests/proxymodeltestapp/mainwindow.cpp 2020-12-05 11:10:12.000000000 +0100 @@ -25,9 +25,6 @@ #ifdef QT_SCRIPT_LIB #include "reparentingpmwidget.h" #endif -#if KITEMMODELS_BUILD_DEPRECATED_SINCE(5, 65) -#include "recursivefilterpmwidget.h" -#endif #include "lessthanwidget.h" #include "matchcheckingwidget.h" #include "kidentityproxymodelwidget.h" @@ -55,9 +52,6 @@ #ifdef QT_SCRIPT_LIB tabWidget->addTab(new ReparentingProxyModelWidget(), QStringLiteral("reparenting PM")); #endif -#if KITEMMODELS_BUILD_DEPRECATED_SINCE(5, 65) - tabWidget->addTab(new RecursiveFilterProxyWidget(), QStringLiteral("Recursive Filter")); -#endif tabWidget->addTab(new DescendantQmlTreeWidget(), QStringLiteral("QML Trees")); tabWidget->addTab(new LessThanWidget(), QStringLiteral("Less Than")); tabWidget->addTab(new ProxyModelTestWidget(), QStringLiteral("Proxy Model Test")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.76.0/tests/proxymodeltestapp/recursivefilterpmwidget.cpp new/kitemmodels-5.77.0/tests/proxymodeltestapp/recursivefilterpmwidget.cpp --- old/kitemmodels-5.76.0/tests/proxymodeltestapp/recursivefilterpmwidget.cpp 2020-11-07 12:40:03.000000000 +0100 +++ new/kitemmodels-5.77.0/tests/proxymodeltestapp/recursivefilterpmwidget.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,69 +0,0 @@ -/* - This file is part of the proxy model test suite. - - SPDX-FileCopyrightText: 2009 Stephen Kelly <steve...@gmail.com> - - SPDX-License-Identifier: LGPL-2.1-or-later -*/ - -#include "recursivefilterpmwidget.h" - -#include <QLineEdit> -#include <QSplitter> -#include <QTreeView> -#include <QHBoxLayout> -#include <QLabel> -#include <QPlainTextEdit> - -#include "dynamictreemodel.h" -#include "dynamictreewidget.h" - -RecursiveFilterProxyWidget::RecursiveFilterProxyWidget(QWidget *parent) - : QWidget(parent), - m_lineEdit(new QLineEdit(this)), - m_label(new QLabel(this)) -{ - m_label->setText(QStringLiteral("Matching filter re: ")); - m_lineEdit->setText(QStringLiteral("12|13|37|4")); - - QHBoxLayout *hLayout = new QHBoxLayout(); - QVBoxLayout *vLayout = new QVBoxLayout(this); - QSplitter *splitter = new QSplitter(this); - - m_rootModel = new DynamicTreeModel(this); - m_recursive = new KRecursiveFilterProxyModel(this); - m_recursiveSubclass = new KRecursiveFilterProxyModelSubclass(this); - - DynamicTreeWidget *dynamicTreeWidget = new DynamicTreeWidget(m_rootModel, splitter); - - QTreeView *recursiveView = new QTreeView(splitter); - recursiveView->setModel(m_recursive); - QTreeView *recursiveSubclassView = new QTreeView(splitter); - recursiveSubclassView->setModel(m_recursiveSubclass); - - hLayout->addWidget(m_label); - hLayout->addWidget(m_lineEdit); - - vLayout->addLayout(hLayout); - vLayout->addWidget(splitter); - - connect(m_lineEdit, SIGNAL(textChanged(QString)), SLOT(reset())); - - connect(m_lineEdit, SIGNAL(textChanged(QString)), recursiveView, SLOT(expandAll())); - connect(m_lineEdit, SIGNAL(textChanged(QString)), recursiveSubclassView, SLOT(expandAll())); - connect(dynamicTreeWidget->textEdit(), SIGNAL(textChanged()), recursiveView, SLOT(expandAll())); - connect(dynamicTreeWidget->textEdit(), SIGNAL(textChanged()), recursiveSubclassView, SLOT(expandAll())); - connect(m_recursive, SIGNAL(modelReset()), recursiveView, SLOT(expandAll()), Qt::QueuedConnection); - connect(m_recursiveSubclass, SIGNAL(modelReset()), recursiveSubclassView, SLOT(expandAll()), Qt::QueuedConnection); - - m_recursive->setSourceModel(m_rootModel); - m_recursiveSubclass->setSourceModel(m_rootModel); - - reset(); -} - -void RecursiveFilterProxyWidget::reset() -{ - m_recursive->setFilterRegExp(m_lineEdit->text()); - m_recursiveSubclass->setRegExp(QRegExp(m_lineEdit->text())); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.76.0/tests/proxymodeltestapp/recursivefilterpmwidget.h new/kitemmodels-5.77.0/tests/proxymodeltestapp/recursivefilterpmwidget.h --- old/kitemmodels-5.76.0/tests/proxymodeltestapp/recursivefilterpmwidget.h 2020-11-07 12:40:03.000000000 +0100 +++ new/kitemmodels-5.77.0/tests/proxymodeltestapp/recursivefilterpmwidget.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,72 +0,0 @@ -/* - This file is part of the proxy model test suite. - - SPDX-FileCopyrightText: 2009 Stephen Kelly <steve...@gmail.com> - - SPDX-License-Identifier: LGPL-2.1-or-later -*/ - -#ifndef RECURSIVE_FILTER_PM_WIDGET_H -#define RECURSIVE_FILTER_PM_WIDGET_H - -#include <QWidget> -#include <QRegExp> - -#include "krecursivefilterproxymodel.h" - -class QTreeView; -class QLineEdit; -class QLabel; -class QPushButton; - -class DynamicTreeModel; - -class KRecursiveFilterProxyModelSubclass : public KRecursiveFilterProxyModel -{ - Q_OBJECT -public: - KRecursiveFilterProxyModelSubclass(QObject *parent = nullptr) - : KRecursiveFilterProxyModel(parent) - { - - } - - bool acceptRow(int sourceRow, const QModelIndex &parent_index) const override - { - static const int column = 0; - QModelIndex srcIndex = sourceModel()->index(sourceRow, column, parent_index); - return srcIndex.data().toString().contains(m_regExp); - } - - void setRegExp(const QRegExp &re) - { - layoutAboutToBeChanged(); - m_regExp = re; - invalidateFilter(); - layoutChanged(); - } - -private: - QRegExp m_regExp; -}; - -class RecursiveFilterProxyWidget : public QWidget -{ - Q_OBJECT -public: - RecursiveFilterProxyWidget(QWidget *parent = nullptr); - -protected Q_SLOTS: - void reset(); - -private: - DynamicTreeModel *m_rootModel; - KRecursiveFilterProxyModel *m_recursive; - KRecursiveFilterProxyModelSubclass *m_recursiveSubclass; - - QLineEdit *m_lineEdit; - QLabel *m_label; -}; - -#endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.76.0/tests/proxymodeltestapp/reparentingpmwidget.cpp new/kitemmodels-5.77.0/tests/proxymodeltestapp/reparentingpmwidget.cpp --- old/kitemmodels-5.76.0/tests/proxymodeltestapp/reparentingpmwidget.cpp 2020-11-07 12:40:03.000000000 +0100 +++ new/kitemmodels-5.77.0/tests/proxymodeltestapp/reparentingpmwidget.cpp 2020-12-05 11:10:12.000000000 +0100 @@ -37,7 +37,5 @@ ); new ScriptableReparentingWidget(m_rootModel, vSplitter); - - setLayout(layout); } _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
