Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kquickcharts for openSUSE:Factory checked in at 2022-02-24 18:19:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kquickcharts (Old) and /work/SRC/openSUSE:Factory/.kquickcharts.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kquickcharts" Thu Feb 24 18:19:49 2022 rev:27 rq:954275 version:5.91.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kquickcharts/kquickcharts.changes 2022-01-11 21:19:25.856965636 +0100 +++ /work/SRC/openSUSE:Factory/.kquickcharts.new.1958/kquickcharts.changes 2022-02-24 18:22:06.250679928 +0100 @@ -1,0 +2,12 @@ +Sun Feb 6 10:17:11 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.91.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.91.0 +- Changes since 5.90.0: + * ModelSource: Don't use QPointer for storing the model + * ModelSource: Cache minimum/maximum properties of the model + * Adapt build system for building against qt6 + fix some compile error + +------------------------------------------------------------------- Old: ---- kquickcharts-5.90.0.tar.xz kquickcharts-5.90.0.tar.xz.sig New: ---- kquickcharts-5.91.0.tar.xz kquickcharts-5.91.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kquickcharts.spec ++++++ --- /var/tmp/diff_new_pack.CMtYxE/_old 2022-02-24 18:22:06.750679795 +0100 +++ /var/tmp/diff_new_pack.CMtYxE/_new 2022-02-24 18:22:06.758679792 +0100 @@ -16,14 +16,14 @@ # -%define _tar_path 5.90 +%define _tar_path 5.91 # 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: kquickcharts -Version: 5.90.0 +Version: 5.91.0 Release: 0 Summary: Set of charts for QtQuick applications License: LGPL-2.1-or-later ++++++ kquickcharts-5.90.0.tar.xz -> kquickcharts-5.91.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.90.0/CMakeLists.txt new/kquickcharts-5.91.0/CMakeLists.txt --- old/kquickcharts-5.90.0/CMakeLists.txt 2022-01-01 13:18:43.000000000 +0100 +++ new/kquickcharts-5.91.0/CMakeLists.txt 2022-02-05 16:17:00.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.90.0") # handled by release scripts -set(KF_DEP_VERSION "5.90.0") # handled by release scripts +set(KF_VERSION "5.91.0") # handled by release scripts +set(KF_DEP_VERSION "5.91.0") # handled by release scripts project(KQuickCharts VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.90.0 NO_MODULE) +find_package(ECM 5.91.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) @@ -26,7 +26,7 @@ option(BUILD_EXAMPLES "Build example applications" OFF) set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Qml Quick QuickControls2) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Qml Quick QuickControls2) set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.90.0/KF5QuickChartsConfig.cmake.in new/kquickcharts-5.91.0/KF5QuickChartsConfig.cmake.in --- old/kquickcharts-5.90.0/KF5QuickChartsConfig.cmake.in 2022-01-01 13:18:43.000000000 +0100 +++ new/kquickcharts-5.91.0/KF5QuickChartsConfig.cmake.in 2022-02-05 16:17:00.000000000 +0100 @@ -1,7 +1,7 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Core @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Core @REQUIRED_QT_VERSION@) include("${CMAKE_CURRENT_LIST_DIR}/KF5QuickChartsTargets.cmake") @PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.90.0/autotests/CMakeLists.txt new/kquickcharts-5.91.0/autotests/CMakeLists.txt --- old/kquickcharts-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:18:43.000000000 +0100 +++ new/kquickcharts-5.91.0/autotests/CMakeLists.txt 2022-02-05 16:17:00.000000000 +0100 @@ -1,5 +1,5 @@ -find_package(Qt5 COMPONENTS QuickTest) +find_package(Qt${QT_MAJOR_VERSION} COMPONENTS QuickTest) include(ECMAddTests) @@ -10,11 +10,11 @@ MapProxySourceTest.cpp HistoryProxySourceTest.cpp ItemBuilderTest.cpp - LINK_LIBRARIES QuickChartsStatic Qt5::Test + LINK_LIBRARIES QuickChartsStatic Qt${QT_MAJOR_VERSION}::Test ) add_executable(qmltest qmltest.cpp) -target_link_libraries(qmltest Qt5::QuickTest) +target_link_libraries(qmltest Qt${QT_MAJOR_VERSION}::QuickTest) macro(add_qml_tests) if (WIN32) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.90.0/controls/CMakeLists.txt new/kquickcharts-5.91.0/controls/CMakeLists.txt --- old/kquickcharts-5.90.0/controls/CMakeLists.txt 2022-01-01 13:18:43.000000000 +0100 +++ new/kquickcharts-5.91.0/controls/CMakeLists.txt 2022-02-05 16:17:00.000000000 +0100 @@ -2,11 +2,11 @@ add_library(chartscontrolsplugin SHARED ChartsControlsPlugin.cpp) target_link_libraries(chartscontrolsplugin - Qt5::Core - Qt5::Quick - Qt5::Qml - Qt5::Gui - Qt5::QuickControls2 + Qt${QT_MAJOR_VERSION}::Core + Qt${QT_MAJOR_VERSION}::Quick + Qt${QT_MAJOR_VERSION}::Qml + Qt${QT_MAJOR_VERSION}::Gui + Qt${QT_MAJOR_VERSION}::QuickControls2 ) install(TARGETS chartscontrolsplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/quickcharts/controls) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.90.0/src/CMakeLists.txt new/kquickcharts-5.91.0/src/CMakeLists.txt --- old/kquickcharts-5.90.0/src/CMakeLists.txt 2022-01-01 13:18:43.000000000 +0100 +++ new/kquickcharts-5.91.0/src/CMakeLists.txt 2022-02-05 16:17:00.000000000 +0100 @@ -63,7 +63,7 @@ XYChart.h ) -qt5_add_resources(quickcharts_QRC shaders/shaders.qrc) +qt_add_resources(quickcharts_QRC shaders/shaders.qrc) ecm_qt_declare_logging_category(quickcharts_SRCS HEADER charts_general_logging.h @@ -93,7 +93,7 @@ ) add_library(QuickChartsStatic STATIC ${quickcharts_SRCS} ${quickcharts_QRC}) -target_link_libraries(QuickChartsStatic PUBLIC Qt5::Core Qt5::Quick Qt5::Qml Qt5::Quick) +target_link_libraries(QuickChartsStatic PUBLIC Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Quick Qt${QT_MAJOR_VERSION}::Qml Qt${QT_MAJOR_VERSION}::Quick) add_library(QuickCharts SHARED ChartsPlugin.cpp ChartsPlugin.h) target_link_libraries(QuickCharts PRIVATE QuickChartsStatic) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.90.0/src/Chart.cpp new/kquickcharts-5.91.0/src/Chart.cpp --- old/kquickcharts-5.90.0/src/Chart.cpp 2022-01-01 13:18:43.000000000 +0100 +++ new/kquickcharts-5.91.0/src/Chart.cpp 2022-02-05 16:17:00.000000000 +0100 @@ -151,13 +151,20 @@ auto chart = reinterpret_cast<Chart *>(list->data); chart->insertValueSource(chart->valueSources().size(), source); } - +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) int Chart::sourceCount(Chart::DataSourcesProperty *list) +#else +qsizetype Chart::sourceCount(Chart::DataSourcesProperty *list) +#endif { return reinterpret_cast<Chart *>(list->data)->m_valueSources.count(); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) ChartDataSource *Chart::source(Chart::DataSourcesProperty *list, int index) +#else +ChartDataSource *Chart::source(Chart::DataSourcesProperty *list, qsizetype index) +#endif { return reinterpret_cast<Chart *>(list->data)->m_valueSources.at(index); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.90.0/src/Chart.h new/kquickcharts-5.91.0/src/Chart.h --- old/kquickcharts-5.90.0/src/Chart.h 2022-01-01 13:18:43.000000000 +0100 +++ new/kquickcharts-5.91.0/src/Chart.h 2022-02-05 16:17:00.000000000 +0100 @@ -8,10 +8,9 @@ #ifndef CHART_H #define CHART_H +#include "datasource/ChartDataSource.h" #include <QQuickItem> -class ChartDataSource; - /** * Abstract base class for all charts. */ @@ -94,8 +93,13 @@ private: static void appendSource(DataSourcesProperty *list, ChartDataSource *source); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) static int sourceCount(DataSourcesProperty *list); static ChartDataSource *source(DataSourcesProperty *list, int index); +#else + static qsizetype sourceCount(DataSourcesProperty *list); + static ChartDataSource *source(DataSourcesProperty *list, qsizetype index); +#endif static void clearSources(DataSourcesProperty *list); ChartDataSource *m_nameSource = nullptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.90.0/src/LineChart.cpp new/kquickcharts-5.91.0/src/LineChart.cpp --- old/kquickcharts-5.90.0/src/LineChart.cpp 2022-01-01 13:18:43.000000000 +0100 +++ new/kquickcharts-5.91.0/src/LineChart.cpp 2022-02-05 16:17:00.000000000 +0100 @@ -305,10 +305,17 @@ polish(); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) void LineChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +#else +void LineChart::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) +#endif { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) XYChart::geometryChanged(newGeometry, oldGeometry); - +#else + XYChart::geometryChange(newGeometry, oldGeometry); +#endif if (newGeometry != oldGeometry) { polish(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.90.0/src/LineChart.h new/kquickcharts-5.91.0/src/LineChart.h --- old/kquickcharts-5.90.0/src/LineChart.h 2022-01-01 13:18:43.000000000 +0100 +++ new/kquickcharts-5.91.0/src/LineChart.h 2022-02-05 16:17:00.000000000 +0100 @@ -146,8 +146,11 @@ void updatePolish() override; QSGNode *updatePaintNode(QSGNode *node, QQuickItem::UpdatePaintNodeData *data) override; void onDataChanged() override; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; - +#else + void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override; +#endif private: void updateLineNode(LineChartNode *node, const QColor &lineColor, const QColor &fillColor, ChartDataSource *valueSource); void createPointDelegates(const QVector<QVector2D> &values, int sourceIndex); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.90.0/src/PieChart.h new/kquickcharts-5.91.0/src/PieChart.h --- old/kquickcharts-5.90.0/src/PieChart.h 2022-01-01 13:18:43.000000000 +0100 +++ new/kquickcharts-5.91.0/src/PieChart.h 2022-02-05 16:17:00.000000000 +0100 @@ -11,9 +11,7 @@ #include <memory> #include "Chart.h" - -class ChartDataSource; -class RangeGroup; +#include "RangeGroup.h" /** * An item to render a pie chart. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.90.0/src/datasource/ModelSource.cpp new/kquickcharts-5.91.0/src/datasource/ModelSource.cpp --- old/kquickcharts-5.90.0/src/datasource/ModelSource.cpp 2022-01-01 13:18:43.000000000 +0100 +++ new/kquickcharts-5.91.0/src/datasource/ModelSource.cpp 2022-02-05 16:17:00.000000000 +0100 @@ -7,6 +7,8 @@ #include "ModelSource.h" +#include <QMetaProperty> + #include "charts_datasource_logging.h" ModelSource::ModelSource(QObject *parent) @@ -100,6 +102,10 @@ return {}; } + if (m_minimum.isValid()) { + return m_minimum; + } + auto minProperty = m_model->property("minimum"); auto maxProperty = m_model->property("maximum"); if (minProperty.isValid() && minProperty != maxProperty) { @@ -119,6 +125,10 @@ return {}; } + if (m_maximum.isValid()) { + return m_maximum; + } + auto minProperty = m_model->property("minimum"); auto maxProperty = m_model->property("maximum"); if (maxProperty.isValid() && maxProperty != minProperty) { @@ -188,6 +198,8 @@ if (m_model) { m_model->disconnect(this); + m_minimum = QVariant{}; + m_maximum = QVariant{}; } m_model = model; @@ -198,7 +210,49 @@ connect(m_model, &QAbstractItemModel::modelReset, this, &ModelSource::dataChanged); connect(m_model, &QAbstractItemModel::dataChanged, this, &ModelSource::dataChanged); connect(m_model, &QAbstractItemModel::layoutChanged, this, &ModelSource::dataChanged); + + connect(m_model, &QAbstractItemModel::destroyed, this, [this]() { + m_minimum = QVariant{}; + m_maximum = QVariant{}; + m_model = nullptr; + }); + + auto minimumIndex = m_model->metaObject()->indexOfProperty("minimum"); + if (minimumIndex != -1) { + auto minimum = m_model->metaObject()->property(minimumIndex); + if (minimum.hasNotifySignal()) { + auto slot = metaObject()->method(metaObject()->indexOfSlot("onMinimumChanged()")); + connect(m_model, minimum.notifySignal(), this, slot); + m_minimum = minimum.read(m_model); + } + } + + auto maximumIndex = m_model->metaObject()->indexOfProperty("maximum"); + if (maximumIndex != -1) { + auto maximum = m_model->metaObject()->property(maximumIndex); + if (maximum.hasNotifySignal()) { + auto slot = metaObject()->method(metaObject()->indexOfSlot("onMaximumChanged()")); + connect(m_model, maximum.notifySignal(), this, slot); + m_maximum = maximum.read(m_model); + } + } } Q_EMIT modelChanged(); } + +void ModelSource::onMinimumChanged() +{ + auto newMinimum = m_model->property("minimum"); + if (newMinimum.isValid() && newMinimum != m_minimum) { + m_minimum = newMinimum; + } +} + +void ModelSource::onMaximumChanged() +{ + auto newMaximum = m_model->property("maximum"); + if (newMaximum.isValid() && newMaximum != m_maximum) { + m_maximum = newMaximum; + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.90.0/src/datasource/ModelSource.h new/kquickcharts-5.91.0/src/datasource/ModelSource.h --- old/kquickcharts-5.90.0/src/datasource/ModelSource.h 2022-01-01 13:18:43.000000000 +0100 +++ new/kquickcharts-5.91.0/src/datasource/ModelSource.h 2022-02-05 16:17:00.000000000 +0100 @@ -8,11 +8,11 @@ #ifndef MODELSOURCE_H #define MODELSOURCE_H -#include "ChartDataSource.h" - #include <QAbstractItemModel> #include <QPointer> +#include "ChartDataSource.h" + /** * A data source that reads data from a QAbstractItemModel. * @@ -56,11 +56,17 @@ virtual QVariant maximum() const override; private: + Q_SLOT void onMinimumChanged(); + Q_SLOT void onMaximumChanged(); + mutable int m_role = -1; QString m_roleName; int m_column = 0; bool m_indexColumns = false; - QPointer<QAbstractItemModel> m_model; + QAbstractItemModel *m_model = nullptr; + + QVariant m_minimum; + QVariant m_maximum; }; #endif // MODELSOURCE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.90.0/src/decorations/AxisLabels.cpp new/kquickcharts-5.91.0/src/decorations/AxisLabels.cpp --- old/kquickcharts-5.90.0/src/decorations/AxisLabels.cpp 2022-01-01 13:18:43.000000000 +0100 +++ new/kquickcharts-5.91.0/src/decorations/AxisLabels.cpp 2022-02-05 16:17:00.000000000 +0100 @@ -148,10 +148,17 @@ scheduleLayout(); Q_EMIT constrainToBoundsChanged(); } - +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) void AxisLabels::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +#else +void AxisLabels::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) +#endif { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QQuickItem::geometryChanged(newGeometry, oldGeometry); +#else + QQuickItem::geometryChange(newGeometry, oldGeometry); +#endif if (newGeometry != oldGeometry) { scheduleLayout(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.90.0/src/decorations/AxisLabels.h new/kquickcharts-5.91.0/src/decorations/AxisLabels.h --- old/kquickcharts-5.90.0/src/decorations/AxisLabels.h 2022-01-01 13:18:43.000000000 +0100 +++ new/kquickcharts-5.91.0/src/decorations/AxisLabels.h 2022-02-05 16:17:00.000000000 +0100 @@ -85,7 +85,11 @@ } protected: +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; +#else + void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override; +#endif private: void scheduleLayout(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.90.0/src/decorations/LegendLayout.cpp new/kquickcharts-5.91.0/src/decorations/LegendLayout.cpp --- old/kquickcharts-5.90.0/src/decorations/LegendLayout.cpp 2022-01-01 13:18:43.000000000 +0100 +++ new/kquickcharts-5.91.0/src/decorations/LegendLayout.cpp 2022-02-05 16:17:00.000000000 +0100 @@ -167,12 +167,20 @@ sizeWithSpacing(rows, itemHeight, m_verticalSpacing)); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) void LegendLayout::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +#else +void LegendLayout::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) +#endif { if (newGeometry != oldGeometry) { polish(); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QQuickItem::geometryChanged(newGeometry, oldGeometry); +#else + QQuickItem::geometryChange(newGeometry, oldGeometry); +#endif } void LegendLayout::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData& data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.90.0/src/decorations/LegendLayout.h new/kquickcharts-5.91.0/src/decorations/LegendLayout.h --- old/kquickcharts-5.90.0/src/decorations/LegendLayout.h 2022-01-01 13:18:43.000000000 +0100 +++ new/kquickcharts-5.91.0/src/decorations/LegendLayout.h 2022-02-05 16:17:00.000000000 +0100 @@ -66,7 +66,11 @@ protected: void componentComplete() override; void updatePolish() override; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; +#else + void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override; +#endif void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) override; private:
