Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-graphs for openSUSE:Factory checked in at 2024-06-24 20:52:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-graphs (Old) and /work/SRC/openSUSE:Factory/.qt6-graphs.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-graphs" Mon Jun 24 20:52:34 2024 rev:7 rq:1182590 version:6.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-graphs/qt6-graphs.changes 2024-05-27 11:54:17.518358921 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-graphs.new.18349/qt6-graphs.changes 2024-06-24 20:53:23.600528934 +0200 @@ -1,0 +2,6 @@ +Wed Jun 19 07:25:42 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Update to 6.7.2: + * https://www.qt.io/blog/qt-6.7.2-released + +------------------------------------------------------------------- Old: ---- qtgraphs-everywhere-src-6.7.1.tar.xz New: ---- qtgraphs-everywhere-src-6.7.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-graphs.spec ++++++ --- /var/tmp/diff_new_pack.OZfpMb/_old 2024-06-24 20:53:24.216551473 +0200 +++ /var/tmp/diff_new_pack.OZfpMb/_new 2024-06-24 20:53:24.216551473 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.1 +%define real_version 6.7.2 %define short_version 6.7 %define tar_name qtgraphs-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-graphs%{?pkg_suffix} -Version: 6.7.1 +Version: 6.7.2 Release: 0 Summary: 3D visualization module License: GPL-3.0-only ++++++ qtgraphs-everywhere-src-6.7.1.tar.xz -> qtgraphs-everywhere-src-6.7.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/.cmake.conf new/qtgraphs-everywhere-src-6.7.2/.cmake.conf --- old/qtgraphs-everywhere-src-6.7.1/.cmake.conf 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/.cmake.conf 2024-06-08 03:28:33.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.1") +set(QT_REPO_MODULE_VERSION "6.7.2") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/.tag new/qtgraphs-everywhere-src-6.7.2/.tag --- old/qtgraphs-everywhere-src-6.7.1/.tag 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/.tag 2024-06-08 03:28:33.000000000 +0200 @@ -1 +1 @@ -4cf0173471641eb4ee27054bf320f7187af03571 +4fecd24f1c50064717e45eabcf0a210963f10e14 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/dependencies.yaml new/qtgraphs-everywhere-src-6.7.2/dependencies.yaml --- old/qtgraphs-everywhere-src-6.7.1/dependencies.yaml 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 03:28:33.000000000 +0200 @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: c195fe7d33decbd5ddd47ae46dbf8e0d9c20ba85 + ref: b5fbe0923cfc566036b83c3d968f225b26117efc required: true ../qtdeclarative: - ref: 734849e4577b75e85420b08ddb55974482bbd063 + ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc required: true ../qtquick3d: - ref: 8c2d9addd9509dec17672b0b94cc636c38215dfc + ref: 8209c3e400ba348590907a4b8bab6c5353237d1e required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.cpp new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.cpp --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.cpp 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.cpp 2024-06-08 03:28:33.000000000 +0200 @@ -1,7 +1,6 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#include <QtGraphs/QBarCategoryAxis> #include <private/qbarcategoryaxis_p.h> #include <QtCore/QtMath> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,7 +4,11 @@ #ifndef QBARCATEGORYAXIS_H #define QBARCATEGORYAXIS_H -#include <QtGraphs/QAbstractAxis> +#if 0 +# pragma qt_class(QBarCategoryAxis) +#endif + +#include <QtGraphs/qabstractaxis.h> #include <QtGraphs/qgraphsglobal.h> #include <QtQml/QQmlEngine> @@ -12,7 +16,7 @@ class QBarCategoryAxisPrivate; -class Q_GRAPHS_EXPORT QBarCategoryAxis : public QAbstractAxis +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QBarCategoryAxis : public QAbstractAxis { Q_OBJECT Q_PROPERTY(QStringList categories READ categories WRITE setCategories NOTIFY categoriesChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis_p.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis_p.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis_p.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis_p.h 2024-06-08 03:28:33.000000000 +0200 @@ -13,7 +13,7 @@ #ifndef QBARCATEGORYAXIS_P_H #define QBARCATEGORYAXIS_P_H -#include <QtGraphs/QBarCategoryAxis> +#include <QtGraphs/qbarcategoryaxis.h> #include <private/qabstractaxis_p.h> QT_BEGIN_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/qabstractaxis.cpp new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/qabstractaxis.cpp --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/qabstractaxis.cpp 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/qabstractaxis.cpp 2024-06-08 03:28:33.000000000 +0200 @@ -1,7 +1,7 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#include <QtGraphs/QAbstractAxis> +#include <QtGraphs/qabstractaxis.h> #include <private/qabstractaxis_p.h> QT_BEGIN_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/qabstractaxis.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/qabstractaxis.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/qabstractaxis.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/qabstractaxis.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QABSTRACTAXIS_H #define QABSTRACTAXIS_H +#if 0 +# pragma qt_class(QAbstractAxis) +#endif + #include <QtCore/QObject> #include <QtCore/QVariant> #include <QtGraphs/qgraphsglobal.h> @@ -15,7 +19,7 @@ class QAbstractAxisPrivate; -class Q_GRAPHS_EXPORT QAbstractAxis : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QAbstractAxis : public QObject { Q_OBJECT //visibility diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/qabstractaxis_p.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/qabstractaxis_p.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/qabstractaxis_p.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/qabstractaxis_p.h 2024-06-08 03:28:33.000000000 +0200 @@ -13,10 +13,10 @@ #ifndef QABSTRACTAXIS_P_H #define QABSTRACTAXIS_P_H -#include <QtGraphs/QAbstractAxis> -#include <private/qgraphsview_p.h> -#include <QtCore/QDebug> #include <QColor> +#include <QtCore/QDebug> +#include <QtGraphs/qabstractaxis.h> +#include <private/qgraphsview_p.h> #include <memory> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/valueaxis/qvalueaxis.cpp new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/valueaxis/qvalueaxis.cpp --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/valueaxis/qvalueaxis.cpp 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/valueaxis/qvalueaxis.cpp 2024-06-08 03:28:33.000000000 +0200 @@ -1,7 +1,6 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#include <QtGraphs/QValueAxis> #include <private/qvalueaxis_p.h> #include <private/charthelpers_p.h> #include <QtCore/QtMath> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/valueaxis/qvalueaxis.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/valueaxis/qvalueaxis.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/valueaxis/qvalueaxis.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/valueaxis/qvalueaxis.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,7 +4,11 @@ #ifndef QVALUEAXIS_H #define QVALUEAXIS_H -#include <QtGraphs/QAbstractAxis> +#if 0 +# pragma qt_class(QValueAxis) +#endif + +#include <QtGraphs/qabstractaxis.h> #include <QtGraphs/qgraphsglobal.h> #include <QtQml/QQmlEngine> @@ -12,7 +16,7 @@ class QValueAxisPrivate; -class Q_GRAPHS_EXPORT QValueAxis : public QAbstractAxis +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QValueAxis : public QAbstractAxis { Q_OBJECT Q_PROPERTY(qreal min READ min WRITE setMin NOTIFY minChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/valueaxis/qvalueaxis_p.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/valueaxis/qvalueaxis_p.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/valueaxis/qvalueaxis_p.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/valueaxis/qvalueaxis_p.h 2024-06-08 03:28:33.000000000 +0200 @@ -13,7 +13,7 @@ #ifndef QVALUEAXIS_P_H #define QVALUEAXIS_P_H -#include <QtGraphs/QValueAxis> +#include <QtGraphs/qvalueaxis.h> #include <private/qabstractaxis_p.h> QT_BEGIN_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/barchart/qabstractbarseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/barchart/qabstractbarseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/barchart/qabstractbarseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/barchart/qabstractbarseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QABSTRACTBARSERIES_H #define QABSTRACTBARSERIES_H +#if 0 +# pragma qt_class(QAbstractBarSeries) +#endif + #include <QtGraphs/qabstractseries.h> #include <QtCore/QStringList> #include <QtQml/QQmlEngine> @@ -15,7 +19,7 @@ class QAbstractBarSeriesPrivate; // Container for series -class Q_GRAPHS_EXPORT QAbstractBarSeries : public QAbstractSeries +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QAbstractBarSeries : public QAbstractSeries { Q_OBJECT Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth NOTIFY barWidthChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/barchart/qbarseries.cpp new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/barchart/qbarseries.cpp --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/barchart/qbarseries.cpp 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/barchart/qbarseries.cpp 2024-06-08 03:28:33.000000000 +0200 @@ -1,9 +1,9 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#include <QtGraphs/QBarCategoryAxis> -#include <QtGraphs/QValueAxis> +#include <QtGraphs/qbarcategoryaxis.h> #include <QtGraphs/qbarseries.h> +#include <QtGraphs/qvalueaxis.h> #include <private/qbarseries_p.h> #include <private/qgraphsview_p.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/barchart/qbarseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/barchart/qbarseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/barchart/qbarseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/barchart/qbarseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QBARSERIES_H #define QBARSERIES_H +#if 0 +# pragma qt_class(QBarSeries) +#endif + #include <QtGraphs/qabstractbarseries.h> #include <QtGraphs/qabstractaxis.h> #include <QtGraphs/qgraphsglobal.h> @@ -12,7 +16,7 @@ class QBarSeriesPrivate; -class Q_GRAPHS_EXPORT QBarSeries : public QAbstractBarSeries +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QBarSeries : public QAbstractBarSeries { Q_OBJECT Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/barchart/qbarset.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/barchart/qbarset.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/barchart/qbarset.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/barchart/qbarset.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QBARSET_H #define QBARSET_H +#if 0 +# pragma qt_class(QBarSet) +#endif + #include <QtCore/qobject.h> #include <QtGraphs/qgraphsglobal.h> #include <QtGui/qbrush.h> @@ -15,7 +19,7 @@ class QBarSetPrivate; -class Q_GRAPHS_EXPORT QBarSet : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QBarSet : public QObject { Q_OBJECT Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/linechart/qlineseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/linechart/qlineseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/linechart/qlineseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/linechart/qlineseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QLINESERIES_H #define QLINESERIES_H +#if 0 +# pragma qt_class(QLineSeries) +#endif + #include <QtGraphs/qxyseries.h> #include <QtGraphs/qgraphsglobal.h> @@ -11,7 +15,7 @@ class QLineSeriesPrivate; -class Q_GRAPHS_EXPORT QLineSeries : public QXYSeries +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QLineSeries : public QXYSeries { Q_OBJECT Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/qabstractseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/qabstractseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/qabstractseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/qabstractseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,20 +4,24 @@ #ifndef QABSTRACTSERIES_H #define QABSTRACTSERIES_H -#include <QtGraphs/QAbstractAxis> +#if 0 +# pragma qt_class(QAbstractSeries) +#endif + #include <QtCore/QObject> +#include <QtGraphs/qabstractaxis.h> +#include <QtGraphs/qgraphsglobal.h> +#include <QtGraphs/qseriestheme.h> #include <QtGui/QPen> -#include <QtQml/QQmlParserStatus> #include <QtQml/QQmlListProperty> -#include <QtGraphs/qseriestheme.h> -#include <QtGraphs/qgraphsglobal.h> +#include <QtQml/QQmlParserStatus> QT_BEGIN_NAMESPACE class QAbstractSeriesPrivate; class QGraphsView; -class Q_GRAPHS_EXPORT QAbstractSeries : public QObject, public QQmlParserStatus +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QAbstractSeries : public QObject, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/qsgrenderer/axisrenderer.cpp new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/qsgrenderer/axisrenderer.cpp --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/qsgrenderer/axisrenderer.cpp 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/qsgrenderer/axisrenderer.cpp 2024-06-08 03:28:33.000000000 +0200 @@ -1,12 +1,12 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#include <QtGraphs/qbarcategoryaxis.h> +#include <QtGraphs/qgraphtheme.h> #include <private/axisrenderer_p.h> #include <private/qabstractaxis_p.h> #include <private/qgraphsview_p.h> -#include <QtGraphs/QBarCategoryAxis> #include <private/qvalueaxis_p.h> -#include <QtGraphs/qgraphtheme.h> QT_BEGIN_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/scatterchart/qscatterseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/scatterchart/qscatterseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/scatterchart/qscatterseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/scatterchart/qscatterseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QSCATTERSERIES_H #define QSCATTERSERIES_H +#if 0 +# pragma qt_class(QScatterSeries) +#endif + #include <QtGraphs/qxyseries.h> #include <QtGraphs/qgraphsglobal.h> @@ -11,7 +15,7 @@ class QScatterSeriesPrivate; -class Q_GRAPHS_EXPORT QScatterSeries : public QXYSeries +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QScatterSeries : public QXYSeries { Q_OBJECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/themes/qgraphtheme.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/themes/qgraphtheme.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/themes/qgraphtheme.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/themes/qgraphtheme.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef GRAPHTHEME_H #define GRAPHTHEME_H +#if 0 +# pragma qt_class(QGraphTheme) +#endif + #include <QtGui/QColor> #include <QtGui/QFont> #include <QtCore/QObject> @@ -13,7 +17,7 @@ QT_BEGIN_NAMESPACE -class Q_GRAPHS_EXPORT QGraphTheme : public QObject, public QQmlParserStatus +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QGraphTheme : public QObject, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/themes/qseriestheme.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/themes/qseriestheme.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/themes/qseriestheme.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/themes/qseriestheme.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef SERIESTHEME_H #define SERIESTHEME_H +#if 0 +# pragma qt_class(QSeriesTheme) +#endif + #include <QtGui/QColor> #include <QtGui/QFont> #include <QtCore/QObject> @@ -13,7 +17,7 @@ QT_BEGIN_NAMESPACE -class Q_GRAPHS_EXPORT QSeriesTheme : public QObject, public QQmlParserStatus +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QSeriesTheme : public QObject, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/xychart/qxyseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/xychart/qxyseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/xychart/qxyseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/xychart/qxyseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QXYSERIES_H #define QXYSERIES_H +#if 0 +# pragma qt_class(QXYSeries) +#endif + #include <QtGraphs/qabstractseries.h> #include <QtGraphs/qgraphsglobal.h> @@ -16,7 +20,7 @@ class QXYSeriesPrivate; class QXYModelMapper; -class Q_GRAPHS_EXPORT QXYSeries : public QAbstractSeries +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QXYSeries : public QAbstractSeries { Q_OBJECT Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qabstract3daxis.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qabstract3daxis.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qabstract3daxis.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qabstract3daxis.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QABSTRACT3DAXIS_H #define QABSTRACT3DAXIS_H +#if 0 +# pragma qt_class(QAbstract3DAxis) +#endif + #include <QtCore/QObject> #include <QtCore/QScopedPointer> #include <QtCore/QStringList> @@ -14,7 +18,7 @@ class QAbstract3DAxisPrivate; -class Q_GRAPHS_EXPORT QAbstract3DAxis : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QAbstract3DAxis : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QAbstract3DAxis) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qcategory3daxis.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qcategory3daxis.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qcategory3daxis.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qcategory3daxis.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,13 +4,17 @@ #ifndef QCATEGORY3DAXIS_H #define QCATEGORY3DAXIS_H +#if 0 +# pragma qt_class(QCategory3DAxis) +#endif + #include <QtGraphs/qabstract3daxis.h> QT_BEGIN_NAMESPACE class QCategory3DAxisPrivate; -class Q_GRAPHS_EXPORT QCategory3DAxis : public QAbstract3DAxis +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QCategory3DAxis : public QAbstract3DAxis { Q_OBJECT Q_DECLARE_PRIVATE(QCategory3DAxis) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qlogvalue3daxisformatter.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qlogvalue3daxisformatter.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qlogvalue3daxisformatter.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qlogvalue3daxisformatter.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,13 +4,17 @@ #ifndef QLOGVALUE3DAXISFORMATTER_H #define QLOGVALUE3DAXISFORMATTER_H +#if 0 +# pragma qt_class(QLogValue3DAxisFormatter) +#endif + #include <QtGraphs/qvalue3daxisformatter.h> QT_BEGIN_NAMESPACE class QLogValue3DAxisFormatterPrivate; -class Q_GRAPHS_EXPORT QLogValue3DAxisFormatter : public QValue3DAxisFormatter +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QLogValue3DAxisFormatter : public QValue3DAxisFormatter { Q_OBJECT Q_DECLARE_PRIVATE(QLogValue3DAxisFormatter) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qvalue3daxis.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qvalue3daxis.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qvalue3daxis.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qvalue3daxis.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QVALUE3DAXIS_H #define QVALUE3DAXIS_H +#if 0 +# pragma qt_class(QValue3DAxis) +#endif + #include <QtGraphs/qabstract3daxis.h> #include <QtGraphs/qvalue3daxisformatter.h> @@ -11,7 +15,7 @@ class QValue3DAxisPrivate; -class Q_GRAPHS_EXPORT QValue3DAxis : public QAbstract3DAxis +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QValue3DAxis : public QAbstract3DAxis { Q_OBJECT Q_DECLARE_PRIVATE(QValue3DAxis) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qvalue3daxisformatter.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qvalue3daxisformatter.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qvalue3daxisformatter.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qvalue3daxisformatter.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QVALUE3DAXISFORMATTER_H #define QVALUE3DAXISFORMATTER_H +#if 0 +# pragma qt_class(QValue3DAxisFormatter) +#endif + #include <QtCore/QList> #include <QtCore/QLocale> #include <QtCore/QObject> @@ -16,7 +20,7 @@ class QValue3DAxisFormatterPrivate; class QValue3DAxis; -class Q_GRAPHS_EXPORT QValue3DAxisFormatter : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QValue3DAxisFormatter : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QValue3DAxisFormatter) @@ -63,7 +67,6 @@ private: Q_DISABLE_COPY(QValue3DAxisFormatter) - friend class QValue3DAxisFormatterPrivate; friend class QValue3DAxis; friend class QValue3DAxisPrivate; friend class QBar3DSeriesPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qabstract3dseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qabstract3dseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qabstract3dseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qabstract3dseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QABSTRACT3DSERIES_H #define QABSTRACT3DSERIES_H +#if 0 +# pragma qt_class(QAbstract3DSeries) +#endif + #include <QtCore/QObject> #include <QtCore/QScopedPointer> #include <QtCore/QString> @@ -15,7 +19,7 @@ class QAbstract3DSeriesPrivate; -class Q_GRAPHS_EXPORT QAbstract3DSeries : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QAbstract3DSeries : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QAbstract3DSeries) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qabstractdataproxy.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qabstractdataproxy.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qabstractdataproxy.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qabstractdataproxy.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QABSTRACTDATAPROXY_H #define QABSTRACTDATAPROXY_H +#if 0 +# pragma qt_class(QAbstractDataProxy) +#endif + #include <QtCore/QObject> #include <QtCore/QScopedPointer> #include <QtGraphs/qgraphsglobal.h> @@ -12,7 +16,7 @@ class QAbstractDataProxyPrivate; -class Q_GRAPHS_EXPORT QAbstractDataProxy : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QAbstractDataProxy : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QAbstractDataProxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qbar3dseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qbar3dseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qbar3dseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qbar3dseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QBAR3DSERIES_H #define QBAR3DSERIES_H +#if 0 +# pragma qt_class(QBar3DSeries) +#endif + #include <QtCore/QPoint> #include <QtGraphs/qabstract3dseries.h> #include <QtGraphs/qbardataproxy.h> @@ -12,7 +16,7 @@ class QBar3DSeriesPrivate; -class Q_GRAPHS_EXPORT QBar3DSeries : public QAbstract3DSeries +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QBar3DSeries : public QAbstract3DSeries { Q_OBJECT Q_DECLARE_PRIVATE(QBar3DSeries) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qbardataproxy.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qbardataproxy.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qbardataproxy.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qbardataproxy.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QBARDATAPROXY_H #define QBARDATAPROXY_H +#if 0 +# pragma qt_class(QBarDataProxy) +#endif + #include <QtCore/QList> #include <QtCore/QStringList> #include <QtGraphs/qabstractdataproxy.h> @@ -19,7 +23,7 @@ using QBarDataRow = QList<QBarDataItem>; using QBarDataArray = QList<QBarDataRow>; -class Q_GRAPHS_EXPORT QBarDataProxy : public QAbstractDataProxy +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QBarDataProxy : public QAbstractDataProxy { Q_OBJECT Q_DECLARE_PRIVATE(QBarDataProxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qcustom3ditem.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qcustom3ditem.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qcustom3ditem.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qcustom3ditem.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QCUSTOM3DITEM_H #define QCUSTOM3DITEM_H +#if 0 +# pragma qt_class(QCustom3DItem) +#endif + #include <QtCore/QObject> #include <QtGraphs/qgraphsglobal.h> #include <QtGui/QImage> @@ -14,7 +18,7 @@ class QCustom3DItemPrivate; -class Q_GRAPHS_EXPORT QCustom3DItem : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QCustom3DItem : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QCustom3DItem) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qcustom3dlabel.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qcustom3dlabel.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qcustom3dlabel.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qcustom3dlabel.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,7 +4,11 @@ #ifndef QCUSTOMLABELITEM_H #define QCUSTOMLABELITEM_H -#include <QtGraphs/QCustom3DItem> +#if 0 +# pragma qt_class(QCustom3DLabel) +#endif + +#include <QtGraphs/qcustom3ditem.h> #include <QtGraphs/qgraphsglobal.h> #include <QtGui/QColor> #include <QtGui/QFont> @@ -15,7 +19,7 @@ class QCustom3DLabelPrivate; -class Q_GRAPHS_EXPORT QCustom3DLabel : public QCustom3DItem +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QCustom3DLabel : public QCustom3DItem { Q_OBJECT Q_DECLARE_PRIVATE(QCustom3DLabel) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qcustom3dvolume.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qcustom3dvolume.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qcustom3dvolume.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qcustom3dvolume.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,7 +4,11 @@ #ifndef QCUSTOM3DVOLUME_H #define QCUSTOM3DVOLUME_H -#include <QtGraphs/QCustom3DItem> +#if 0 +# pragma qt_class(QCustom3DVolume) +#endif + +#include <QtGraphs/qcustom3ditem.h> #include <QtGraphs/qgraphsglobal.h> #include <QtGui/QColor> #include <QtGui/QImage> @@ -13,7 +17,7 @@ class QCustom3DVolumePrivate; -class Q_GRAPHS_EXPORT QCustom3DVolume : public QCustom3DItem +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QCustom3DVolume : public QCustom3DItem { Q_OBJECT Q_DECLARE_PRIVATE(QCustom3DVolume) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qheightmapsurfacedataproxy.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qheightmapsurfacedataproxy.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qheightmapsurfacedataproxy.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qheightmapsurfacedataproxy.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QHEIGHTMAPSURFACEDATAPROXY_H #define QHEIGHTMAPSURFACEDATAPROXY_H +#if 0 +# pragma qt_class(QHeightMapSurfaceDataProxy) +#endif + #include <QtCore/QString> #include <QtGraphs/qsurfacedataproxy.h> #include <QtGui/QImage> @@ -12,7 +16,7 @@ class QHeightMapSurfaceDataProxyPrivate; -class Q_GRAPHS_EXPORT QHeightMapSurfaceDataProxy : public QSurfaceDataProxy +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QHeightMapSurfaceDataProxy : public QSurfaceDataProxy { Q_OBJECT Q_DECLARE_PRIVATE(QHeightMapSurfaceDataProxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qitemmodelbardataproxy.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qitemmodelbardataproxy.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qitemmodelbardataproxy.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qitemmodelbardataproxy.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QITEMMODELBARDATAPROXY_H #define QITEMMODELBARDATAPROXY_H +#if 0 +# pragma qt_class(QItemModelBarDataProxy) +#endif + #include <QtCore/QAbstractItemModel> #include <QtCore/QRegularExpression> #include <QtGraphs/qbardataproxy.h> @@ -12,7 +16,7 @@ class QItemModelBarDataProxyPrivate; -class Q_GRAPHS_EXPORT QItemModelBarDataProxy : public QBarDataProxy +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QItemModelBarDataProxy : public QBarDataProxy { Q_OBJECT Q_DECLARE_PRIVATE(QItemModelBarDataProxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qitemmodelscatterdataproxy.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qitemmodelscatterdataproxy.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qitemmodelscatterdataproxy.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qitemmodelscatterdataproxy.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QITEMMODELSCATTERDATAPROXY_H #define QITEMMODELSCATTERDATAPROXY_H +#if 0 +# pragma qt_class(QItemModelScatterDataProxy) +#endif + #include <QtCore/QAbstractItemModel> #include <QtCore/QRegularExpression> #include <QtCore/QString> @@ -13,7 +17,7 @@ class QItemModelScatterDataProxyPrivate; -class Q_GRAPHS_EXPORT QItemModelScatterDataProxy : public QScatterDataProxy +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QItemModelScatterDataProxy : public QScatterDataProxy { Q_OBJECT Q_DECLARE_PRIVATE(QItemModelScatterDataProxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qitemmodelsurfacedataproxy.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qitemmodelsurfacedataproxy.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qitemmodelsurfacedataproxy.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qitemmodelsurfacedataproxy.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QITEMMODELSURFACEDATAPROXY_H #define QITEMMODELSURFACEDATAPROXY_H +#if 0 +# pragma qt_class(QItemModelSurfaceDataProxy) +#endif + #include <QtCore/QAbstractItemModel> #include <QtCore/QRegularExpression> #include <QtCore/QStringList> @@ -13,7 +17,7 @@ class QItemModelSurfaceDataProxyPrivate; -class Q_GRAPHS_EXPORT QItemModelSurfaceDataProxy : public QSurfaceDataProxy +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QItemModelSurfaceDataProxy : public QSurfaceDataProxy { Q_OBJECT Q_DECLARE_PRIVATE(QItemModelSurfaceDataProxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qscatter3dseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qscatter3dseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qscatter3dseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qscatter3dseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QSCATTER3DSERIES_H #define QSCATTER3DSERIES_H +#if 0 +# pragma qt_class(QScatter3DSeries) +#endif + #include <QtGraphs/qabstract3dseries.h> #include <QtGraphs/qscatterdataproxy.h> @@ -11,7 +15,7 @@ class QScatter3DSeriesPrivate; -class Q_GRAPHS_EXPORT QScatter3DSeries : public QAbstract3DSeries +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QScatter3DSeries : public QAbstract3DSeries { Q_OBJECT Q_DECLARE_PRIVATE(QScatter3DSeries) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qscatterdataproxy.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qscatterdataproxy.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qscatterdataproxy.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qscatterdataproxy.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QSCATTERDATAPROXY_H #define QSCATTERDATAPROXY_H +#if 0 +# pragma qt_class(QScatterDataProxy) +#endif + #include <QtGraphs/qabstractdataproxy.h> #include <QtGraphs/qscatterdataitem.h> @@ -16,7 +20,7 @@ using QScatterDataArray = QList<QScatterDataItem>; -class Q_GRAPHS_EXPORT QScatterDataProxy : public QAbstractDataProxy +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QScatterDataProxy : public QAbstractDataProxy { Q_OBJECT Q_DECLARE_PRIVATE(QScatterDataProxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qsurface3dseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qsurface3dseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qsurface3dseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qsurface3dseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QSURFACE3DSERIES_H #define QSURFACE3DSERIES_H +#if 0 +# pragma qt_class(QSurface3DSeries) +#endif + #include <QtGraphs/qabstract3dseries.h> #include <QtGraphs/qsurfacedataproxy.h> @@ -11,7 +15,7 @@ class QSurface3DSeriesPrivate; -class Q_GRAPHS_EXPORT QSurface3DSeries : public QAbstract3DSeries +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QSurface3DSeries : public QAbstract3DSeries { Q_OBJECT Q_DECLARE_PRIVATE(QSurface3DSeries) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qsurfacedataproxy.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qsurfacedataproxy.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qsurfacedataproxy.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qsurfacedataproxy.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QSURFACEDATAPROXY_H #define QSURFACEDATAPROXY_H +#if 0 +# pragma qt_class(QSurfaceDataProxy) +#endif + #include <QtGraphs/qabstractdataproxy.h> #include <QtGraphs/qsurfacedataitem.h> @@ -17,7 +21,7 @@ using QSurfaceDataRow = QList<QSurfaceDataItem>; using QSurfaceDataArray = QList<QSurfaceDataRow>; -class Q_GRAPHS_EXPORT QSurfaceDataProxy : public QAbstractDataProxy +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QSurfaceDataProxy : public QAbstractDataProxy { Q_OBJECT Q_DECLARE_PRIVATE(QSurfaceDataProxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/q3dbars.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/q3dbars.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/q3dbars.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/q3dbars.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef Q3DBARS_H #define Q3DBARS_H +#if 0 +# pragma qt_class(Q3DBars) +#endif + #include <QtGraphs/qabstract3dgraph.h> #include <QtGraphs/qbar3dseries.h> #include <QtGraphs/qcategory3daxis.h> @@ -13,7 +17,7 @@ class QQuickGraphsBars; -class Q_GRAPHS_EXPORT Q3DBars : public QAbstract3DGraph +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT Q3DBars : public QAbstract3DGraph { Q_OBJECT Q_PROPERTY(bool multiSeriesUniform READ isMultiSeriesUniform WRITE setMultiSeriesUniform NOTIFY diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/q3dscatter.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/q3dscatter.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/q3dscatter.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/q3dscatter.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef Q3DSCATTER_H #define Q3DSCATTER_H +#if 0 +# pragma qt_class(Q3DScatter) +#endif + #include <QtGraphs/qabstract3dgraph.h> #include <QtGraphs/qscatter3dseries.h> #include <QtGraphs/qvalue3daxis.h> @@ -12,7 +16,7 @@ class QQuickGraphsScatter; -class Q_GRAPHS_EXPORT Q3DScatter : public QAbstract3DGraph +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT Q3DScatter : public QAbstract3DGraph { Q_OBJECT Q_PROPERTY(QValue3DAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/q3dscene.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/q3dscene.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/q3dscene.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/q3dscene.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef Q3DSCENE_H #define Q3DSCENE_H +#if 0 +# pragma qt_class(Q3DScene) +#endif + #include <QtCore/QObject> #include <QtCore/QRect> #include <QtGraphs/qgraphsglobal.h> @@ -13,7 +17,7 @@ class Q3DScenePrivate; -class Q_GRAPHS_EXPORT Q3DScene : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT Q3DScene : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(Q3DScene) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/q3dsurface.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/q3dsurface.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/q3dsurface.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/q3dsurface.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef Q3DSURFACE_H #define Q3DSURFACE_H +#if 0 +# pragma qt_class(Q3DSurface) +#endif + #include <QtGraphs/qabstract3dgraph.h> #include <QtGraphs/qsurface3dseries.h> #include <QtGraphs/qvalue3daxis.h> @@ -12,7 +16,7 @@ class QQuickGraphsSurface; -class Q_GRAPHS_EXPORT Q3DSurface : public QAbstract3DGraph +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT Q3DSurface : public QAbstract3DGraph { Q_OBJECT Q_PROPERTY(QValue3DAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/qabstract3dgraph.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/qabstract3dgraph.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/qabstract3dgraph.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/qabstract3dgraph.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QABSTRACT3DGRAPH_H #define QABSTRACT3DGRAPH_H +#if 0 +# pragma qt_class(QAbstract3DGraph) +#endif + #include <QtCore/qlocale.h> #include <QtGraphs/q3dscene.h> #include <QtGraphs/q3dtheme.h> @@ -19,7 +23,7 @@ class QAbstract3DSeries; class QQuickGraphsItem; -class Q_GRAPHS_EXPORT QAbstract3DGraph : public QQuickWidget +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QAbstract3DGraph : public QQuickWidget { Q_OBJECT Q_CLASSINFO("RegisterEnumClassesUnscoped", "false") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/input/q3dinputhandler.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/input/q3dinputhandler.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/input/q3dinputhandler.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/input/q3dinputhandler.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,13 +4,17 @@ #ifndef Q3DINPUTHANDLER_H #define Q3DINPUTHANDLER_H +#if 0 +# pragma qt_class(Q3DInputHandler) +#endif + #include <QtGraphs/qabstract3dinputhandler.h> QT_BEGIN_NAMESPACE class Q3DInputHandlerPrivate; -class Q_GRAPHS_EXPORT Q3DInputHandler : public QAbstract3DInputHandler +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT Q3DInputHandler : public QAbstract3DInputHandler { Q_OBJECT Q_DECLARE_PRIVATE(Q3DInputHandler) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/input/qabstract3dinputhandler.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/input/qabstract3dinputhandler.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/input/qabstract3dinputhandler.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/input/qabstract3dinputhandler.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QABSTRACT3DINPUTHANDLER_H #define QABSTRACT3DINPUTHANDLER_H +#if 0 +# pragma qt_class(QAbstract3DInputHandler) +#endif + #include <QtCore/QObject> #include <QtCore/QPoint> #include <QtGraphs/q3dscene.h> @@ -17,7 +21,7 @@ class QAbstract3DInputHandlerPrivate; class QQuickGraphsItem; -class Q_GRAPHS_EXPORT QAbstract3DInputHandler : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QAbstract3DInputHandler : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QAbstract3DInputHandler) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/input/qtouch3dinputhandler.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/input/qtouch3dinputhandler.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/input/qtouch3dinputhandler.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/input/qtouch3dinputhandler.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,13 +4,17 @@ #ifndef QTOUCH3DINPUTHANDLER_H #define QTOUCH3DINPUTHANDLER_H +#if 0 +# pragma qt_class(QTouch3DInputHandler) +#endif + #include <QtGraphs/q3dinputhandler.h> QT_BEGIN_NAMESPACE class QTouch3DInputHandlerPrivate; -class Q_GRAPHS_EXPORT QTouch3DInputHandler : public Q3DInputHandler +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QTouch3DInputHandler : public Q3DInputHandler { Q_DECLARE_PRIVATE(QTouch3DInputHandler) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/qml/qquickgraphsbars.cpp new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/qml/qquickgraphsbars.cpp --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/qml/qquickgraphsbars.cpp 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/qml/qquickgraphsbars.cpp 2024-06-08 03:28:33.000000000 +0200 @@ -44,24 +44,6 @@ void QQuickGraphsBars::setRowAxis(QCategory3DAxis *axis) { QQuickGraphsItem::setAxisZ(axis); - handleDataRowLabelsChanged(); - // labelsChanged and rangeChanged signals are required to update the row and - // column numbers. The same situation exists in the barscontroller. (see - // setAxisZ and setAxisHelper) A better implementation may apply once - // controllers are removed - QObject::connect(axis, - &QAbstract3DAxis::labelsChanged, - this, - &QQuickGraphsBars::handleRowCountChanged); - QObject::connect(axis, - &QAbstract3DAxis::rangeChanged, - this, - &QQuickGraphsBars::handleRowCountChanged); - QObject::connect(axis, - &QCategory3DAxis::rowLabelsChanged, - this, - &QQuickGraphsBars::handleDataRowLabelsChanged); - handleRowCountChanged(); } QValue3DAxis *QQuickGraphsBars::valueAxis() const @@ -71,7 +53,7 @@ void QQuickGraphsBars::setValueAxis(QValue3DAxis *axis) { - setAxisY(axis); + QQuickGraphsItem::setAxisY(axis); } QCategory3DAxis *QQuickGraphsBars::columnAxis() const @@ -82,20 +64,6 @@ void QQuickGraphsBars::setColumnAxis(QCategory3DAxis *axis) { QQuickGraphsItem::setAxisX(axis); - handleDataColumnLabelsChanged(); - QObject::connect(axis, - &QAbstract3DAxis::labelsChanged, - this, - &QQuickGraphsBars::handleColCountChanged); - QObject::connect(axis, - &QAbstract3DAxis::rangeChanged, - this, - &QQuickGraphsBars::handleColCountChanged); - QObject::connect(axis, - &QCategory3DAxis::columnLabelsChanged, - this, - &QQuickGraphsBars::handleDataColumnLabelsChanged); - handleColCountChanged(); } void QQuickGraphsBars::setMultiSeriesScaling(bool uniform) @@ -275,8 +243,6 @@ resetClickedStatus(); series->setParent(this); // Reparent as removing will leave series parentless disconnectSeries(series); - handleRowCountChanged(); - handleColCountChanged(); } void QQuickGraphsBars::insertSeries(int index, QBar3DSeries *series) @@ -301,9 +267,6 @@ if (!oldSize) emit primarySeriesChanged(m_primarySeries); } - - handleRowCountChanged(); - handleColCountChanged(); } void QQuickGraphsBars::clearSelection() @@ -327,8 +290,6 @@ handleDataColumnLabelsChanged(); emit primarySeriesChanged(m_primarySeries); } - handleRowCountChanged(); - handleColCountChanged(); } QBar3DSeries *QQuickGraphsBars::primarySeries() const @@ -890,26 +851,6 @@ m_smooth = enable; } -void QQuickGraphsBars::handleRowCountChanged() -{ - QCategory3DAxis *categoryAxisZ = static_cast<QCategory3DAxis *>(axisZ()); - if (repeaterZ()) { - updateParameters(); - repeaterZ()->model().clear(); - repeaterZ()->setModel(categoryAxisZ->labels().size()); - } -} - -void QQuickGraphsBars::handleColCountChanged() -{ - QCategory3DAxis *categoryAxisX = static_cast<QCategory3DAxis *>(axisX()); - if (repeaterX()) { - updateParameters(); - repeaterX()->model().clear(); - repeaterX()->setModel(categoryAxisX->labels().size()); - } -} - void QQuickGraphsBars::handleCameraRotationChanged() { updateLabels(); @@ -1078,6 +1019,11 @@ subList = m_primarySeries->dataProxy()->rowLabels().mid(min, count); static_cast<QCategory3DAxis *>(m_axisZ)->d_func()->setDataLabels(subList); } + + if (repeaterZ()) { + updateParameters(); + repeaterZ()->setModel(m_axisZ->labels().size()); + } } void QQuickGraphsBars::handleDataColumnLabelsChanged() @@ -1094,6 +1040,11 @@ } static_cast<QCategory3DAxis *>(m_axisX)->d_func()->setDataLabels(subList); } + + if (repeaterX()) { + updateParameters(); + repeaterX()->setModel(m_axisX->labels().size()); + } } void QQuickGraphsBars::handleRowColorsChanged() @@ -1115,14 +1066,6 @@ &QBar3DSeries::meshSmoothChanged, this, &QQuickGraphsBars::handleMeshSmoothChanged); - QObject::connect(series->dataProxy(), - &QBarDataProxy::colCountChanged, - this, - &QQuickGraphsBars::handleColCountChanged); - QObject::connect(series->dataProxy(), - &QBarDataProxy::rowCountChanged, - this, - &QQuickGraphsBars::handleRowCountChanged); QObject::connect(series, &QBar3DSeries::rowColorsChanged, this, @@ -2155,9 +2098,9 @@ QQuickGraphsItem::handleLabelCountChanged(repeater); if (repeater == repeaterX()) - handleColCountChanged(); + handleDataColumnLabelsChanged(); if (repeater == repeaterZ()) - handleRowCountChanged(); + handleDataRowLabelsChanged(); } void QQuickGraphsBars::removeSlicedBarModels() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/qml/qquickgraphsbars_p.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/qml/qquickgraphsbars_p.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/qml/qquickgraphsbars_p.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/qml/qquickgraphsbars_p.h 2024-06-08 03:28:33.000000000 +0200 @@ -180,8 +180,6 @@ void handleAxisZChanged(QAbstract3DAxis *axis) override; void handleSeriesMeshChanged(QAbstract3DSeries::Mesh mesh); void handleMeshSmoothChanged(bool enable); - void handleRowCountChanged(); - void handleColCountChanged(); void handleCameraRotationChanged(); void handleArrayReset(); void handleRowsAdded(int startIndex, int count); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/qml/qquickgraphsitem.cpp new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/qml/qquickgraphsitem.cpp --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/qml/qquickgraphsitem.cpp 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/qml/qquickgraphsitem.cpp 2024-06-08 03:28:33.000000000 +0200 @@ -2388,7 +2388,7 @@ float QQuickGraphsItem::fontScaleFactor(float pointSize) { - return m_fontScaleFactorA * pointSize + m_fontScaleFactorB; + return 0.00007f + pointSize / (500000.0f * pointSize); } float QQuickGraphsItem::labelAdjustment(float width) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/qml/qquickgraphsitem_p.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/qml/qquickgraphsitem_p.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/qml/qquickgraphsitem_p.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/qml/qquickgraphsitem_p.h 2024-06-08 03:28:33.000000000 +0200 @@ -780,9 +780,6 @@ float m_lineWidthScaleFactor = 0.0001f; float m_lineLengthScaleFactor = 0.02f; - float m_fontScaleFactorA = -1.130435e-06f; - float m_fontScaleFactorB = 0.000115652f; - float m_labelMargin = .1f; bool m_sliceEnabled = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/theme/q3dtheme.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/theme/q3dtheme.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/theme/q3dtheme.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/theme/q3dtheme.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef Q3DTHEME_H #define Q3DTHEME_H +#if 0 +# pragma qt_class(Q3DTheme) +#endif + #include <QtCore/QObject> #include <QtGraphs/qgraphsglobal.h> #include <QtGui/QColor> @@ -19,7 +23,7 @@ class QQuickGraphsColor; class QQuickGradient; -class Q_GRAPHS_EXPORT Q3DTheme : public QObject, public QQmlParserStatus +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT Q3DTheme : public QObject, public QQmlParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(Q3DTheme) @@ -164,7 +168,7 @@ private: QQmlListProperty<QObject> themeChildren(); static void appendThemeChildren(QQmlListProperty<QObject> *list, QObject *element); - + QQmlListProperty<QQuickGraphsColor> baseColorsQML(); static void appendBaseColorsFunc(QQmlListProperty<QQuickGraphsColor> *list, QQuickGraphsColor *color); @@ -184,7 +188,7 @@ void setMultiHighlightGradient(QJSValue gradient); QJSValue multiHighlightGradientQML() const; - + void addColor(QQuickGraphsColor *color); QList<QQuickGraphsColor *> colorList(); void clearColors();
