diff -Nru qtcharts-opensource-src-5.12.5/debian/changelog qtcharts-opensource-src-5.9.5/debian/changelog --- qtcharts-opensource-src-5.12.5/debian/changelog 2019-10-22 18:06:25.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/debian/changelog 2019-11-20 17:07:26.000000000 +0000 @@ -1,116 +1,26 @@ -qtcharts-opensource-src (5.12.5-2) unstable; urgency=medium +qtcharts-opensource-src (5.9.5-0ubuntu1~16.04.sav0) xenial; urgency=medium - * Run tests with QSG_NO_DEPTH_BUFFER=1 to workaround Qt Quick crash on - mips64el (see bug #868745 for details). + * Backport to Xenial - -- Dmitry Shachnev Tue, 22 Oct 2019 21:06:25 +0300 + -- Rob Savoury Wed, 20 Nov 2019 09:07:26 -0800 -qtcharts-opensource-src (5.12.5-1) unstable; urgency=medium +qtcharts-opensource-src (5.9.5-0ubuntu1) bionic; urgency=medium * New upstream release. - * Bump Qt build-dependencies to 5.12.5. - * Bump Standards-Version to 4.4.1, no changes needed. - * Upload to unstable. - -- Dmitry Shachnev Mon, 21 Oct 2019 12:04:09 +0300 + -- Simon Quigley Sat, 14 Apr 2018 14:09:17 -0500 -qtcharts-opensource-src (5.12.4-1) experimental; urgency=medium - - [ Scarlett Moore ] - * Update packaging to use doc-base as per policy 9.10. - - [ Dmitry Shachnev ] - * New upstream release. - * Bump Qt build-dependencies to 5.12.4. - * Simplify debian/rules by using a debian/not-installed file. - * Add Build-Depends-Package field to debian/libqt5charts5.symbols. - * Make the tests results fatal. Run them with QTEST_ENVIRONMENT=ci, - to make the failing tst_QBarSeries::mousehovered test blacklisted. - * Add support for nocheck build profile. - - -- Dmitry Shachnev Fri, 28 Jun 2019 21:40:04 +0300 - -qtcharts-opensource-src (5.12.2-1) experimental; urgency=medium - - * New upstream release. - * Bump Qt build-dependencies to 5.12.2. - * Update debian/libqt5charts5.symbols from the current build log. - - -- Dmitry Shachnev Thu, 28 Mar 2019 00:27:34 +0300 - -qtcharts-opensource-src (5.11.3-2) unstable; urgency=medium - - [ Simon Quigley ] - * Change my email to tsimonq2@debian.org now that I am a Debian Developer. - * Bump Standards-version to 4.3.0, no changes needed. - - [ Lisandro Damián Nicanor Pérez Meyer ] - * Upload to unstable. - - -- Lisandro Damián Nicanor Pérez Meyer Wed, 26 Dec 2018 16:50:27 -0300 - -qtcharts-opensource-src (5.11.3-1) experimental; urgency=medium - - * New upstream release. - - Bump Qt build dependencies. - - -- Lisandro Damián Nicanor Pérez Meyer Mon, 17 Dec 2018 19:36:44 -0300 - -qtcharts-opensource-src (5.11.2-2) unstable; urgency=medium - - * Update debian/copyright. - * Add qtbase5-doc-html to Build-Depends-Indep. - * Drop explicit build-dependency on libqt5sql5-sqlite. - * Use https for Homepage URL. - * Upload to unstable. - - -- Dmitry Shachnev Wed, 17 Oct 2018 00:22:05 +0300 - -qtcharts-opensource-src (5.11.2-1) experimental; urgency=medium +qtcharts-opensource-src (5.9.4-0ubuntu1) bionic; urgency=medium * New upstream release. - * Bump Standards-version to 4.2.1, no changes needed. - * Bump Qt build dependencies to 5.11.2. - * Bump the copyright year for my contributions. - - -- Simon Quigley Sun, 07 Oct 2018 16:50:30 -0500 - -qtcharts-opensource-src (5.11.1-2) unstable; urgency=medium - - * Upload to Sid. - - -- Simon Quigley Wed, 25 Jul 2018 04:49:30 -0500 - -qtcharts-opensource-src (5.11.1-1) experimental; urgency=medium - - * New upstream release. - * Bump Standards-version to 4.1.4, no changes needed. - * Bump debhelper compat to 11, no changes needed. - * Bump build dependencies to 5.11.1. - * Update symbols from amd64 build logs. - - -- Simon Quigley Mon, 25 Jun 2018 23:22:56 -0500 - -qtcharts-opensource-src (5.10.1-2) unstable; urgency=medium - - * Switch to using plain dh_auto_configure instead of calling qmake - (Closes: #888406). - - Bump debhelper dependency to 10.9.2, required to do the change. - * Release to unstable. - -- Lisandro Damián Nicanor Pérez Meyer Sat, 07 Apr 2018 17:39:50 -0300 + -- Simon Quigley Sun, 25 Feb 2018 15:00:56 -0600 -qtcharts-opensource-src (5.10.1-1) experimental; urgency=medium +qtcharts-opensource-src (5.9.3-0ubuntu1) bionic; urgency=medium * New upstream release. - - Bump Qt build dependencies. - * Update debian/watch to follow upstream naming changes. - * Update Vcs-[Git Browser] to use salsa.debian.org repos. - * Update symbols files with current build log. - * Update Standards-Version to 4.1.3, no changes required. - * Simple updates to debian/copyright. - -- Lisandro Damián Nicanor Pérez Meyer Tue, 06 Mar 2018 13:59:05 -0300 + -- Simon Quigley Sun, 03 Dec 2017 21:45:14 -0600 qtcharts-opensource-src (5.9.2-1) unstable; urgency=medium diff -Nru qtcharts-opensource-src-5.12.5/debian/compat qtcharts-opensource-src-5.9.5/debian/compat --- qtcharts-opensource-src-5.12.5/debian/compat 2019-10-22 18:06:25.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/debian/compat 2018-04-14 19:07:27.000000000 +0000 @@ -1 +1 @@ -11 +10 diff -Nru qtcharts-opensource-src-5.12.5/debian/control qtcharts-opensource-src-5.9.5/debian/control --- qtcharts-opensource-src-5.12.5/debian/control 2019-10-22 18:06:25.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/debian/control 2018-04-14 19:08:11.000000000 +0000 @@ -1,25 +1,26 @@ Source: qtcharts-opensource-src Section: libs Priority: optional -Maintainer: Debian Qt/KDE Maintainers -Uploaders: Simon Quigley , +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Qt/KDE Maintainers +Uploaders: Simon Quigley , Dmitry Shachnev , Lisandro Damián Nicanor Pérez Meyer -Build-Depends: debhelper (>= 11), +Build-Depends: debhelper (>= 10.3), dpkg-dev (>= 1.17.14), pkg-kde-tools, - qml-module-qtquick2 (>= 5.12.5~), - qml-module-qttest (>= 5.12.5~), - qtbase5-dev (>= 5.12.5+dfsg~), - qtdeclarative5-dev (>= 5.12.5~), - xauth , - xvfb -Build-Depends-Indep: qtbase5-doc-html (>= 5.12.5+dfsg~) , - qttools5-dev-tools (>= 5.12.5~) -Standards-Version: 4.4.1 -Homepage: https://doc.qt.io/qt-5/qtcharts-index.html -Vcs-Git: https://salsa.debian.org/qt-kde-team/qt/qtcharts.git -Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt/qtcharts + qml-module-qtquick2 (>= 5.9.5~), + qml-module-qttest (>= 5.9.5~), + qtbase5-dev (>= 5.9.5+dfsg~), + qtdeclarative5-dev (>= 5.9.5~), + xauth, + xvfb +Build-Depends-Indep: libqt5sql5-sqlite (>= 5.9.5+dfsg~) , + qttools5-dev-tools (>= 5.9.5~) +Standards-Version: 4.1.1 +Homepage: http://doc.qt.io/qt-5/qtcharts-index.html +Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtcharts.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/qt/qtcharts.git Package: libqt5charts5 Architecture: any diff -Nru qtcharts-opensource-src-5.12.5/debian/copyright qtcharts-opensource-src-5.9.5/debian/copyright --- qtcharts-opensource-src-5.12.5/debian/copyright 2019-10-22 18:06:25.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/debian/copyright 2018-04-14 19:07:27.000000000 +0000 @@ -1,26 +1,21 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: qtcharts-everywhere-src +Upstream-Name: qtcharts-opensource-src Source: https://download.qt.io/official_releases/qt/*/submodules/ Files: * -Copyright: 2016-2018 The Qt Company Ltd. -License: GPL-3+ +Copyright: 2016-2017 The Qt Company Ltd. +License: GPL-3 Files: debian/* -Copyright: 2017-2018 Simon Quigley +Copyright: 2017 Simon Quigley 2017 Dmitry Shachnev - 2018 Lisandro Damián Nicanor Pérez Meyer -License: GPL-3+ +License: GPL-3 Files: src/charts/boxplotchart/qhboxplotmodelmapper.* Copyright: 2016 Klarälvdalens Datakonsult AB (KDAB) -License: GPL-3+ +License: GPL-3 -Files: *.qdoc -Copyright: 2016 The Qt Company Ltd. -License: GFDL-NIV-1.3 - -License: GPL-3+ +License: GPL-3 This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3 or (at your option) any later version approved by the KDE Free Qt Foundation. @@ -33,12 +28,3 @@ . On Debian systems, the complete text of the GNU General Public License version 3 can be found in /usr/share/common-licenses/GPL-3. - -License: GFDL-NIV-1.3 - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.3 - or any later version published by the Free Software Foundation; - with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. - . - On Debian systems, the complete text of the GNU Free Documentation - License version 1.3 can be found in /usr/share/common-licenses/GFDL-1.3. diff -Nru qtcharts-opensource-src-5.12.5/debian/libqt5charts5.symbols qtcharts-opensource-src-5.9.5/debian/libqt5charts5.symbols --- qtcharts-opensource-src-5.12.5/debian/libqt5charts5.symbols 2019-10-22 18:06:25.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/debian/libqt5charts5.symbols 2018-04-14 19:07:27.000000000 +0000 @@ -1,10 +1,6 @@ -# SymbolsHelper-Confirmed: 5.12.2 amd64 +# SymbolsHelper-Confirmed: 5.9.0~rc amd64 libQt5Charts.so.5 libqt5charts5 #MINVER# -* Build-Depends-Package: libqt5charts5-dev Qt_5.0@Qt_5.0 5.7.1 - Qt_5.10@Qt_5.10 5.10.1 - Qt_5.11@Qt_5.11 5.11.1 - Qt_5.12@Qt_5.12 5.12.0 Qt_5.1@Qt_5.1 5.7.1 Qt_5.2@Qt_5.2 5.7.1 Qt_5.3@Qt_5.3 5.7.1 @@ -16,13 +12,6 @@ Qt_5.9@Qt_5.9 5.9.0~rc Qt_5@Qt_5 5.7.1 Qt_5_PRIVATE_API@Qt_5_PRIVATE_API 5.7.1 - _ZN8QtCharts10ChartTitle11setGeometryERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts10ChartTitle7setTextERK7QString@Qt_5 5.10.1 - _ZN8QtCharts10ChartTitleC1EP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts10ChartTitleC2EP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts10ChartTitleD0Ev@Qt_5 5.10.1 - _ZN8QtCharts10ChartTitleD1Ev@Qt_5 5.10.1 - _ZN8QtCharts10ChartTitleD2Ev@Qt_5 5.10.1 _ZN8QtCharts10QBarSeries11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.7.1 _ZN8QtCharts10QBarSeries11qt_metacastEPKc@Qt_5 5.7.1 _ZN8QtCharts10QBarSeries16staticMetaObjectE@Qt_5 5.7.1 @@ -84,20 +73,14 @@ _ZN8QtCharts10QValueAxis10minChangedEd@Qt_5 5.7.1 _ZN8QtCharts10QValueAxis11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.7.1 _ZN8QtCharts10QValueAxis11qt_metacastEPKc@Qt_5 5.7.1 - _ZN8QtCharts10QValueAxis11setTickTypeENS0_8TickTypeE@Qt_5 5.12.2 _ZN8QtCharts10QValueAxis12rangeChangedEdd@Qt_5 5.7.1 _ZN8QtCharts10QValueAxis12setTickCountEi@Qt_5 5.7.1 - _ZN8QtCharts10QValueAxis13setTickAnchorEd@Qt_5 5.12.2 _ZN8QtCharts10QValueAxis14setLabelFormatERK7QString@Qt_5 5.7.1 - _ZN8QtCharts10QValueAxis15setTickIntervalEd@Qt_5 5.12.2 - _ZN8QtCharts10QValueAxis15tickTypeChangedENS0_8TickTypeE@Qt_5 5.12.2 _ZN8QtCharts10QValueAxis16applyNiceNumbersEv@Qt_5 5.7.1 _ZN8QtCharts10QValueAxis16staticMetaObjectE@Qt_5 5.7.1 _ZN8QtCharts10QValueAxis16tickCountChangedEi@Qt_5 5.7.1 _ZN8QtCharts10QValueAxis17setMinorTickCountEi@Qt_5 5.7.1 - _ZN8QtCharts10QValueAxis17tickAnchorChangedEd@Qt_5 5.12.2 _ZN8QtCharts10QValueAxis18labelFormatChangedERK7QString@Qt_5 5.7.1 - _ZN8QtCharts10QValueAxis19tickIntervalChangedEd@Qt_5 5.12.2 _ZN8QtCharts10QValueAxis21minorTickCountChangedEi@Qt_5 5.7.1 _ZN8QtCharts10QValueAxis6setMaxEd@Qt_5 5.7.1 _ZN8QtCharts10QValueAxis6setMinEd@Qt_5 5.7.1 @@ -109,88 +92,6 @@ _ZN8QtCharts10QValueAxisD0Ev@Qt_5 5.7.1 _ZN8QtCharts10QValueAxisD1Ev@Qt_5 5.7.1 _ZN8QtCharts10QValueAxisD2Ev@Qt_5 5.7.1 - _ZN8QtCharts11BoxWhiskers11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers11setBoxWidthEd@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers11setGeometryERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers13doubleClickedEPNS_7QBoxSetE@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers14updateGeometryEPNS_14AbstractDomainE@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers15hoverEnterEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers15hoverLeaveEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers15mousePressEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers17mouseReleaseEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers6setPenERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers7clickedEPNS_7QBoxSetE@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers7hoveredEbPNS_7QBoxSetE@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers7pressedEPNS_7QBoxSetE@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers8releasedEPNS_7QBoxSetE@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers8setBrushERK6QBrush@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskers9setLayoutERKNS_15BoxWhiskersDataE@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskersC1EPNS_7QBoxSetEPNS_14AbstractDomainEP15QGraphicsObject@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskersC2EPNS_7QBoxSetEPNS_14AbstractDomainEP15QGraphicsObject@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskersD0Ev@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskersD1Ev@Qt_5 5.10.1 - _ZN8QtCharts11BoxWhiskersD2Ev@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick12setBodyWidthEd@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick12setCapsWidthEd@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick13doubleClickedEPNS_15QCandlestickSetE@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick13setTimePeriodEd@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick14setCapsVisibleEb@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick14updateGeometryEPNS_14AbstractDomainE@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick15hoverEnterEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick15hoverLeaveEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick15mousePressEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick17mouseReleaseEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick18setDecreasingColorERK6QColor@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick18setIncreasingColorERK6QColor@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick21setBodyOutlineVisibleEb@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick21setMaximumColumnWidthEd@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick21setMinimumColumnWidthEd@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick6setPenERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick7clickedEPNS_15QCandlestickSetE@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick7hoveredEbPNS_15QCandlestickSetE@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick7pressedEPNS_15QCandlestickSetE@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick8releasedEPNS_15QCandlestickSetE@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick8setBrushERK6QBrush@Qt_5 5.10.1 - _ZN8QtCharts11Candlestick9setLayoutERKNS_15CandlestickDataE@Qt_5 5.10.1 - _ZN8QtCharts11CandlestickC1EPNS_15QCandlestickSetEPNS_14AbstractDomainEP15QGraphicsObject@Qt_5 5.10.1 - _ZN8QtCharts11CandlestickC2EPNS_15QCandlestickSetEPNS_14AbstractDomainEP15QGraphicsObject@Qt_5 5.10.1 - _ZN8QtCharts11CandlestickD0Ev@Qt_5 5.10.1 - _ZN8QtCharts11CandlestickD1Ev@Qt_5 5.10.1 - _ZN8QtCharts11CandlestickD2Ev@Qt_5 5.10.1 - _ZN8QtCharts11ChartConfig10m_instanceE@Qt_5 5.10.1 - _ZN8QtCharts11LogXYDomain10attachAxisEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts11LogXYDomain10detachAxisEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts11LogXYDomain11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts11LogXYDomain11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts11LogXYDomain16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts11LogXYDomain31handleHorizontalAxisBaseChangedEd@Qt_5 5.10.1 - _ZN8QtCharts11LogXYDomain4moveEdd@Qt_5 5.10.1 - _ZN8QtCharts11LogXYDomain6zoomInERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts11LogXYDomain7zoomOutERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts11LogXYDomain8setRangeEdddd@Qt_5 5.10.1 - _ZN8QtCharts11LogXYDomainC1EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts11LogXYDomainC2EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts11LogXYDomainD0Ev@Qt_5 5.10.1 - _ZN8QtCharts11LogXYDomainD1Ev@Qt_5 5.10.1 - _ZN8QtCharts11LogXYDomainD2Ev@Qt_5 5.10.1 - _ZN8QtCharts11PolarDomain11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts11PolarDomain11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts11PolarDomain16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts11PolarDomain7setSizeERK6QSizeF@Qt_5 5.10.1 - _ZN8QtCharts11PolarDomainC1EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts11PolarDomainC2EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts11PolarDomainD0Ev@Qt_5 5.10.1 - _ZN8QtCharts11PolarDomainD1Ev@Qt_5 5.10.1 - _ZN8QtCharts11PolarDomainD2Ev@Qt_5 5.10.1 _ZN8QtCharts11QAreaSeries11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.7.1 _ZN8QtCharts11QAreaSeries11qt_metacastEPKc@Qt_5 5.7.1 _ZN8QtCharts11QAreaSeries12colorChangedE6QColor@Qt_5 5.7.1 @@ -246,221 +147,6 @@ _ZN8QtCharts11QPolarChartD0Ev@Qt_5 5.7.1 _ZN8QtCharts11QPolarChartD1Ev@Qt_5 5.7.1 _ZN8QtCharts11QPolarChartD2Ev@Qt_5 5.7.1 - _ZN8QtCharts11XLogYDomain10attachAxisEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts11XLogYDomain10detachAxisEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts11XLogYDomain11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts11XLogYDomain11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts11XLogYDomain16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts11XLogYDomain29handleVerticalAxisBaseChangedEd@Qt_5 5.10.1 - _ZN8QtCharts11XLogYDomain4moveEdd@Qt_5 5.10.1 - _ZN8QtCharts11XLogYDomain6zoomInERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts11XLogYDomain7zoomOutERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts11XLogYDomain8setRangeEdddd@Qt_5 5.10.1 - _ZN8QtCharts11XLogYDomainC1EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts11XLogYDomainC2EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts11XLogYDomainD0Ev@Qt_5 5.10.1 - _ZN8QtCharts11XLogYDomainD1Ev@Qt_5 5.10.1 - _ZN8QtCharts11XLogYDomainD2Ev@Qt_5 5.10.1 - _ZN8QtCharts11XYAnimation11updateStateEN18QAbstractAnimation5StateES2_@Qt_5 5.10.1 - _ZN8QtCharts11XYAnimation18updateCurrentValueERK8QVariant@Qt_5 5.10.1 - _ZN8QtCharts11XYAnimation5setupERK7QVectorI7QPointFES5_i@Qt_5 5.10.1 - _ZN8QtCharts11XYAnimationC1EPNS_7XYChartEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts11XYAnimationC2EPNS_7XYChartEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts11XYAnimationD0Ev@Qt_5 5.10.1 - _ZN8QtCharts11XYAnimationD1Ev@Qt_5 5.10.1 - _ZN8QtCharts11XYAnimationD2Ev@Qt_5 5.10.1 - _ZN8QtCharts12BarAnimation11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts12BarAnimation11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts12BarAnimation16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts12BarAnimation18updateCurrentValueERK8QVariant@Qt_5 5.10.1 - _ZN8QtCharts12BarAnimation5setupERK7QVectorI6QRectFES5_@Qt_5 5.10.1 - _ZN8QtCharts12BarAnimationC1EPNS_20AbstractBarChartItemEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts12BarAnimationC2EPNS_20AbstractBarChartItemEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts12BarAnimationD0Ev@Qt_5 5.10.1 - _ZN8QtCharts12BarAnimationD1Ev@Qt_5 5.10.1 - _ZN8QtCharts12BarAnimationD2Ev@Qt_5 5.10.1 - _ZN8QtCharts12BarChartItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts12BarChartItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts12BarChartItem12topLeftPointEiiidd@Qt_5 5.10.1 - _ZN8QtCharts12BarChartItem14positionLabelsEv@Qt_5 5.10.1 - _ZN8QtCharts12BarChartItem15calculateLayoutEv@Qt_5 5.10.1 - _ZN8QtCharts12BarChartItem16bottomRightPointEiiidd@Qt_5 5.10.1 - _ZN8QtCharts12BarChartItem16initializeLayoutEiiib@Qt_5 5.10.1 - _ZN8QtCharts12BarChartItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts12BarChartItem27handleLabelsPositionChangedEv@Qt_5 5.10.1 - _ZN8QtCharts12BarChartItemC1EPNS_18QAbstractBarSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts12BarChartItemC2EPNS_18QAbstractBarSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet10attachAxisEPNS_15QAbstractSeriesEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet10createAxesE6QFlagsINS_13QAbstractAxis8AxisTypeEEN2Qt11OrientationE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet10detachAxisEPNS_15QAbstractSeriesEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet10mapToValueERK7QPointFPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet10removeAxisEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet11axisRemovedEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet11seriesAddedEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet12createDomainENS_14AbstractDomain10DomainTypeE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet12removeSeriesEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet12scrollDomainEdd@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet12selectDomainE5QListIPNS_13QAbstractAxisEE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet12zoomInDomainERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet13deleteAllAxesEv@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet13mapToPositionERK7QPointFPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet13seriesRemovedEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet13zoomOutDomainERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet14isZoomedDomainEv@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet14reverseChangedEv@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet15deleteAllSeriesEv@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet15zoomResetDomainEv@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet17createDefaultAxesEv@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet19findMinMaxForSeriesE5QListIPNS_15QAbstractSeriesEE6QFlagsIN2Qt11OrientationEERdS9_@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet7addAxisEPNS_13QAbstractAxisE6QFlagsIN2Qt13AlignmentFlagEE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet9addSeriesEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSet9axisAddedEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSetC1EPNS_6QChartE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSetC2EPNS_6QChartE@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSetD0Ev@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSetD1Ev@Qt_5 5.10.1 - _ZN8QtCharts12ChartDataSetD2Ev@Qt_5 5.10.1 - _ZN8QtCharts12ChartElement10setDataSetEPNS_12ChartDataSetE@Qt_5 5.10.1 - _ZN8QtCharts12ChartElement12setPresenterEPNS_14ChartPresenterE@Qt_5 5.10.1 - _ZN8QtCharts12ChartElement15setThemeManagerEPNS_17ChartThemeManagerE@Qt_5 5.10.1 - _ZN8QtCharts12ChartElementC1EP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts12ChartElementC2EP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts12LegendLayout10invalidateEv@Qt_5 5.10.1 - _ZN8QtCharts12LegendLayout11setGeometryERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts12LegendLayout15widthLongerThanEPKNS0_17LegendWidthStructES3_@Qt_5 5.10.1 - _ZN8QtCharts12LegendLayout19setAttachedGeometryERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts12LegendLayout20setDettachedGeometryERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts12LegendLayout9setOffsetEdd@Qt_5 5.10.1 - _ZN8QtCharts12LegendLayoutC1EPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts12LegendLayoutC2EPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts12LegendLayoutD0Ev@Qt_5 5.10.1 - _ZN8QtCharts12LegendLayoutD1Ev@Qt_5 5.10.1 - _ZN8QtCharts12LegendLayoutD2Ev@Qt_5 5.10.1 - _ZN8QtCharts12PieAnimation11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts12PieAnimation11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts12PieAnimation11removeSliceEPNS_12PieSliceItemE@Qt_5 5.10.1 - _ZN8QtCharts12PieAnimation11updateValueEPNS_12PieSliceItemERKNS_12PieSliceDataE@Qt_5 5.10.1 - _ZN8QtCharts12PieAnimation16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts12PieAnimation18updateCurrentValueERK8QVariant@Qt_5 5.10.1 - _ZN8QtCharts12PieAnimation8addSliceEPNS_12PieSliceItemERKNS_12PieSliceDataEb@Qt_5 5.10.1 - _ZN8QtCharts12PieAnimationC1EPNS_12PieChartItemEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts12PieAnimationC2EPNS_12PieChartItemEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts12PieAnimationD0Ev@Qt_5 5.10.1 - _ZN8QtCharts12PieAnimationD1Ev@Qt_5 5.10.1 - _ZN8QtCharts12PieAnimationD2Ev@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem12setAnimationEPNS_12PieAnimationE@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem12updateLayoutEv@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem15hoverEnterEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem15hoverLeaveEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem15mousePressEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem17handleSlicesAddedE5QListIPNS_9QPieSliceEE@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem17mouseReleaseEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem18handleSliceChangedEv@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem19handleDomainUpdatedEv@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem19handleSlicesRemovedE5QListIPNS_9QPieSliceEE@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem19updateSliceGeometryEPNS_9QPieSliceE@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem20handleOpacityChangedEv@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem26handleSeriesVisibleChangedEv@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItem7cleanupEv@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItemC1EPNS_10QPieSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItemC2EPNS_10QPieSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItemD0Ev@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItemD1Ev@Qt_5 5.10.1 - _ZN8QtCharts12PieChartItemD2Ev@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem11sliceCenterE7QPointFdPNS_9QPieSliceE@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem12labelArmPathE7QPointFdddPS1_@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem13doubleClickedE6QFlagsIN2Qt11MouseButtonEE@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem15hoverEnterEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem15hoverLeaveEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem15mousePressEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem17mouseReleaseEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem7clickedE6QFlagsIN2Qt11MouseButtonEE@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem7hoveredEb@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem7pressedE6QFlagsIN2Qt11MouseButtonEE@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem8releasedE6QFlagsIN2Qt11MouseButtonEE@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem9setLayoutERKNS_12PieSliceDataE@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItem9slicePathE7QPointFdddPdPS1_@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItemC1EP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItemC2EP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItemD0Ev@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItemD1Ev@Qt_5 5.10.1 - _ZN8QtCharts12PieSliceItemD2Ev@Qt_5 5.10.1 - _ZN8QtCharts12ScrollTicker10timerEventEP11QTimerEvent@Qt_5 5.10.1 - _ZN8QtCharts12ScrollTicker11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts12ScrollTicker11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts12ScrollTicker16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts12ScrollTicker4stopEv@Qt_5 5.10.1 - _ZN8QtCharts12ScrollTicker5startEi@Qt_5 5.10.1 - _ZN8QtCharts12ScrollTickerC1EPNS_8ScrollerEP7QObject@Qt_5 5.10.1 - _ZN8QtCharts12ScrollTickerC2EPNS_8ScrollerEP7QObject@Qt_5 5.10.1 - _ZN8QtCharts12VerticalAxis14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts12VerticalAxis23updateMinorTickGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts12VerticalAxisC1EPNS_13QAbstractAxisEP13QGraphicsItemb@Qt_5 5.10.1 - _ZN8QtCharts12VerticalAxisC2EPNS_13QAbstractAxisEP13QGraphicsItemb@Qt_5 5.10.1 - _ZN8QtCharts12VerticalAxisD0Ev@Qt_5 5.10.1 - _ZN8QtCharts12VerticalAxisD1Ev@Qt_5 5.10.1 - _ZN8QtCharts12VerticalAxisD2Ev@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem10updatePathEv@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem12setPresenterEPNS_14ChartPresenterE@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem13doubleClickedERK7QPointF@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem13handleUpdatedEv@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem14setLowerSeriesEPNS_11QLineSeriesE@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem14setUpperSeriesEPNS_11QLineSeriesE@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem15hoverEnterEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem15hoverLeaveEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem15mousePressEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem17mouseReleaseEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem19fixEdgeSeriesDomainEPNS_13LineChartItemE@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem19handleDomainUpdatedEv@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem7clickedERK7QPointF@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem7hoveredERK7QPointFb@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem7pressedERK7QPointF@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItem8releasedERK7QPointF@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItemC1EPNS_11QAreaSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItemC2EPNS_11QAreaSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItemD0Ev@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItemD1Ev@Qt_5 5.10.1 - _ZN8QtCharts13AreaChartItemD2Ev@Qt_5 5.10.1 - _ZN8QtCharts13AxisAnimation16setAnimationTypeENS0_9AnimationE@Qt_5 5.10.1 - _ZN8QtCharts13AxisAnimation17setAnimationPointERK7QPointF@Qt_5 5.10.1 - _ZN8QtCharts13AxisAnimation18updateCurrentValueERK8QVariant@Qt_5 5.10.1 - _ZN8QtCharts13AxisAnimation9setValuesER7QVectorIdES3_@Qt_5 5.10.1 - _ZN8QtCharts13AxisAnimationC1EPNS_16ChartAxisElementEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts13AxisAnimationC2EPNS_16ChartAxisElementEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts13AxisAnimationD0Ev@Qt_5 5.10.1 - _ZN8QtCharts13AxisAnimationD1Ev@Qt_5 5.10.1 - _ZN8QtCharts13AxisAnimationD2Ev@Qt_5 5.10.1 - _ZN8QtCharts13LineChartItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts13LineChartItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts13LineChartItem13handleUpdatedEv@Qt_5 5.10.1 - _ZN8QtCharts13LineChartItem14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts13LineChartItem15hoverEnterEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts13LineChartItem15hoverLeaveEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts13LineChartItem15mousePressEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts13LineChartItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts13LineChartItem17mouseReleaseEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts13LineChartItem21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts13LineChartItem5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget@Qt_5 5.10.1 - _ZN8QtCharts13LineChartItemC1EPNS_11QLineSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts13LineChartItemC2EPNS_11QLineSeriesEP13QGraphicsItem@Qt_5 5.10.1 _ZN8QtCharts13QAbstractAxis10setLinePenERK4QPen@Qt_5 5.7.1 _ZN8QtCharts13QAbstractAxis10setReverseEb@Qt_5 5.7.1 _ZN8QtCharts13QAbstractAxis10setVisibleEb@Qt_5 5.7.1 @@ -521,8 +207,8 @@ _ZN8QtCharts13QAbstractAxis6setMaxERK8QVariant@Qt_5 5.7.1 _ZN8QtCharts13QAbstractAxis6setMinERK8QVariant@Qt_5 5.7.1 _ZN8QtCharts13QAbstractAxis8setRangeERK8QVariantS3_@Qt_5 5.7.1 - _ZN8QtCharts13QAbstractAxisC1ERNS_20QAbstractAxisPrivateEP7QObject@Qt_5 5.10.1 - _ZN8QtCharts13QAbstractAxisC2ERNS_20QAbstractAxisPrivateEP7QObject@Qt_5 5.10.1 + _ZN8QtCharts13QAbstractAxisC1ERNS_20QAbstractAxisPrivateEP7QObject@Qt_5_PRIVATE_API 5.7.1 + _ZN8QtCharts13QAbstractAxisC2ERNS_20QAbstractAxisPrivateEP7QObject@Qt_5_PRIVATE_API 5.7.1 _ZN8QtCharts13QAbstractAxisD0Ev@Qt_5 5.7.1 _ZN8QtCharts13QAbstractAxisD1Ev@Qt_5 5.7.1 _ZN8QtCharts13QAbstractAxisD2Ev@Qt_5 5.7.1 @@ -544,20 +230,6 @@ _ZN8QtCharts13QCategoryAxisD0Ev@Qt_5 5.7.1 _ZN8QtCharts13QCategoryAxisD1Ev@Qt_5 5.7.1 _ZN8QtCharts13QCategoryAxisD2Ev@Qt_5 5.7.1 - _ZN8QtCharts13QChartPrivate10defaultPenEv@Qt_5 5.10.1 - _ZN8QtCharts13QChartPrivate11defaultFontEv@Qt_5 5.10.1 - _ZN8QtCharts13QChartPrivate12defaultBrushEv@Qt_5 5.10.1 - _ZN8QtCharts13QChartPrivate4initEv@Qt_5 5.10.1 - _ZN8QtCharts13QChartPrivate6scrollEdd@Qt_5 5.10.1 - _ZN8QtCharts13QChartPrivate6zoomInERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts13QChartPrivate6zoomInEd@Qt_5 5.10.1 - _ZN8QtCharts13QChartPrivate7zoomOutEd@Qt_5 5.10.1 - _ZN8QtCharts13QChartPrivate8isZoomedEv@Qt_5 5.10.1 - _ZN8QtCharts13QChartPrivate9zoomResetEv@Qt_5 5.10.1 - _ZN8QtCharts13QChartPrivateC1EPNS_6QChartENS1_9ChartTypeE@Qt_5 5.10.1 - _ZN8QtCharts13QChartPrivateC2EPNS_6QChartENS1_9ChartTypeE@Qt_5 5.10.1 - _ZN8QtCharts13QChartPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts13QChartPrivateD2Ev@Qt_5 5.10.1 _ZN8QtCharts13QDateTimeAxis10maxChangedE9QDateTime@Qt_5 5.7.1 _ZN8QtCharts13QDateTimeAxis10minChangedE9QDateTime@Qt_5 5.7.1 _ZN8QtCharts13QDateTimeAxis11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.7.1 @@ -633,171 +305,6 @@ _ZN8QtCharts13QSplineSeriesD0Ev@Qt_5 5.7.1 _ZN8QtCharts13QSplineSeriesD1Ev@Qt_5 5.7.1 _ZN8QtCharts13QSplineSeriesD2Ev@Qt_5 5.7.1 - _ZN8QtCharts13XYPolarDomain11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts13XYPolarDomain11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts13XYPolarDomain16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts13XYPolarDomain4moveEdd@Qt_5 5.10.1 - _ZN8QtCharts13XYPolarDomain6zoomInERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts13XYPolarDomain7zoomOutERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts13XYPolarDomain8setRangeEdddd@Qt_5 5.10.1 - _ZN8QtCharts13XYPolarDomainC1EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts13XYPolarDomainC2EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts13XYPolarDomainD0Ev@Qt_5 5.10.1 - _ZN8QtCharts13XYPolarDomainD1Ev@Qt_5 5.10.1 - _ZN8QtCharts13XYPolarDomainD2Ev@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain10attachAxisEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain10detachAxisEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain10niceNumberEdb@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain11fixZoomRectERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain14storeZoomResetEv@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain16looseNiceNumbersERdS1_Ri@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain17blockRangeSignalsEb@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain20rangeVerticalChangedEdd@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain21adjustLogDomainRangesERdS1_@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain21handleReverseXChangedEb@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain21handleReverseYChangedEb@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain22rangeHorizontalChangedEdd@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain30handleVerticalAxisRangeChangedEdd@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain32handleHorizontalAxisRangeChangedEdd@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain7setMaxXEd@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain7setMaxYEd@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain7setMinXEd@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain7setMinYEd@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain7setSizeERK6QSizeF@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain7updatedEv@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain9setRangeXEdd@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain9setRangeYEdd@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomain9zoomResetEv@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomainC1EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomainC2EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomainD0Ev@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomainD1Ev@Qt_5 5.10.1 - _ZN8QtCharts14AbstractDomainD2Ev@Qt_5 5.10.1 - _ZN8QtCharts14ChartAnimation11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts14ChartAnimation11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts14ChartAnimation16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts14ChartAnimation19startChartAnimationEv@Qt_5 5.10.1 - _ZN8QtCharts14ChartAnimation19stopAndDestroyLaterEv@Qt_5 5.10.1 - _ZN8QtCharts14ChartAnimationC1EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts14ChartAnimationC2EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter10setVisibleEb@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter11setGeometryE6QRectF@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter12setTitleFontERK5QFont@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter12titleElementEv@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter13setTitleBrushERK6QBrush@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter13truncatedTextERK5QFontRK7QStringdddR6QRectF@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter14numberToStringEdci@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter14numberToStringEi@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter14startAnimationEPNS_14ChartAnimationE@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter14updateGLWidgetEv@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter14updateGeometryERK6QRectF@Qt_5 5.12.2 - _ZN8QtCharts14ChartPresenter15createTitleItemEv@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter15handleAxisAddedEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter15plotAreaChangedERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter15plotAreaElementEv@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter16setBackgroundPenERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter16setFixedGeometryERK6QRectF@Qt_5 5.12.2 - _ZN8QtCharts14ChartPresenter16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter16textBoundingRectERK5QFontRK7QStringd@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter17backgroundElementEv@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter17handleAxisRemovedEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter17handleSeriesAddedEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter18setBackgroundBrushERK6QBrush@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter18setLocalizeNumbersEb@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter19handleSeriesRemovedEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter19setAnimationOptionsE6QFlagsINS_6QChart15AnimationOptionEE@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter20createBackgroundItemEv@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter20setAnimationDurationEi@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter20setBackgroundVisibleEb@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter22setBackgroundRoundnessEd@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter23setAnimationEasingCurveERK12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter24setPlotAreaBackgroundPenERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter26setPlotAreaBackgroundBrushERK6QBrush@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter28createPlotAreaBackgroundItemEv@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter28setPlotAreaBackgroundVisibleEb@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter30setBackgroundDropShadowEnabledEb@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter6layoutEv@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter6legendEv@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter8setStateENS0_5StateE7QPointF@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter8setTitleERK7QString@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenter9setLocaleERK7QLocale@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenterC1EPNS_6QChartENS1_9ChartTypeE@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenterC2EPNS_6QChartENS1_9ChartTypeE@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenterD0Ev@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenterD1Ev@Qt_5 5.10.1 - _ZN8QtCharts14ChartPresenterD2Ev@Qt_5 5.10.1 - _ZN8QtCharts14HorizontalAxis14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts14HorizontalAxis23updateMinorTickGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts14HorizontalAxisC1EPNS_13QAbstractAxisEP13QGraphicsItemb@Qt_5 5.10.1 - _ZN8QtCharts14HorizontalAxisC2EPNS_13QAbstractAxisEP13QGraphicsItemb@Qt_5 5.10.1 - _ZN8QtCharts14HorizontalAxisD0Ev@Qt_5 5.10.1 - _ZN8QtCharts14HorizontalAxisD1Ev@Qt_5 5.10.1 - _ZN8QtCharts14HorizontalAxisD2Ev@Qt_5 5.10.1 - _ZN8QtCharts14LegendScroller11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts14LegendScroller11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts14LegendScroller14mouseMoveEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts14LegendScroller15mousePressEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts14LegendScroller16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts14LegendScroller17mouseReleaseEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts14LegendScroller9setOffsetERK7QPointF@Qt_5 5.10.1 - _ZN8QtCharts14LegendScrollerC1EPNS_6QChartE@Qt_5 5.10.1 - _ZN8QtCharts14LegendScrollerC2EPNS_6QChartE@Qt_5 5.10.1 - _ZN8QtCharts14LogXLogYDomain10attachAxisEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts14LogXLogYDomain10detachAxisEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts14LogXLogYDomain11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts14LogXLogYDomain11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts14LogXLogYDomain16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts14LogXLogYDomain29handleVerticalAxisBaseChangedEd@Qt_5 5.10.1 - _ZN8QtCharts14LogXLogYDomain31handleHorizontalAxisBaseChangedEd@Qt_5 5.10.1 - _ZN8QtCharts14LogXLogYDomain4moveEdd@Qt_5 5.10.1 - _ZN8QtCharts14LogXLogYDomain6zoomInERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts14LogXLogYDomain7zoomOutERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts14LogXLogYDomain8setRangeEdddd@Qt_5 5.10.1 - _ZN8QtCharts14LogXLogYDomainC1EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts14LogXLogYDomainC2EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts14LogXLogYDomainD0Ev@Qt_5 5.10.1 - _ZN8QtCharts14LogXLogYDomainD1Ev@Qt_5 5.10.1 - _ZN8QtCharts14LogXLogYDomainD2Ev@Qt_5 5.10.1 - _ZN8QtCharts14PolarChartAxis11deleteItemsEi@Qt_5 5.10.1 - _ZN8QtCharts14PolarChartAxis11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts14PolarChartAxis11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts14PolarChartAxis11setGeometryERK6QRectFS3_@Qt_5 5.10.1 - _ZN8QtCharts14PolarChartAxis12updateLayoutER7QVectorIdE@Qt_5 5.10.1 - _ZN8QtCharts14PolarChartAxis16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts14PolarChartAxis22handleShadesPenChangedERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts14PolarChartAxis24handleShadesBrushChangedERK6QBrush@Qt_5 5.10.1 - _ZN8QtCharts14PolarChartAxis7isEmptyEv@Qt_5 5.10.1 - _ZN8QtCharts14PolarChartAxisC1EPNS_13QAbstractAxisEP13QGraphicsItemb@Qt_5 5.10.1 - _ZN8QtCharts14PolarChartAxisC2EPNS_13QAbstractAxisEP13QGraphicsItemb@Qt_5 5.10.1 - _ZN8QtCharts14PolarChartAxisD0Ev@Qt_5 5.10.1 - _ZN8QtCharts14PolarChartAxisD1Ev@Qt_5 5.10.1 - _ZN8QtCharts14PolarChartAxisD2Ev@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivate10valueAddedEii@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivate11updatedBarsEv@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivate12valueChangedEi@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivate12valueRemovedEii@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivate3posEi@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivate5valueEi@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivate6appendE5QListI7QPointFE@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivate6appendE5QListIdE@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivate6appendE7QPointF@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivate6insertEi7QPointF@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivate6insertEid@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivate6removeEii@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivate7replaceEid@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivateC1E7QStringPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivateC2E7QStringPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts14QBarSetPrivateD2Ev@Qt_5 5.10.1 _ZN8QtCharts14QBoxPlotSeries10penChangedEv@Qt_5 5.7.1 _ZN8QtCharts14QBoxPlotSeries11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.7.1 _ZN8QtCharts14QBoxPlotSeries11qt_metacastEPKc@Qt_5 5.7.1 @@ -830,45 +337,6 @@ _ZN8QtCharts14QBoxPlotSeriesD0Ev@Qt_5 5.7.1 _ZN8QtCharts14QBoxPlotSeriesD1Ev@Qt_5 5.7.1 _ZN8QtCharts14QBoxPlotSeriesD2Ev@Qt_5 5.7.1 - _ZN8QtCharts14QBoxSetPrivate10updatedBoxEv@Qt_5 5.10.1 - _ZN8QtCharts14QBoxSetPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts14QBoxSetPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts14QBoxSetPrivate13updatedLayoutEv@Qt_5 5.10.1 - _ZN8QtCharts14QBoxSetPrivate15restructuredBoxEv@Qt_5 5.10.1 - _ZN8QtCharts14QBoxSetPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts14QBoxSetPrivate5clearEv@Qt_5 5.10.1 - _ZN8QtCharts14QBoxSetPrivate5valueEi@Qt_5 5.10.1 - _ZN8QtCharts14QBoxSetPrivate6appendE5QListIdE@Qt_5 5.10.1 - _ZN8QtCharts14QBoxSetPrivate6appendEd@Qt_5 5.10.1 - _ZN8QtCharts14QBoxSetPrivate8setValueEid@Qt_5 5.10.1 - _ZN8QtCharts14QBoxSetPrivateC1E7QStringPNS_7QBoxSetE@Qt_5 5.10.1 - _ZN8QtCharts14QBoxSetPrivateC2E7QStringPNS_7QBoxSetE@Qt_5 5.10.1 - _ZN8QtCharts14QBoxSetPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts14QBoxSetPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts14QBoxSetPrivateD2Ev@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivate10addMarkersE5QListIPNS_13QLegendMarkerEE@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivate13relatedObjectEPKNS_13QLegendMarkerE@Qt_5 5.11.1 - _ZN8QtCharts14QLegendPrivate13removeMarkersE5QListIPNS_13QLegendMarkerEE@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivate14decorateMarkerEPNS_13QLegendMarkerE@Qt_5 5.11.1 - _ZN8QtCharts14QLegendPrivate14updateToolTipsEv@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivate15decorateMarkersE5QListIPNS_13QLegendMarkerEE@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivate17handleSeriesAddedEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivate18handleCountChangedEv@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivate18insertMarkerHelperEPNS_13QLegendMarkerE@Qt_5 5.11.1 - _ZN8QtCharts14QLegendPrivate18removeMarkerHelperEPNS_13QLegendMarkerE@Qt_5 5.11.1 - _ZN8QtCharts14QLegendPrivate19handleSeriesRemovedEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivate26handleSeriesVisibleChangedEv@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivate7markersEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivate9roundnessEd@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivate9setOffsetERK7QPointF@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivateC1EPNS_14ChartPresenterEPNS_6QChartEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivateC2EPNS_14ChartPresenterEPNS_6QChartEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts14QLegendPrivateD2Ev@Qt_5 5.10.1 _ZN8QtCharts14QScatterSeries11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.7.1 _ZN8QtCharts14QScatterSeries11qt_metacastEPKc@Qt_5 5.7.1 _ZN8QtCharts14QScatterSeries12colorChangedE6QColor@Qt_5 5.7.1 @@ -899,44 +367,6 @@ _ZN8QtCharts14QXYModelMapper9setSeriesEPNS_9QXYSeriesE@Qt_5 5.7.1 _ZN8QtCharts14QXYModelMapperC1EP7QObject@Qt_5 5.7.1 _ZN8QtCharts14QXYModelMapperC2EP7QObject@Qt_5 5.7.1 - _ZN8QtCharts15ChartBackground11setDiameterEd@Qt_5 5.10.1 - _ZN8QtCharts15ChartBackground20setDropShadowEnabledEb@Qt_5 5.10.1 - _ZN8QtCharts15ChartBackground5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget@Qt_5 5.10.1 - _ZN8QtCharts15ChartBackgroundC1EP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts15ChartBackgroundC2EP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts15ChartBackgroundD0Ev@Qt_5 5.10.1 - _ZN8QtCharts15ChartBackgroundD1Ev@Qt_5 5.10.1 - _ZN8QtCharts15ChartBackgroundD2Ev@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisX11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisX11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisX14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisX16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisX21handleTickTypeChangedENS_10QValueAxis8TickTypeE@Qt_5 5.12.2 - _ZN8QtCharts15ChartValueAxisX22handleTickCountChangedEi@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisX23handleTickAnchorChangedEd@Qt_5 5.12.2 - _ZN8QtCharts15ChartValueAxisX24handleLabelFormatChangedERK7QString@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisX25handleTickIntervalChangedEd@Qt_5 5.12.2 - _ZN8QtCharts15ChartValueAxisX27handleMinorTickCountChangedEi@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisXC1EPNS_10QValueAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisXC2EPNS_10QValueAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisXD0Ev@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisXD1Ev@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisXD2Ev@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisY11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisY11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisY14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisY16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisY21handleTickTypeChangedENS_10QValueAxis8TickTypeE@Qt_5 5.12.2 - _ZN8QtCharts15ChartValueAxisY22handleTickCountChangedEi@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisY23handleTickAnchorChangedEd@Qt_5 5.12.2 - _ZN8QtCharts15ChartValueAxisY24handleLabelFormatChangedERK7QString@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisY25handleTickIntervalChangedEd@Qt_5 5.12.2 - _ZN8QtCharts15ChartValueAxisY27handleMinorTickCountChangedEi@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisYC1EPNS_10QValueAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisYC2EPNS_10QValueAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisYD0Ev@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisYD1Ev@Qt_5 5.10.1 - _ZN8QtCharts15ChartValueAxisYD2Ev@Qt_5 5.10.1 _ZN8QtCharts15QAbstractSeries10attachAxisEPNS_13QAbstractAxisE@Qt_5 5.7.1 _ZN8QtCharts15QAbstractSeries10detachAxisEPNS_13QAbstractAxisE@Qt_5 5.7.1 _ZN8QtCharts15QAbstractSeries10setOpacityEd@Qt_5 5.7.1 @@ -1056,140 +486,6 @@ _ZN8QtCharts15QXYLegendMarkerD0Ev@Qt_5 5.7.1 _ZN8QtCharts15QXYLegendMarkerD1Ev@Qt_5 5.7.1 _ZN8QtCharts15QXYLegendMarkerD2Ev@Qt_5 5.7.1 - _ZN8QtCharts15SplineAnimation11updateStateEN18QAbstractAnimation5StateES2_@Qt_5 5.10.1 - _ZN8QtCharts15SplineAnimation18updateCurrentValueERK8QVariant@Qt_5 5.10.1 - _ZN8QtCharts15SplineAnimation5setupER7QVectorI7QPointFES4_S4_S4_i@Qt_5 5.10.1 - _ZN8QtCharts15SplineAnimationC1EPNS_15SplineChartItemEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts15SplineAnimationC2EPNS_15SplineChartItemEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts15SplineAnimationD0Ev@Qt_5 5.10.1 - _ZN8QtCharts15SplineAnimationD1Ev@Qt_5 5.10.1 - _ZN8QtCharts15SplineAnimationD2Ev@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItem11updateChartER7QVectorI7QPointFES4_i@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItem12setAnimationEPNS_15SplineAnimationE@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItem13handleUpdatedEv@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItem14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItem15hoverEnterEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItem15hoverLeaveEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItem15mousePressEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItem17mouseReleaseEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItem18firstControlPointsERK7QVectorIdE@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItem21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItem22calculateControlPointsERK7QVectorI7QPointFE@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItem24setControlGeometryPointsER7QVectorI7QPointFE@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItem5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItemC1EPNS_13QSplineSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts15SplineChartItemC2EPNS_13QSplineSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotAnimation11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotAnimation11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotAnimation12boxAnimationEPNS_11BoxWhiskersE@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotAnimation16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotAnimation17setAnimationStartEPNS_11BoxWhiskersE@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotAnimation18boxChangeAnimationEPNS_11BoxWhiskersE@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotAnimation18removeBoxAnimationEPNS_11BoxWhiskersE@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotAnimation6addBoxEPNS_11BoxWhiskersE@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotAnimation7stopAllEv@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotAnimationC1EPNS_16BoxPlotChartItemEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotAnimationC2EPNS_16BoxPlotChartItemEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotAnimationD0Ev@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotAnimationD1Ev@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotAnimationD2Ev@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItem12setAnimationEPNS_16BoxPlotAnimationE@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItem15calculateLayoutEv@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItem16initializeLayoutEv@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItem17handleUpdatedBarsEv@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItem17updateBoxGeometryEPNS_11BoxWhiskersEi@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItem18handleBoxsetRemoveE5QListIPNS_7QBoxSetEE@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItem19handleDomainUpdatedEv@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItem19handleLayoutChangedEv@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItem20handleOpacityChangedEv@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItem26handleDataStructureChangedEv@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItem26handleSeriesVisibleChangedEv@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItem5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItemC1EPNS_14QBoxPlotSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItemC2EPNS_14QBoxPlotSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItemD0Ev@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItemD1Ev@Qt_5 5.10.1 - _ZN8QtCharts16BoxPlotChartItemD2Ev@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement12axisSelectedEv@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement12connectSlotsEv@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement18handleRangeChangedEdd@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement20handleReverseChangedEb@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement20handleVisibleChangedEb@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement22handleTitleFontChangedERK5QFont@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement22handleTitleTextChangedERK7QString@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement23handleLabelsFontChangedERK5QFont@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement23handleTitleBrushChangedERK6QBrush@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement24handleGridVisibleChangedEb@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement24handleLabelsAngleChangedEi@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement24handleLabelsBrushChangedERK6QBrush@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement25handleArrowVisibleChangedEb@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement25handleTitleVisibleChangedEb@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement26handleLabelsVisibleChangedEb@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement26handleShadesVisibleChangedEb@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement27handleLabelsPositionChangedEv@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement29handleMinorGridVisibleChangedEb@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement30handleMinorArrowVisibleChangedEb@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement7clickedEv@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElement7isEmptyEv@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElementC1EPNS_13QAbstractAxisEP13QGraphicsItemb@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElementC2EPNS_13QAbstractAxisEP13QGraphicsItemb@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElementD0Ev@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElementD1Ev@Qt_5 5.10.1 - _ZN8QtCharts16ChartAxisElementD2Ev@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem10setToolTipERK7QString@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem11setGeometryERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem11setItemRectEv@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem12setSeriesPenERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem13setLabelBrushERK6QBrush@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem14setMarkerShapeENS_7QLegend11MarkerShapeE@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem14setSeriesBrushERK6QBrush@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem15hoverEnterEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem15hoverLeaveEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem17markerRectChangedEv@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem18setItemBrushAndPenEv@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem24updateMarkerShapeAndSizeEv@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem6setPenERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem7setFontERK5QFont@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem8setBrushERK6QBrush@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItem8setLabelE7QString@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItemC1EPNS_20QLegendMarkerPrivateEP15QGraphicsObject@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItemC2EPNS_20QLegendMarkerPrivateEP15QGraphicsObject@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItemD0Ev@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItemD1Ev@Qt_5 5.10.1 - _ZN8QtCharts16LegendMarkerItemD2Ev@Qt_5 5.10.1 - _ZN8QtCharts16LogXYPolarDomain10attachAxisEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts16LogXYPolarDomain10detachAxisEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts16LogXYPolarDomain11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts16LogXYPolarDomain11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts16LogXYPolarDomain16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts16LogXYPolarDomain31handleHorizontalAxisBaseChangedEd@Qt_5 5.10.1 - _ZN8QtCharts16LogXYPolarDomain4moveEdd@Qt_5 5.10.1 - _ZN8QtCharts16LogXYPolarDomain6zoomInERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts16LogXYPolarDomain7zoomOutERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts16LogXYPolarDomain8setRangeEdddd@Qt_5 5.10.1 - _ZN8QtCharts16LogXYPolarDomainC1EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts16LogXYPolarDomainC2EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts16LogXYPolarDomainD0Ev@Qt_5 5.10.1 - _ZN8QtCharts16LogXYPolarDomainD1Ev@Qt_5 5.10.1 - _ZN8QtCharts16LogXYPolarDomainD2Ev@Qt_5 5.10.1 - _ZN8QtCharts16PolarChartLayoutC1EPNS_14ChartPresenterE@Qt_5 5.10.1 - _ZN8QtCharts16PolarChartLayoutC2EPNS_14ChartPresenterE@Qt_5 5.10.1 - _ZN8QtCharts16PolarChartLayoutD0Ev@Qt_5 5.10.1 - _ZN8QtCharts16PolarChartLayoutD1Ev@Qt_5 5.10.1 - _ZN8QtCharts16PolarChartLayoutD2Ev@Qt_5 5.10.1 _ZN8QtCharts16QBarCategoryAxis10categoriesEv@Qt_5 5.7.1 _ZN8QtCharts16QBarCategoryAxis10maxChangedERK7QString@Qt_5 5.7.1 _ZN8QtCharts16QBarCategoryAxis10minChangedERK7QString@Qt_5 5.7.1 @@ -1274,26 +570,6 @@ _ZN8QtCharts16QPieLegendMarkerD0Ev@Qt_5 5.7.1 _ZN8QtCharts16QPieLegendMarkerD1Ev@Qt_5 5.7.1 _ZN8QtCharts16QPieLegendMarkerD2Ev@Qt_5 5.7.1 - _ZN8QtCharts16QPieSlicePrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivate12setAngleSpanEd@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivate12setLabelFontERK5QFontb@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivate13setLabelBrushERK6QBrushb@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivate13setPercentageEd@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivate13setStartAngleEd@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivate15explodedChangedEv@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivate20labelPositionChangedEv@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivate27labelArmLengthFactorChangedEv@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivate28explodeDistanceFactorChangedEv@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivate6setPenERK4QPenb@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivate8setBrushERK6QBrushb@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivate9fromSliceEPNS_9QPieSliceE@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivateC1EPNS_9QPieSliceE@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivateC2EPNS_9QPieSliceE@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts16QPieSlicePrivateD2Ev@Qt_5 5.10.1 _ZN8QtCharts16QVBarModelMapper11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.7.1 _ZN8QtCharts16QVBarModelMapper11qt_metacastEPKc@Qt_5 5.7.1 _ZN8QtCharts16QVBarModelMapper11setFirstRowEi@Qt_5 5.7.1 @@ -1328,78 +604,6 @@ _ZN8QtCharts16QVPieModelMapper9setSeriesEPNS_10QPieSeriesE@Qt_5 5.7.1 _ZN8QtCharts16QVPieModelMapperC1EP7QObject@Qt_5 5.7.1 _ZN8QtCharts16QVPieModelMapperC2EP7QObject@Qt_5 5.7.1 - _ZN8QtCharts16QXYSeriesPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts16QXYSeriesPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts16QXYSeriesPrivate14initializeAxesEv@Qt_5 5.10.1 - _ZN8QtCharts16QXYSeriesPrivate16initializeDomainEv@Qt_5 5.10.1 - _ZN8QtCharts16QXYSeriesPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts16QXYSeriesPrivate19createLegendMarkersEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts16QXYSeriesPrivate20initializeAnimationsE6QFlagsINS_6QChart15AnimationOptionEEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts16QXYSeriesPrivate21drawSeriesPointLabelsEP8QPainterRK7QVectorI7QPointFEi@Qt_5 5.10.1 - _ZN8QtCharts16QXYSeriesPrivate7updatedEv@Qt_5 5.10.1 - _ZN8QtCharts16QXYSeriesPrivateC1EPNS_9QXYSeriesE@Qt_5 5.10.1 - _ZN8QtCharts16QXYSeriesPrivateC2EPNS_9QXYSeriesE@Qt_5 5.10.1 - _ZN8QtCharts16ScatterAnimation11updateStateEN18QAbstractAnimation5StateES2_@Qt_5 5.10.1 - _ZN8QtCharts16ScatterAnimationC1EPNS_16ScatterChartItemEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts16ScatterAnimationC2EPNS_16ScatterChartItemEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts16ScatterAnimationD0Ev@Qt_5 5.10.1 - _ZN8QtCharts16ScatterAnimationD1Ev@Qt_5 5.10.1 - _ZN8QtCharts16ScatterAnimationD2Ev@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItem12createPointsEi@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItem12deletePointsEi@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItem13handleUpdatedEv@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItem13markerHoveredEP13QGraphicsItemb@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItem13markerPressedEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItem14markerReleasedEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItem14markerSelectedEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItem14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItem19markerDoubleClickedEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItem5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItem6setPenERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItem8setBrushERK6QBrush@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItemC1EPNS_14QScatterSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts16ScatterChartItemC2EPNS_14QScatterSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts16XLogYPolarDomain10attachAxisEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts16XLogYPolarDomain10detachAxisEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts16XLogYPolarDomain11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts16XLogYPolarDomain11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts16XLogYPolarDomain16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts16XLogYPolarDomain29handleVerticalAxisBaseChangedEd@Qt_5 5.10.1 - _ZN8QtCharts16XLogYPolarDomain4moveEdd@Qt_5 5.10.1 - _ZN8QtCharts16XLogYPolarDomain6zoomInERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts16XLogYPolarDomain7zoomOutERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts16XLogYPolarDomain8setRangeEdddd@Qt_5 5.10.1 - _ZN8QtCharts16XLogYPolarDomainC1EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts16XLogYPolarDomainC2EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts16XLogYPolarDomainD0Ev@Qt_5 5.10.1 - _ZN8QtCharts16XLogYPolarDomainD1Ev@Qt_5 5.10.1 - _ZN8QtCharts16XLogYPolarDomainD2Ev@Qt_5 5.10.1 - _ZN8QtCharts17ChartThemeManager11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts17ChartThemeManager11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts17ChartThemeManager12updateSeriesEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts17ChartThemeManager15handleAxisAddedEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts17ChartThemeManager16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts17ChartThemeManager17handleAxisRemovedEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts17ChartThemeManager17handleSeriesAddedEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts17ChartThemeManager19handleSeriesRemovedEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts17ChartThemeManager23generateSeriesGradientsERK5QListI6QColorE@Qt_5 5.10.1 - _ZN8QtCharts17ChartThemeManager7colorAtERK6QColorS3_d@Qt_5 5.10.1 - _ZN8QtCharts17ChartThemeManager7colorAtERK9QGradientd@Qt_5 5.10.1 - _ZN8QtCharts17ChartThemeManager8setThemeENS_6QChart10ChartThemeE@Qt_5 5.10.1 - _ZN8QtCharts17ChartThemeManagerC1EPNS_6QChartE@Qt_5 5.10.1 - _ZN8QtCharts17ChartThemeManagerC2EPNS_6QChartE@Qt_5 5.10.1 - _ZN8QtCharts17PieSliceAnimation11updateValueERKNS_12PieSliceDataE@Qt_5 5.10.1 - _ZN8QtCharts17PieSliceAnimation17currentSliceValueEv@Qt_5 5.10.1 - _ZN8QtCharts17PieSliceAnimation18updateCurrentValueERK8QVariant@Qt_5 5.10.1 - _ZN8QtCharts17PieSliceAnimation8setValueERKNS_12PieSliceDataES3_@Qt_5 5.10.1 - _ZN8QtCharts17PieSliceAnimationC1EPNS_12PieSliceItemE@Qt_5 5.10.1 - _ZN8QtCharts17PieSliceAnimationC2EPNS_12PieSliceItemE@Qt_5 5.10.1 - _ZN8QtCharts17PieSliceAnimationD0Ev@Qt_5 5.10.1 - _ZN8QtCharts17PieSliceAnimationD1Ev@Qt_5 5.10.1 - _ZN8QtCharts17PieSliceAnimationD2Ev@Qt_5 5.10.1 _ZN8QtCharts17QAreaLegendMarker11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.7.1 _ZN8QtCharts17QAreaLegendMarker11qt_metacastEPKc@Qt_5 5.7.1 _ZN8QtCharts17QAreaLegendMarker16staticMetaObjectE@Qt_5 5.7.1 @@ -1411,16 +615,6 @@ _ZN8QtCharts17QAreaLegendMarkerD0Ev@Qt_5 5.7.1 _ZN8QtCharts17QAreaLegendMarkerD1Ev@Qt_5 5.7.1 _ZN8QtCharts17QAreaLegendMarkerD2Ev@Qt_5 5.7.1 - _ZN8QtCharts17QBarSeriesPrivate16initializeDomainEv@Qt_5 5.10.1 - _ZN8QtCharts17QBarSeriesPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts17QBarSeriesPrivateC1EPNS_10QBarSeriesE@Qt_5 5.10.1 - _ZN8QtCharts17QBarSeriesPrivateC2EPNS_10QBarSeriesE@Qt_5 5.10.1 - _ZN8QtCharts17QChartViewPrivate6resizeEv@Qt_5 5.10.1 - _ZN8QtCharts17QChartViewPrivate8setChartEPNS_6QChartE@Qt_5 5.10.1 - _ZN8QtCharts17QChartViewPrivateC1EPNS_10QChartViewEPNS_6QChartE@Qt_5 5.10.1 - _ZN8QtCharts17QChartViewPrivateC2EPNS_10QChartViewEPNS_6QChartE@Qt_5 5.10.1 - _ZN8QtCharts17QChartViewPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts17QChartViewPrivateD2Ev@Qt_5 5.10.1 _ZN8QtCharts17QPercentBarSeries11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.7.1 _ZN8QtCharts17QPercentBarSeries11qt_metacastEPKc@Qt_5 5.7.1 _ZN8QtCharts17QPercentBarSeries16staticMetaObjectE@Qt_5 5.7.1 @@ -1429,35 +623,6 @@ _ZN8QtCharts17QPercentBarSeriesD0Ev@Qt_5 5.7.1 _ZN8QtCharts17QPercentBarSeriesD1Ev@Qt_5 5.7.1 _ZN8QtCharts17QPercentBarSeriesD2Ev@Qt_5 5.7.1 - _ZN8QtCharts17QPieSeriesPrivate10fromSeriesEPNS_10QPieSeriesE@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate12sliceClickedEv@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate12sliceHoveredEb@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate12slicePressedEv@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate13sliceReleasedEv@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate14initializeAxesEv@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate14pieSizeChangedEv@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate15initializeThemeEiPNS_10ChartThemeEb@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate16initializeDomainEv@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate17sliceValueChangedEv@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate18pieEndAngleChangedEv@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate18sliceDoubleClickedEv@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate19createLegendMarkersEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate20initializeAnimationsE6QFlagsINS_6QChart15AnimationOptionEEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate20pieStartAngleChangedEv@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate20updateDerivativeDataEv@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate21calculatedDataChangedEv@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate23verticalPositionChangedEv@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate25horizontalPositionChangedEv@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivate8setSizesEdd@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivateC1EPNS_10QPieSeriesE@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivateC2EPNS_10QPieSeriesE@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts17QPieSeriesPrivateD2Ev@Qt_5 5.10.1 _ZN8QtCharts17QStackedBarSeries11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.7.1 _ZN8QtCharts17QStackedBarSeries11qt_metacastEPKc@Qt_5 5.7.1 _ZN8QtCharts17QStackedBarSeries16staticMetaObjectE@Qt_5 5.7.1 @@ -1466,106 +631,6 @@ _ZN8QtCharts17QStackedBarSeriesD0Ev@Qt_5 5.7.1 _ZN8QtCharts17QStackedBarSeriesD1Ev@Qt_5 5.7.1 _ZN8QtCharts17QStackedBarSeriesD2Ev@Qt_5 5.7.1 - _ZN8QtCharts17QValueAxisPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts17QValueAxisPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts17QValueAxisPrivate16initializeDomainEPNS_14AbstractDomainE@Qt_5 5.10.1 - _ZN8QtCharts17QValueAxisPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts17QValueAxisPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts17QValueAxisPrivate6setMaxERK8QVariant@Qt_5 5.10.1 - _ZN8QtCharts17QValueAxisPrivate6setMinERK8QVariant@Qt_5 5.10.1 - _ZN8QtCharts17QValueAxisPrivate8setRangeERK8QVariantS3_@Qt_5 5.10.1 - _ZN8QtCharts17QValueAxisPrivate8setRangeEdd@Qt_5 5.10.1 - _ZN8QtCharts17QValueAxisPrivateC1EPNS_10QValueAxisE@Qt_5 5.10.1 - _ZN8QtCharts17QValueAxisPrivateC2EPNS_10QValueAxisE@Qt_5 5.10.1 - _ZN8QtCharts17QValueAxisPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts17QValueAxisPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts17QValueAxisPrivateD2Ev@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis11createItemsEi@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis11deleteItemsEi@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis11setGeometryERK6QRectFS3_@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis12updateLayoutER7QVectorIdE@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis20handleGridPenChangedERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis20updateMinorTickItemsEv@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis21handleArrowPenChangedERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis22handleShadesPenChangedERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis24handleShadesBrushChangedERK6QBrush@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis25handleMinorGridPenChangedERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis26handleGridLineColorChangedERK6QColor@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis26handleMinorArrowPenChangedERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis31handleMinorGridLineColorChangedERK6QColor@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxis7isEmptyEv@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxisC1EPNS_13QAbstractAxisEP13QGraphicsItemb@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxisC2EPNS_13QAbstractAxisEP13QGraphicsItemb@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxisD0Ev@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxisD1Ev@Qt_5 5.10.1 - _ZN8QtCharts18CartesianChartAxisD2Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisX11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisX11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisX14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisX16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisX23handleCategoriesChangedEv@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisXC1EPNS_13QCategoryAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisXC2EPNS_13QCategoryAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisXD0Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisXD1Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisXD2Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisY11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisY11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisY14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisY16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisY23handleCategoriesChangedEv@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisYC1EPNS_13QCategoryAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisYC2EPNS_13QCategoryAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisYD0Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisYD1Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartCategoryAxisYD2Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisX11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisX11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisX14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisX16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisX19handleFormatChangedERK7QString@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisX22handleTickCountChangedEi@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisXC1EPNS_13QDateTimeAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisXC2EPNS_13QDateTimeAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisXD0Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisXD1Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisXD2Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisY11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisY11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisY14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisY16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisY19handleFormatChangedERK7QString@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisY22handleTickCountChangedEi@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisYC1EPNS_13QDateTimeAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisYC2EPNS_13QDateTimeAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisYD0Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisYD1Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartDateTimeAxisYD2Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisX11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisX11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisX14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisX16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisX17handleBaseChangedEd@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisX24handleLabelFormatChangedERK7QString@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisXC1EPNS_13QLogValueAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisXC2EPNS_13QLogValueAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisXD0Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisXD1Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisXD2Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisY11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisY11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisY14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisY16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisY17handleBaseChangedEd@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisY24handleLabelFormatChangedERK7QString@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisYC1EPNS_13QLogValueAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisYC2EPNS_13QLogValueAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisYD0Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisYD1Ev@Qt_5 5.10.1 - _ZN8QtCharts18ChartLogValueAxisYD2Ev@Qt_5 5.10.1 _ZN8QtCharts18QAbstractBarSeries11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.7.1 _ZN8QtCharts18QAbstractBarSeries11qt_metacastEPKc@Qt_5 5.7.1 _ZN8QtCharts18QAbstractBarSeries11setBarWidthEd@Qt_5 5.7.1 @@ -1579,11 +644,9 @@ _ZN8QtCharts18QAbstractBarSeries16staticMetaObjectE@Qt_5 5.7.1 _ZN8QtCharts18QAbstractBarSeries17setLabelsPositionENS0_14LabelsPositionE@Qt_5 5.7.1 _ZN8QtCharts18QAbstractBarSeries18labelsAngleChangedEd@Qt_5 5.7.1 - _ZN8QtCharts18QAbstractBarSeries18setLabelsPrecisionEi@Qt_5 5.11.1 _ZN8QtCharts18QAbstractBarSeries19labelsFormatChangedERK7QString@Qt_5 5.7.1 _ZN8QtCharts18QAbstractBarSeries20labelsVisibleChangedEv@Qt_5 5.7.1 _ZN8QtCharts18QAbstractBarSeries21labelsPositionChangedENS0_14LabelsPositionE@Qt_5 5.7.1 - _ZN8QtCharts18QAbstractBarSeries22labelsPrecisionChangedEi@Qt_5 5.11.1 _ZN8QtCharts18QAbstractBarSeries4takeEPNS_7QBarSetE@Qt_5 5.7.1 _ZN8QtCharts18QAbstractBarSeries5clearEv@Qt_5 5.7.1 _ZN8QtCharts18QAbstractBarSeries6appendE5QListIPNS_7QBarSetEE@Qt_5 5.7.1 @@ -1599,18 +662,6 @@ _ZN8QtCharts18QAbstractBarSeriesD0Ev@Qt_5 5.7.1 _ZN8QtCharts18QAbstractBarSeriesD1Ev@Qt_5 5.7.1 _ZN8QtCharts18QAbstractBarSeriesD2Ev@Qt_5 5.7.1 - _ZN8QtCharts18QAreaSeriesPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts18QAreaSeriesPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts18QAreaSeriesPrivate14initializeAxesEv@Qt_5 5.10.1 - _ZN8QtCharts18QAreaSeriesPrivate15initializeThemeEiPNS_10ChartThemeEb@Qt_5 5.10.1 - _ZN8QtCharts18QAreaSeriesPrivate16initializeDomainEv@Qt_5 5.10.1 - _ZN8QtCharts18QAreaSeriesPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts18QAreaSeriesPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts18QAreaSeriesPrivate19createLegendMarkersEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts18QAreaSeriesPrivate20initializeAnimationsE6QFlagsINS_6QChart15AnimationOptionEEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts18QAreaSeriesPrivate7updatedEv@Qt_5 5.10.1 - _ZN8QtCharts18QAreaSeriesPrivateC1EPNS_11QLineSeriesES2_PNS_11QAreaSeriesE@Qt_5 5.10.1 - _ZN8QtCharts18QAreaSeriesPrivateC2EPNS_11QLineSeriesES2_PNS_11QAreaSeriesE@Qt_5 5.10.1 _ZN8QtCharts18QCandlestickSeries10penChangedEv@Qt_5 5.9.0~rc _ZN8QtCharts18QCandlestickSeries11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.9.0~rc _ZN8QtCharts18QCandlestickSeries11qt_metacastEPKc@Qt_5 5.9.0~rc @@ -1654,46 +705,6 @@ _ZN8QtCharts18QCandlestickSeriesD0Ev@Qt_5 5.9.0~rc _ZN8QtCharts18QCandlestickSeriesD1Ev@Qt_5 5.9.0~rc _ZN8QtCharts18QCandlestickSeriesD2Ev@Qt_5 5.9.0~rc - _ZN8QtCharts18QLineSeriesPrivate15initializeThemeEiPNS_10ChartThemeEb@Qt_5 5.10.1 - _ZN8QtCharts18QLineSeriesPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts18QLineSeriesPrivateC1EPNS_11QLineSeriesE@Qt_5 5.10.1 - _ZN8QtCharts18QLineSeriesPrivateC2EPNS_11QLineSeriesE@Qt_5 5.10.1 - _ZN8QtCharts19AbstractChartLayout10setMarginsERK8QMargins@Qt_5 5.10.1 - _ZN8QtCharts19AbstractChartLayout11setGeometryERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts19AbstractChartLayoutC1EPNS_14ChartPresenterE@Qt_5 5.10.1 - _ZN8QtCharts19AbstractChartLayoutC2EPNS_14ChartPresenterE@Qt_5 5.10.1 - _ZN8QtCharts19AbstractChartLayoutD0Ev@Qt_5 5.10.1 - _ZN8QtCharts19AbstractChartLayoutD1Ev@Qt_5 5.10.1 - _ZN8QtCharts19AbstractChartLayoutD2Ev@Qt_5 5.10.1 - _ZN8QtCharts19LogXLogYPolarDomain10attachAxisEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts19LogXLogYPolarDomain10detachAxisEPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts19LogXLogYPolarDomain11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts19LogXLogYPolarDomain11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts19LogXLogYPolarDomain16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts19LogXLogYPolarDomain29handleVerticalAxisBaseChangedEd@Qt_5 5.10.1 - _ZN8QtCharts19LogXLogYPolarDomain31handleHorizontalAxisBaseChangedEd@Qt_5 5.10.1 - _ZN8QtCharts19LogXLogYPolarDomain4moveEdd@Qt_5 5.10.1 - _ZN8QtCharts19LogXLogYPolarDomain6zoomInERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts19LogXLogYPolarDomain7zoomOutERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts19LogXLogYPolarDomain8setRangeEdddd@Qt_5 5.10.1 - _ZN8QtCharts19LogXLogYPolarDomainC1EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts19LogXLogYPolarDomainC2EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts19LogXLogYPolarDomainD0Ev@Qt_5 5.10.1 - _ZN8QtCharts19LogXLogYPolarDomainD1Ev@Qt_5 5.10.1 - _ZN8QtCharts19LogXLogYPolarDomainD2Ev@Qt_5 5.10.1 - _ZN8QtCharts19PercentBarChartItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts19PercentBarChartItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts19PercentBarChartItem12topLeftPointEidd@Qt_5 5.10.1 - _ZN8QtCharts19PercentBarChartItem14positionLabelsEv@Qt_5 5.10.1 - _ZN8QtCharts19PercentBarChartItem15calculateLayoutEv@Qt_5 5.10.1 - _ZN8QtCharts19PercentBarChartItem15markLabelsDirtyEPNS_7QBarSetEii@Qt_5 5.10.1 - _ZN8QtCharts19PercentBarChartItem16bottomRightPointEidd@Qt_5 5.10.1 - _ZN8QtCharts19PercentBarChartItem16initializeLayoutEiiib@Qt_5 5.10.1 - _ZN8QtCharts19PercentBarChartItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts19PercentBarChartItem17generateLabelTextEiid@Qt_5 5.10.1 - _ZN8QtCharts19PercentBarChartItem27handleLabelsPositionChangedEv@Qt_5 5.10.1 - _ZN8QtCharts19PercentBarChartItemC1EPNS_18QAbstractBarSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts19PercentBarChartItemC2EPNS_18QAbstractBarSeriesEP13QGraphicsItem@Qt_5 5.10.1 _ZN8QtCharts19QBoxPlotModelMapper11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.7.1 _ZN8QtCharts19QBoxPlotModelMapper11qt_metacastEPKc@Qt_5 5.7.1 _ZN8QtCharts19QBoxPlotModelMapper14setOrientationEN2Qt11OrientationE@Qt_5 5.7.1 @@ -1706,139 +717,6 @@ _ZN8QtCharts19QBoxPlotModelMapper9setSeriesEPNS_14QBoxPlotSeriesE@Qt_5 5.7.1 _ZN8QtCharts19QBoxPlotModelMapperC1EP7QObject@Qt_5 5.7.1 _ZN8QtCharts19QBoxPlotModelMapperC2EP7QObject@Qt_5 5.7.1 - _ZN8QtCharts19StackedBarChartItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts19StackedBarChartItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts19StackedBarChartItem12topLeftPointEidd@Qt_5 5.10.1 - _ZN8QtCharts19StackedBarChartItem14positionLabelsEv@Qt_5 5.10.1 - _ZN8QtCharts19StackedBarChartItem15calculateLayoutEv@Qt_5 5.10.1 - _ZN8QtCharts19StackedBarChartItem16bottomRightPointEidd@Qt_5 5.10.1 - _ZN8QtCharts19StackedBarChartItem16initializeLayoutEiiib@Qt_5 5.10.1 - _ZN8QtCharts19StackedBarChartItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts19StackedBarChartItem27handleLabelsPositionChangedEv@Qt_5 5.10.1 - _ZN8QtCharts19StackedBarChartItemC1EPNS_18QAbstractBarSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts19StackedBarChartItemC2EPNS_18QAbstractBarSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts19qt_allocate_bar_setE@Qt_5 5.12.2 - _ZN8QtCharts20AbstractBarChartItem11applyLayoutERK7QVectorI6QRectFE@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem12setAnimationEPNS_12BarAnimationE@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem14positionLabelsEv@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem14resetAnimationEv@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem14updateBarItemsEv@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem15markLabelsDirtyEPNS_7QBarSetEii@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem16createLabelItemsEv@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem17generateLabelTextEiid@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem17handleBarValueAddEiiPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem17handleSeriesAddedEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem17handleUpdatedBarsEv@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem19handleDomainUpdatedEv@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem19handleLayoutChangedEv@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem19handleSeriesRemovedEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem20handleBarValueChangeEiPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem20handleBarValueRemoveEiiPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem20handleOpacityChangedEv@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem20handleVisibleChangedEv@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem20initializeFullLayoutEv@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem22positionLabelsVerticalEv@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem24handleSetStructureChangeEv@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem26handleDataStructureChangedEv@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem26handleLabelsVisibleChangedEb@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem27handleLabelsPositionChangedEv@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem41calculateSeriesPositionAdjustmentAndWidthEv@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItem9setLayoutERK7QVectorI6QRectFE@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItemC1EPNS_18QAbstractBarSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItemC2EPNS_18QAbstractBarSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItemD0Ev@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItemD1Ev@Qt_5 5.10.1 - _ZN8QtCharts20AbstractBarChartItemD2Ev@Qt_5 5.10.1 - _ZN8QtCharts20BoxWhiskersAnimation10setEndDataERKNS_15BoxWhiskersDataE@Qt_5 5.10.1 - _ZN8QtCharts20BoxWhiskersAnimation11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts20BoxWhiskersAnimation11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts20BoxWhiskersAnimation12setStartDataERKNS_15BoxWhiskersDataE@Qt_5 5.10.1 - _ZN8QtCharts20BoxWhiskersAnimation16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts20BoxWhiskersAnimation18updateCurrentValueERK8QVariant@Qt_5 5.10.1 - _ZN8QtCharts20BoxWhiskersAnimation5setupERKNS_15BoxWhiskersDataES3_@Qt_5 5.10.1 - _ZN8QtCharts20BoxWhiskersAnimationC1EPNS_11BoxWhiskersEPNS_16BoxPlotAnimationEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts20BoxWhiskersAnimationC2EPNS_11BoxWhiskersEPNS_16BoxPlotAnimationEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts20BoxWhiskersAnimationD0Ev@Qt_5 5.10.1 - _ZN8QtCharts20BoxWhiskersAnimationD1Ev@Qt_5 5.10.1 - _ZN8QtCharts20BoxWhiskersAnimationD2Ev@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickAnimation11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickAnimation11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickAnimation14addCandlestickEPNS_11CandlestickE@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickAnimation16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickAnimation17setAnimationStartEPNS_11CandlestickE@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickAnimation20candlestickAnimationEPNS_11CandlestickE@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickAnimation26candlestickChangeAnimationEPNS_11CandlestickE@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickAnimation26removeCandlestickAnimationEPNS_11CandlestickE@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickAnimation7stopAllEv@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickAnimationC1EPNS_20CandlestickChartItemEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickAnimationC2EPNS_20CandlestickChartItemEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickAnimationD0Ev@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickAnimationD1Ev@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickAnimationD2Ev@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem12addTimestampEd@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem12setAnimationEPNS_20CandlestickAnimationE@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem15removeTimestampEd@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem16updateTimePeriodEv@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem19handleDomainUpdatedEv@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem19handleLayoutUpdatedEv@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem24handleCandlestickSetsAddERK5QListIPNS_15QCandlestickSetEE@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem25handleCandlesticksUpdatedEv@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem25updateCandlestickGeometryEPNS_11CandlestickEi@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem26handleDataStructureChangedEv@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem27handleCandlestickSetsRemoveERK5QListIPNS_15QCandlestickSetEE@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem27updateCandlestickAppearanceEPNS_11CandlestickEPNS_15QCandlestickSetE@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem29handleCandlestickSeriesChangeEv@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItem5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItemC1EPNS_18QCandlestickSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItemC2EPNS_18QCandlestickSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItemD0Ev@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItemD1Ev@Qt_5 5.10.1 - _ZN8QtCharts20CandlestickChartItemD2Ev@Qt_5 5.10.1 - _ZN8QtCharts20CartesianChartLayoutC1EPNS_14ChartPresenterE@Qt_5 5.10.1 - _ZN8QtCharts20CartesianChartLayoutC2EPNS_14ChartPresenterE@Qt_5 5.10.1 - _ZN8QtCharts20CartesianChartLayoutD0Ev@Qt_5 5.10.1 - _ZN8QtCharts20CartesianChartLayoutD1Ev@Qt_5 5.10.1 - _ZN8QtCharts20CartesianChartLayoutD2Ev@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadial11createItemsEi@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadial11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadial11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadial14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadial16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadial19preferredAxisRadiusERK6QSizeF@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadial20handleGridPenChangedERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadial20updateMinorTickItemsEv@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadial21handleArrowPenChangedERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadial23updateMinorTickGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadial25handleMinorGridPenChangedERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadial26handleGridLineColorChangedERK6QColor@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadial26handleMinorArrowPenChangedERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadial31handleMinorGridLineColorChangedERK6QColor@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadialC1EPNS_13QAbstractAxisEP13QGraphicsItemb@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadialC2EPNS_13QAbstractAxisEP13QGraphicsItemb@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadialD0Ev@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadialD1Ev@Qt_5 5.10.1 - _ZN8QtCharts20PolarChartAxisRadialD2Ev@Qt_5 5.10.1 - _ZN8QtCharts20QAbstractAxisPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts20QAbstractAxisPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts20QAbstractAxisPrivate12rangeChangedEdd@Qt_5 5.10.1 - _ZN8QtCharts20QAbstractAxisPrivate12setAlignmentE6QFlagsIN2Qt13AlignmentFlagEE@Qt_5 5.10.1 - _ZN8QtCharts20QAbstractAxisPrivate15initializeThemeEPNS_10ChartThemeEb@Qt_5 5.10.1 - _ZN8QtCharts20QAbstractAxisPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts20QAbstractAxisPrivate18handleRangeChangedEdd@Qt_5 5.10.1 - _ZN8QtCharts20QAbstractAxisPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts20QAbstractAxisPrivate20initializeAnimationsE6QFlagsINS_6QChart15AnimationOptionEEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts20QAbstractAxisPrivateC1EPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts20QAbstractAxisPrivateC2EPNS_13QAbstractAxisE@Qt_5 5.10.1 - _ZN8QtCharts20QAbstractAxisPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts20QAbstractAxisPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts20QAbstractAxisPrivateD2Ev@Qt_5 5.10.1 _ZN8QtCharts20QBoxPlotLegendMarker11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.7.1 _ZN8QtCharts20QBoxPlotLegendMarker11qt_metacastEPKc@Qt_5 5.7.1 _ZN8QtCharts20QBoxPlotLegendMarker16staticMetaObjectE@Qt_5 5.7.1 @@ -1850,29 +728,6 @@ _ZN8QtCharts20QBoxPlotLegendMarkerD0Ev@Qt_5 5.7.1 _ZN8QtCharts20QBoxPlotLegendMarkerD1Ev@Qt_5 5.7.1 _ZN8QtCharts20QBoxPlotLegendMarkerD2Ev@Qt_5 5.7.1 - _ZN8QtCharts20QCategoryAxisPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts20QCategoryAxisPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts20QCategoryAxisPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts20QCategoryAxisPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts20QCategoryAxisPrivateC1EPNS_13QCategoryAxisE@Qt_5 5.10.1 - _ZN8QtCharts20QCategoryAxisPrivateC2EPNS_13QCategoryAxisE@Qt_5 5.10.1 - _ZN8QtCharts20QCategoryAxisPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts20QCategoryAxisPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts20QCategoryAxisPrivateD2Ev@Qt_5 5.10.1 - _ZN8QtCharts20QDateTimeAxisPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts20QDateTimeAxisPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts20QDateTimeAxisPrivate16initializeDomainEPNS_14AbstractDomainE@Qt_5 5.10.1 - _ZN8QtCharts20QDateTimeAxisPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts20QDateTimeAxisPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts20QDateTimeAxisPrivate6setMaxERK8QVariant@Qt_5 5.10.1 - _ZN8QtCharts20QDateTimeAxisPrivate6setMinERK8QVariant@Qt_5 5.10.1 - _ZN8QtCharts20QDateTimeAxisPrivate8setRangeERK8QVariantS3_@Qt_5 5.10.1 - _ZN8QtCharts20QDateTimeAxisPrivate8setRangeEdd@Qt_5 5.10.1 - _ZN8QtCharts20QDateTimeAxisPrivateC1EPNS_13QDateTimeAxisE@Qt_5 5.10.1 - _ZN8QtCharts20QDateTimeAxisPrivateC2EPNS_13QDateTimeAxisE@Qt_5 5.10.1 - _ZN8QtCharts20QDateTimeAxisPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts20QDateTimeAxisPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts20QDateTimeAxisPrivateD2Ev@Qt_5 5.10.1 _ZN8QtCharts20QHBoxPlotModelMapper11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.9.0~rc _ZN8QtCharts20QHBoxPlotModelMapper11qt_metacastEPKc@Qt_5 5.9.0~rc _ZN8QtCharts20QHBoxPlotModelMapper13modelReplacedEv@Qt_5 5.9.0~rc @@ -1898,40 +753,6 @@ _ZN8QtCharts20QHorizontalBarSeriesD0Ev@Qt_5 5.7.1 _ZN8QtCharts20QHorizontalBarSeriesD1Ev@Qt_5 5.7.1 _ZN8QtCharts20QHorizontalBarSeriesD2Ev@Qt_5 5.7.1 - _ZN8QtCharts20QLegendMarkerPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts20QLegendMarkerPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts20QLegendMarkerPrivate16invalidateLegendEv@Qt_5 5.10.1 - _ZN8QtCharts20QLegendMarkerPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts20QLegendMarkerPrivate17handleShapeChangeEv@Qt_5 5.10.1 - _ZN8QtCharts20QLegendMarkerPrivate18invalidateAllItemsEv@Qt_5 5.10.1 - _ZN8QtCharts20QLegendMarkerPrivateC1EPNS_13QLegendMarkerEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts20QLegendMarkerPrivateC2EPNS_13QLegendMarkerEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts20QLegendMarkerPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts20QLegendMarkerPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts20QLegendMarkerPrivateD2Ev@Qt_5 5.10.1 - _ZN8QtCharts20QLogValueAxisPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts20QLogValueAxisPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts20QLogValueAxisPrivate15updateTickCountEv@Qt_5 5.10.1 - _ZN8QtCharts20QLogValueAxisPrivate16initializeDomainEPNS_14AbstractDomainE@Qt_5 5.10.1 - _ZN8QtCharts20QLogValueAxisPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts20QLogValueAxisPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts20QLogValueAxisPrivate6setMaxERK8QVariant@Qt_5 5.10.1 - _ZN8QtCharts20QLogValueAxisPrivate6setMinERK8QVariant@Qt_5 5.10.1 - _ZN8QtCharts20QLogValueAxisPrivate8setRangeERK8QVariantS3_@Qt_5 5.10.1 - _ZN8QtCharts20QLogValueAxisPrivate8setRangeEdd@Qt_5 5.10.1 - _ZN8QtCharts20QLogValueAxisPrivateC1EPNS_13QLogValueAxisE@Qt_5 5.10.1 - _ZN8QtCharts20QLogValueAxisPrivateC2EPNS_13QLogValueAxisE@Qt_5 5.10.1 - _ZN8QtCharts20QLogValueAxisPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts20QLogValueAxisPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts20QLogValueAxisPrivateD2Ev@Qt_5 5.10.1 - _ZN8QtCharts20QSplineSeriesPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts20QSplineSeriesPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts20QSplineSeriesPrivate15initializeThemeEiPNS_10ChartThemeEb@Qt_5 5.10.1 - _ZN8QtCharts20QSplineSeriesPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts20QSplineSeriesPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts20QSplineSeriesPrivate20initializeAnimationsE6QFlagsINS_6QChart15AnimationOptionEEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts20QSplineSeriesPrivateC1EPNS_13QSplineSeriesE@Qt_5 5.10.1 - _ZN8QtCharts20QSplineSeriesPrivateC2EPNS_13QSplineSeriesE@Qt_5 5.10.1 _ZN8QtCharts20QVBoxPlotModelMapper11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.7.1 _ZN8QtCharts20QVBoxPlotModelMapper11qt_metacastEPKc@Qt_5 5.7.1 _ZN8QtCharts20QVBoxPlotModelMapper11setFirstRowEi@Qt_5 5.7.1 @@ -1949,247 +770,6 @@ _ZN8QtCharts20QVBoxPlotModelMapper9setSeriesEPNS_14QBoxPlotSeriesE@Qt_5 5.7.1 _ZN8QtCharts20QVBoxPlotModelMapperC1EP7QObject@Qt_5 5.7.1 _ZN8QtCharts20QVBoxPlotModelMapperC2EP7QObject@Qt_5 5.7.1 - _ZN8QtCharts21ChartBarCategoryAxisX11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisX11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisX14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisX16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisX23handleCategoriesChangedEv@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisXC1EPNS_16QBarCategoryAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisXC2EPNS_16QBarCategoryAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisXD0Ev@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisXD1Ev@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisXD2Ev@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisY11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisY11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisY14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisY16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisY23handleCategoriesChangedEv@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisYC1EPNS_16QBarCategoryAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisYC2EPNS_16QBarCategoryAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisYD0Ev@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisYD1Ev@Qt_5 5.10.1 - _ZN8QtCharts21ChartBarCategoryAxisYD2Ev@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManager11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManager11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManager12removeSeriesEPKNS_9QXYSeriesE@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManager13seriesRemovedEPKNS_9QXYSeriesE@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManager16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManager21handleSeriesPenChangeEv@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManager24handleAxisReverseChangedERK5QListIPNS_15QAbstractSeriesEE@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManager24handleScatterColorChangeEv@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManager24handleSeriesOpenGLChangeEv@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManager28handleSeriesVisibilityChangeEv@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManager29handleScatterMarkerSizeChangeEv@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManager7cleanupEv@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManager9setPointsEPNS_9QXYSeriesEPKNS_14AbstractDomainE@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManagerC1EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManagerC2EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManagerD0Ev@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManagerD1Ev@Qt_5 5.10.1 - _ZN8QtCharts21GLXYSeriesDataManagerD2Ev@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngular11createItemsEi@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngular11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngular11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngular14updateGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngular16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngular19preferredAxisRadiusERK6QSizeF@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngular20handleGridPenChangedERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngular20updateMinorTickItemsEv@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngular21handleArrowPenChangedERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngular23updateMinorTickGeometryEv@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngular25handleMinorGridPenChangedERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngular26handleGridLineColorChangedERK6QColor@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngular26handleMinorArrowPenChangedERK4QPen@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngular31handleMinorGridLineColorChangedERK6QColor@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngularC1EPNS_13QAbstractAxisEP13QGraphicsItemb@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngularC2EPNS_13QAbstractAxisEP13QGraphicsItemb@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngularD0Ev@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngularD1Ev@Qt_5 5.10.1 - _ZN8QtCharts21PolarChartAxisAngularD2Ev@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate12updatedBoxesEv@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate13doubleClickedEiPNS_7QBoxSetE@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate13updatedLayoutEv@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate14initializeAxesEv@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate15initializeThemeEiPNS_10ChartThemeEb@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate16initializeDomainEv@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate17restructuredBoxesEv@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate18handleSeriesChangeEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate18handleSeriesRemoveEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate18populateCategoriesEPNS_16QBarCategoryAxisE@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate19createLegendMarkersEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate20initializeAnimationsE6QFlagsINS_6QChart15AnimationOptionEEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate3maxEv@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate3minEv@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate6appendE5QListIPNS_7QBoxSetEE@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate6appendEPNS_7QBoxSetE@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate6insertEiPNS_7QBoxSetE@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate6removeE5QListIPNS_7QBoxSetEE@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate6removeEPNS_7QBoxSetE@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate7clickedEiPNS_7QBoxSetE@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate7pressedEiPNS_7QBoxSetE@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate7updatedEv@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate8boxSetAtEi@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivate8releasedEiPNS_7QBoxSetE@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivateC1EPNS_14QBoxPlotSeriesE@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivateC2EPNS_14QBoxPlotSeriesE@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts21QBoxPlotSeriesPrivateD2Ev@Qt_5 5.10.1 - _ZN8QtCharts21QScatterSeriesPrivate15initializeThemeEiPNS_10ChartThemeEb@Qt_5 5.10.1 - _ZN8QtCharts21QScatterSeriesPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts21QScatterSeriesPrivate20initializeAnimationsE6QFlagsINS_6QChart15AnimationOptionEEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts21QScatterSeriesPrivateC1EPNS_14QScatterSeriesE@Qt_5 5.10.1 - _ZN8QtCharts21QScatterSeriesPrivateC2EPNS_14QScatterSeriesE@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate10insertDataEii@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate10removeDataEii@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate11xModelIndexEi@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate11yModelIndexEi@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate12modelUpdatedE11QModelIndexS1_@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate14modelRowsAddedE11QModelIndexii@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate14valueFromModelE11QModelIndex@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate15setValueToModelE11QModelIndexd@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate16handlePointAddedEi@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate16modelRowsRemovedE11QModelIndexii@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate17blockModelSignalsEb@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate17modelColumnsAddedE11QModelIndexii@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate18blockSeriesSignalsEb@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate18handlePointRemovedEi@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate19handlePointReplacedEi@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate19handlePointsRemovedEii@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate19modelColumnsRemovedE11QModelIndexii@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate20handleModelDestroyedEv@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate21handleSeriesDestroyedEv@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivate21initializeXYFromModelEv@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivateC1EPNS_14QXYModelMapperE@Qt_5 5.10.1 - _ZN8QtCharts21QXYModelMapperPrivateC2EPNS_14QXYModelMapperE@Qt_5 5.10.1 - _ZN8QtCharts22HorizontalBarChartItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts22HorizontalBarChartItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts22HorizontalBarChartItem12topLeftPointEiiidd@Qt_5 5.10.1 - _ZN8QtCharts22HorizontalBarChartItem15calculateLayoutEv@Qt_5 5.10.1 - _ZN8QtCharts22HorizontalBarChartItem16bottomRightPointEiiidd@Qt_5 5.10.1 - _ZN8QtCharts22HorizontalBarChartItem16initializeLayoutEiiib@Qt_5 5.10.1 - _ZN8QtCharts22HorizontalBarChartItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts22HorizontalBarChartItemC1EPNS_18QAbstractBarSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts22HorizontalBarChartItemC2EPNS_18QAbstractBarSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts22QAbstractSeriesPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts22QAbstractSeriesPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts22QAbstractSeriesPrivate12countChangedEv@Qt_5 5.10.1 - _ZN8QtCharts22QAbstractSeriesPrivate12setPresenterEPNS_14ChartPresenterE@Qt_5 5.10.1 - _ZN8QtCharts22QAbstractSeriesPrivate14setBlockOpenGLEb@Qt_5 5.10.1 - _ZN8QtCharts22QAbstractSeriesPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts22QAbstractSeriesPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts22QAbstractSeriesPrivate20initializeAnimationsE6QFlagsINS_6QChart15AnimationOptionEEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts22QAbstractSeriesPrivate9setDomainEPNS_14AbstractDomainE@Qt_5 5.10.1 - _ZN8QtCharts22QAbstractSeriesPrivateC1EPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts22QAbstractSeriesPrivateC2EPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts22QAbstractSeriesPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts22QAbstractSeriesPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts22QAbstractSeriesPrivateD2Ev@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate10insertDataEii@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate10removeDataEii@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate11valuesAddedEii@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate12barSetsAddedE5QListIPNS_7QBarSetEE@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate12modelUpdatedE11QModelIndexS1_@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate13barModelIndexEii@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate13valuesRemovedEii@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate14barSetsRemovedE5QListIPNS_7QBarSetEE@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate14modelRowsAddedE11QModelIndexii@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate15barLabelChangedEv@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate15barValueChangedEi@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate16modelRowsRemovedE11QModelIndexii@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate17blockModelSignalsEb@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate17modelColumnsAddedE11QModelIndexii@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate18blockSeriesSignalsEb@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate19modelColumnsRemovedE11QModelIndexii@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate20handleModelDestroyedEv@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate21handleSeriesDestroyedEv@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate22initializeBarFromModelEv@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate22modelHeaderDataUpdatedEN2Qt11OrientationEii@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivate6barSetE11QModelIndex@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivateC1EPNS_15QBarModelMapperE@Qt_5 5.10.1 - _ZN8QtCharts22QBarModelMapperPrivateC2EPNS_15QBarModelMapperE@Qt_5 5.10.1 - _ZN8QtCharts22QCandlestickSetPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts22QCandlestickSetPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts22QCandlestickSetPrivate12setTimestampEd@Qt_5 5.10.1 - _ZN8QtCharts22QCandlestickSetPrivate13updatedLayoutEv@Qt_5 5.10.1 - _ZN8QtCharts22QCandlestickSetPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts22QCandlestickSetPrivate18updatedCandlestickEv@Qt_5 5.10.1 - _ZN8QtCharts22QCandlestickSetPrivateC1EdPNS_15QCandlestickSetE@Qt_5 5.10.1 - _ZN8QtCharts22QCandlestickSetPrivateC2EdPNS_15QCandlestickSetE@Qt_5 5.10.1 - _ZN8QtCharts22QCandlestickSetPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts22QCandlestickSetPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts22QCandlestickSetPrivateD2Ev@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate10insertDataEii@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate10removeDataEii@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate11slicesAddedE5QListIPNS_9QPieSliceEE@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate12modelUpdatedE11QModelIndexS1_@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate13slicesRemovedE5QListIPNS_9QPieSliceEE@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate14modelRowsAddedE11QModelIndexii@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate15labelModelIndexEi@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate15valueModelIndexEi@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate16modelRowsRemovedE11QModelIndexii@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate17blockModelSignalsEb@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate17modelColumnsAddedE11QModelIndexii@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate17sliceLabelChangedEv@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate17sliceValueChangedEv@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate18blockSeriesSignalsEb@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate19modelColumnsRemovedE11QModelIndexii@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate20handleModelDestroyedEv@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate21handleSeriesDestroyedEv@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivate22initializePieFromModelEv@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivateC1EPNS_15QPieModelMapperE@Qt_5 5.10.1 - _ZN8QtCharts22QPieModelMapperPrivateC2EPNS_15QPieModelMapperE@Qt_5 5.10.1 - _ZN8QtCharts22QXYLegendMarkerPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts22QXYLegendMarkerPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts22QXYLegendMarkerPrivate13relatedObjectEv@Qt_5 5.10.1 - _ZN8QtCharts22QXYLegendMarkerPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts22QXYLegendMarkerPrivate6seriesEv@Qt_5 5.10.1 - _ZN8QtCharts22QXYLegendMarkerPrivate7updatedEv@Qt_5 5.10.1 - _ZN8QtCharts22QXYLegendMarkerPrivateC1EPNS_15QXYLegendMarkerEPNS_9QXYSeriesEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts22QXYLegendMarkerPrivateC2EPNS_15QXYLegendMarkerEPNS_9QXYSeriesEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts22QXYLegendMarkerPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts22QXYLegendMarkerPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts22QXYLegendMarkerPrivateD2Ev@Qt_5 5.10.1 - _ZN8QtCharts23QBarCategoryAxisPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts23QBarCategoryAxisPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts23QBarCategoryAxisPrivate16initializeDomainEPNS_14AbstractDomainE@Qt_5 5.10.1 - _ZN8QtCharts23QBarCategoryAxisPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts23QBarCategoryAxisPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts23QBarCategoryAxisPrivate20updateCategoryDomainEv@Qt_5 5.10.1 - _ZN8QtCharts23QBarCategoryAxisPrivate6setMaxERK8QVariant@Qt_5 5.10.1 - _ZN8QtCharts23QBarCategoryAxisPrivate6setMinERK8QVariant@Qt_5 5.10.1 - _ZN8QtCharts23QBarCategoryAxisPrivate8setRangeERK7QStringS3_@Qt_5 5.10.1 - _ZN8QtCharts23QBarCategoryAxisPrivate8setRangeERK8QVariantS3_@Qt_5 5.10.1 - _ZN8QtCharts23QBarCategoryAxisPrivate8setRangeEdd@Qt_5 5.10.1 - _ZN8QtCharts23QBarCategoryAxisPrivateC1EPNS_16QBarCategoryAxisE@Qt_5 5.10.1 - _ZN8QtCharts23QBarCategoryAxisPrivateC2EPNS_16QBarCategoryAxisE@Qt_5 5.10.1 - _ZN8QtCharts23QBarCategoryAxisPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts23QBarCategoryAxisPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts23QBarCategoryAxisPrivateD2Ev@Qt_5 5.10.1 - _ZN8QtCharts23QBarLegendMarkerPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts23QBarLegendMarkerPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts23QBarLegendMarkerPrivate13relatedObjectEv@Qt_5 5.10.1 - _ZN8QtCharts23QBarLegendMarkerPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts23QBarLegendMarkerPrivate6seriesEv@Qt_5 5.10.1 - _ZN8QtCharts23QBarLegendMarkerPrivate7updatedEv@Qt_5 5.10.1 - _ZN8QtCharts23QBarLegendMarkerPrivateC1EPNS_16QBarLegendMarkerEPNS_18QAbstractBarSeriesEPNS_7QBarSetEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts23QBarLegendMarkerPrivateC2EPNS_16QBarLegendMarkerEPNS_18QAbstractBarSeriesEPNS_7QBarSetEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts23QBarLegendMarkerPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts23QBarLegendMarkerPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts23QBarLegendMarkerPrivateD2Ev@Qt_5 5.10.1 _ZN8QtCharts23QCandlestickModelMapper11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.9.0~rc _ZN8QtCharts23QCandlestickModelMapper11qt_metacastEPKc@Qt_5 5.9.0~rc _ZN8QtCharts23QCandlestickModelMapper12setTimestampEi@Qt_5 5.9.0~rc @@ -2206,28 +786,6 @@ _ZN8QtCharts23QCandlestickModelMapper9setSeriesEPNS_18QCandlestickSeriesE@Qt_5 5.9.0~rc _ZN8QtCharts23QCandlestickModelMapperC1EP7QObject@Qt_5 5.9.0~rc _ZN8QtCharts23QCandlestickModelMapperC2EP7QObject@Qt_5 5.9.0~rc - _ZN8QtCharts23QPieLegendMarkerPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts23QPieLegendMarkerPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts23QPieLegendMarkerPrivate13relatedObjectEv@Qt_5 5.10.1 - _ZN8QtCharts23QPieLegendMarkerPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts23QPieLegendMarkerPrivate6seriesEv@Qt_5 5.10.1 - _ZN8QtCharts23QPieLegendMarkerPrivate7updatedEv@Qt_5 5.10.1 - _ZN8QtCharts23QPieLegendMarkerPrivateC1EPNS_16QPieLegendMarkerEPNS_10QPieSeriesEPNS_9QPieSliceEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts23QPieLegendMarkerPrivateC2EPNS_16QPieLegendMarkerEPNS_10QPieSeriesEPNS_9QPieSliceEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts23QPieLegendMarkerPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts23QPieLegendMarkerPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts23QPieLegendMarkerPrivateD2Ev@Qt_5 5.10.1 - _ZN8QtCharts24QAreaLegendMarkerPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts24QAreaLegendMarkerPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts24QAreaLegendMarkerPrivate13relatedObjectEv@Qt_5 5.10.1 - _ZN8QtCharts24QAreaLegendMarkerPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts24QAreaLegendMarkerPrivate6seriesEv@Qt_5 5.10.1 - _ZN8QtCharts24QAreaLegendMarkerPrivate7updatedEv@Qt_5 5.10.1 - _ZN8QtCharts24QAreaLegendMarkerPrivateC1EPNS_17QAreaLegendMarkerEPNS_11QAreaSeriesEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts24QAreaLegendMarkerPrivateC2EPNS_17QAreaLegendMarkerEPNS_11QAreaSeriesEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts24QAreaLegendMarkerPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts24QAreaLegendMarkerPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts24QAreaLegendMarkerPrivateD2Ev@Qt_5 5.10.1 _ZN8QtCharts24QCandlestickLegendMarker11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.9.0~rc _ZN8QtCharts24QCandlestickLegendMarker11qt_metacastEPKc@Qt_5 5.9.0~rc _ZN8QtCharts24QCandlestickLegendMarker16staticMetaObjectE@Qt_5 5.9.0~rc @@ -2257,14 +815,6 @@ _ZN8QtCharts24QHCandlestickModelMapper22timestampColumnChangedEv@Qt_5 5.9.0~rc _ZN8QtCharts24QHCandlestickModelMapperC1EP7QObject@Qt_5 5.9.0~rc _ZN8QtCharts24QHCandlestickModelMapperC2EP7QObject@Qt_5 5.9.0~rc - _ZN8QtCharts24QPercentBarSeriesPrivate16initializeDomainEv@Qt_5 5.10.1 - _ZN8QtCharts24QPercentBarSeriesPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts24QPercentBarSeriesPrivateC1EPNS_17QPercentBarSeriesE@Qt_5 5.10.1 - _ZN8QtCharts24QPercentBarSeriesPrivateC2EPNS_17QPercentBarSeriesE@Qt_5 5.10.1 - _ZN8QtCharts24QStackedBarSeriesPrivate16initializeDomainEv@Qt_5 5.10.1 - _ZN8QtCharts24QStackedBarSeriesPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts24QStackedBarSeriesPrivateC1EPNS_17QStackedBarSeriesE@Qt_5 5.10.1 - _ZN8QtCharts24QStackedBarSeriesPrivateC2EPNS_17QStackedBarSeriesE@Qt_5 5.10.1 _ZN8QtCharts24QVCandlestickModelMapper10setHighRowEi@Qt_5 5.9.0~rc _ZN8QtCharts24QVCandlestickModelMapper10setOpenRowEi@Qt_5 5.9.0~rc _ZN8QtCharts24QVCandlestickModelMapper11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.9.0~rc @@ -2284,121 +834,6 @@ _ZN8QtCharts24QVCandlestickModelMapper9setLowRowEi@Qt_5 5.9.0~rc _ZN8QtCharts24QVCandlestickModelMapperC1EP7QObject@Qt_5 5.9.0~rc _ZN8QtCharts24QVCandlestickModelMapperC2EP7QObject@Qt_5 5.9.0~rc - _ZN8QtCharts25PolarChartValueAxisRadial11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts25PolarChartValueAxisRadial11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts25PolarChartValueAxisRadial16createAxisLabelsERK7QVectorIdE@Qt_5 5.10.1 - _ZN8QtCharts25PolarChartValueAxisRadial16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts25PolarChartValueAxisRadial22handleTickCountChangedEi@Qt_5 5.10.1 - _ZN8QtCharts25PolarChartValueAxisRadial24handleLabelFormatChangedERK7QString@Qt_5 5.10.1 - _ZN8QtCharts25PolarChartValueAxisRadial27handleMinorTickCountChangedEi@Qt_5 5.10.1 - _ZN8QtCharts25PolarChartValueAxisRadialC1EPNS_10QValueAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts25PolarChartValueAxisRadialC2EPNS_10QValueAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts25PolarChartValueAxisRadialD0Ev@Qt_5 5.10.1 - _ZN8QtCharts25PolarChartValueAxisRadialD1Ev@Qt_5 5.10.1 - _ZN8QtCharts25PolarChartValueAxisRadialD2Ev@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate10setVisibleEb@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate11categorySumEi@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate11categoryTopEi@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate11setBarWidthEd@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate11updatedBarsEv@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate12percentageAtEii@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate13doubleClickedEiPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate13setValueAddedEiiPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate13updatedLayoutEv@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate14blockBarUpdateEv@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate14categoryBottomEi@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate14initializeAxesEv@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate14maxCategorySumEv@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate14visibleChangedEv@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate15initializeThemeEiPNS_10ChartThemeEb@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate15setValueChangedEiPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate15setValueRemovedEiiPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate16initializeDomainEv@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate16restructuredBarsEv@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate16setLabelsVisibleEb@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate17handleSetValueAddEii@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate18populateCategoriesEPNS_16QBarCategoryAxisE@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate19absoluteCategorySumEi@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate19createLegendMarkersEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate20handleSetValueChangeEi@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate20handleSetValueRemoveEii@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate20initializeAnimationsE6QFlagsINS_6QChart15AnimationOptionEEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate20labelsVisibleChangedEb@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate3maxEv@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate3minEv@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate3topEv@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate4maxXEv@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate4minXEv@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate6appendE5QListIPNS_7QBarSetEE@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate6appendEPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate6bottomEv@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate6insertEiPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate6removeE5QListIPNS_7QBarSetEE@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate6removeEPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate7clickedEiPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate7pressedEiPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate7valueAtEii@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate8barsetAtEi@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivate8releasedEiPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivateC1EPNS_18QAbstractBarSeriesE@Qt_5 5.10.1 - _ZN8QtCharts25QAbstractBarSeriesPrivateC2EPNS_18QAbstractBarSeriesE@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate13doubleClickedEiPNS_15QCandlestickSetE@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate13updatedLayoutEv@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate14initializeAxesEv@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate15initializeThemeEiPNS_10ChartThemeEb@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate16initializeDomainEv@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate18handleSeriesChangeEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate18handleSeriesRemoveEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate19createLegendMarkersEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate19updatedCandlesticksEv@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate20initializeAnimationsE6QFlagsINS_6QChart15AnimationOptionEEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate21populateBarCategoriesEPNS_16QBarCategoryAxisE@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate6appendERK5QListIPNS_15QCandlestickSetEE@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate6insertEiPNS_15QCandlestickSetE@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate6removeERK5QListIPNS_15QCandlestickSetEE@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate7clickedEiPNS_15QCandlestickSetE@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate7pressedEiPNS_15QCandlestickSetE@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate7updatedEv@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivate8releasedEiPNS_15QCandlestickSetE@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivateC1EPNS_18QCandlestickSeriesE@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivateC2EPNS_18QCandlestickSeriesE@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts25QCandlestickSeriesPrivateD2Ev@Qt_5 5.10.1 - _ZN8QtCharts26PolarChartValueAxisAngular11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts26PolarChartValueAxisAngular11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts26PolarChartValueAxisAngular16createAxisLabelsERK7QVectorIdE@Qt_5 5.10.1 - _ZN8QtCharts26PolarChartValueAxisAngular16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts26PolarChartValueAxisAngular22handleTickCountChangedEi@Qt_5 5.10.1 - _ZN8QtCharts26PolarChartValueAxisAngular24handleLabelFormatChangedERK7QString@Qt_5 5.10.1 - _ZN8QtCharts26PolarChartValueAxisAngular27handleMinorTickCountChangedEi@Qt_5 5.10.1 - _ZN8QtCharts26PolarChartValueAxisAngularC1EPNS_10QValueAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts26PolarChartValueAxisAngularC2EPNS_10QValueAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts26PolarChartValueAxisAngularD0Ev@Qt_5 5.10.1 - _ZN8QtCharts26PolarChartValueAxisAngularD1Ev@Qt_5 5.10.1 - _ZN8QtCharts26PolarChartValueAxisAngularD2Ev@Qt_5 5.10.1 - _ZN8QtCharts27QBoxPlotLegendMarkerPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts27QBoxPlotLegendMarkerPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts27QBoxPlotLegendMarkerPrivate13relatedObjectEv@Qt_5 5.10.1 - _ZN8QtCharts27QBoxPlotLegendMarkerPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts27QBoxPlotLegendMarkerPrivate6seriesEv@Qt_5 5.10.1 - _ZN8QtCharts27QBoxPlotLegendMarkerPrivate7updatedEv@Qt_5 5.10.1 - _ZN8QtCharts27QBoxPlotLegendMarkerPrivateC1EPNS_20QBoxPlotLegendMarkerEPNS_14QBoxPlotSeriesEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts27QBoxPlotLegendMarkerPrivateC2EPNS_20QBoxPlotLegendMarkerEPNS_14QBoxPlotSeriesEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts27QBoxPlotLegendMarkerPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts27QBoxPlotLegendMarkerPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts27QBoxPlotLegendMarkerPrivateD2Ev@Qt_5 5.10.1 - _ZN8QtCharts27QHorizontalBarSeriesPrivate16initializeDomainEv@Qt_5 5.10.1 - _ZN8QtCharts27QHorizontalBarSeriesPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts27QHorizontalBarSeriesPrivateC1EPNS_20QHorizontalBarSeriesE@Qt_5 5.10.1 - _ZN8QtCharts27QHorizontalBarSeriesPrivateC2EPNS_20QHorizontalBarSeriesE@Qt_5 5.10.1 _ZN8QtCharts27QHorizontalPercentBarSeries11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.7.1 _ZN8QtCharts27QHorizontalPercentBarSeries11qt_metacastEPKc@Qt_5 5.7.1 _ZN8QtCharts27QHorizontalPercentBarSeries16staticMetaObjectE@Qt_5 5.7.1 @@ -2415,176 +850,11 @@ _ZN8QtCharts27QHorizontalStackedBarSeriesD0Ev@Qt_5 5.7.1 _ZN8QtCharts27QHorizontalStackedBarSeriesD1Ev@Qt_5 5.7.1 _ZN8QtCharts27QHorizontalStackedBarSeriesD2Ev@Qt_5 5.7.1 - _ZN8QtCharts28PolarChartCategoryAxisRadial11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartCategoryAxisRadial11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartCategoryAxisRadial16createAxisLabelsERK7QVectorIdE@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartCategoryAxisRadial16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartCategoryAxisRadial23handleCategoriesChangedEv@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartCategoryAxisRadialC1EPNS_13QCategoryAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartCategoryAxisRadialC2EPNS_13QCategoryAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartCategoryAxisRadialD0Ev@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartCategoryAxisRadialD1Ev@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartCategoryAxisRadialD2Ev@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartDateTimeAxisRadial11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartDateTimeAxisRadial11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartDateTimeAxisRadial16createAxisLabelsERK7QVectorIdE@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartDateTimeAxisRadial16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartDateTimeAxisRadial19handleFormatChangedERK7QString@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartDateTimeAxisRadial22handleTickCountChangedEi@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartDateTimeAxisRadialC1EPNS_13QDateTimeAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartDateTimeAxisRadialC2EPNS_13QDateTimeAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartDateTimeAxisRadialD0Ev@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartDateTimeAxisRadialD1Ev@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartDateTimeAxisRadialD2Ev@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartLogValueAxisRadial11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartLogValueAxisRadial11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartLogValueAxisRadial16createAxisLabelsERK7QVectorIdE@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartLogValueAxisRadial16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartLogValueAxisRadial17handleBaseChangedEd@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartLogValueAxisRadial24handleLabelFormatChangedERK7QString@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartLogValueAxisRadialC1EPNS_13QLogValueAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartLogValueAxisRadialC2EPNS_13QLogValueAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartLogValueAxisRadialD0Ev@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartLogValueAxisRadialD1Ev@Qt_5 5.10.1 - _ZN8QtCharts28PolarChartLogValueAxisRadialD2Ev@Qt_5 5.10.1 - _ZN8QtCharts29CandlestickBodyWicksAnimation10setEndDataERKNS_15CandlestickDataE@Qt_5 5.10.1 - _ZN8QtCharts29CandlestickBodyWicksAnimation11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts29CandlestickBodyWicksAnimation11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts29CandlestickBodyWicksAnimation12setStartDataERKNS_15CandlestickDataE@Qt_5 5.10.1 - _ZN8QtCharts29CandlestickBodyWicksAnimation16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts29CandlestickBodyWicksAnimation18updateCurrentValueERK8QVariant@Qt_5 5.10.1 - _ZN8QtCharts29CandlestickBodyWicksAnimation5setupERKNS_15CandlestickDataES3_@Qt_5 5.10.1 - _ZN8QtCharts29CandlestickBodyWicksAnimationC1EPNS_11CandlestickEPNS_20CandlestickAnimationEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts29CandlestickBodyWicksAnimationC2EPNS_11CandlestickEPNS_20CandlestickAnimationEiR12QEasingCurve@Qt_5 5.10.1 - _ZN8QtCharts29CandlestickBodyWicksAnimationD0Ev@Qt_5 5.10.1 - _ZN8QtCharts29CandlestickBodyWicksAnimationD1Ev@Qt_5 5.10.1 - _ZN8QtCharts29CandlestickBodyWicksAnimationD2Ev@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalPercentBarChartItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalPercentBarChartItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalPercentBarChartItem12topLeftPointEidd@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalPercentBarChartItem15calculateLayoutEv@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalPercentBarChartItem15markLabelsDirtyEPNS_7QBarSetEii@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalPercentBarChartItem16bottomRightPointEidd@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalPercentBarChartItem16initializeLayoutEiiib@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalPercentBarChartItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalPercentBarChartItem17generateLabelTextEiid@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalPercentBarChartItemC1EPNS_18QAbstractBarSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalPercentBarChartItemC2EPNS_18QAbstractBarSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalStackedBarChartItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalStackedBarChartItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalStackedBarChartItem12topLeftPointEidd@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalStackedBarChartItem15calculateLayoutEv@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalStackedBarChartItem16bottomRightPointEidd@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalStackedBarChartItem16initializeLayoutEiiib@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalStackedBarChartItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalStackedBarChartItemC1EPNS_18QAbstractBarSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts29HorizontalStackedBarChartItemC2EPNS_18QAbstractBarSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartCategoryAxisAngular11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartCategoryAxisAngular11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartCategoryAxisAngular16createAxisLabelsERK7QVectorIdE@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartCategoryAxisAngular16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartCategoryAxisAngular23handleCategoriesChangedEv@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartCategoryAxisAngularC1EPNS_13QCategoryAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartCategoryAxisAngularC2EPNS_13QCategoryAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartCategoryAxisAngularD0Ev@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartCategoryAxisAngularD1Ev@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartCategoryAxisAngularD2Ev@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartDateTimeAxisAngular11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartDateTimeAxisAngular11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartDateTimeAxisAngular16createAxisLabelsERK7QVectorIdE@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartDateTimeAxisAngular16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartDateTimeAxisAngular19handleFormatChangedERK7QString@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartDateTimeAxisAngular22handleTickCountChangedEi@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartDateTimeAxisAngularC1EPNS_13QDateTimeAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartDateTimeAxisAngularC2EPNS_13QDateTimeAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartDateTimeAxisAngularD0Ev@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartDateTimeAxisAngularD1Ev@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartDateTimeAxisAngularD2Ev@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartLogValueAxisAngular11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartLogValueAxisAngular11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartLogValueAxisAngular16createAxisLabelsERK7QVectorIdE@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartLogValueAxisAngular16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartLogValueAxisAngular17handleBaseChangedEd@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartLogValueAxisAngular24handleLabelFormatChangedERK7QString@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartLogValueAxisAngularC1EPNS_13QLogValueAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartLogValueAxisAngularC2EPNS_13QLogValueAxisEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartLogValueAxisAngularD0Ev@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartLogValueAxisAngularD1Ev@Qt_5 5.10.1 - _ZN8QtCharts29PolarChartLogValueAxisAngularD2Ev@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate10insertDataEii@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate10lowChangedEv@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate10removeDataEii@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate11highChangedEv@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate11openChangedEv@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate12closeChangedEv@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate14candlestickSetE11QModelIndex@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate14modelDestroyedEv@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate15seriesDestroyedEv@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate16modelDataUpdatedE11QModelIndexS1_@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate16modelRowsRemovedE11QModelIndexii@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate16timestampChangedEv@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate17blockModelSignalsEb@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate17modelRowsInsertedE11QModelIndexii@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate18blockSeriesSignalsEb@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate19modelColumnsRemovedE11QModelIndexii@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate20candlestickSetsAddedERK5QListIPNS_15QCandlestickSetEE@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate20modelColumnsInsertedE11QModelIndexii@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate21candlestickModelIndexEii@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate21candlestickSetChangedEv@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate21lastSetSectionChangedEv@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate22candlestickSetsRemovedERK5QListIPNS_15QCandlestickSetEE@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate22firstSetSectionChangedEv@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate22modelHeaderDataUpdatedEN2Qt11OrientationEii@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivate30initializeCandlestickFromModelEv@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivateC1EPNS_23QCandlestickModelMapperE@Qt_5 5.10.1 - _ZN8QtCharts30QCandlestickModelMapperPrivateC2EPNS_23QCandlestickModelMapperE@Qt_5 5.10.1 - _ZN8QtCharts31QCandlestickLegendMarkerPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts31QCandlestickLegendMarkerPrivate11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts31QCandlestickLegendMarkerPrivate13relatedObjectEv@Qt_5 5.10.1 - _ZN8QtCharts31QCandlestickLegendMarkerPrivate16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts31QCandlestickLegendMarkerPrivate6seriesEv@Qt_5 5.10.1 - _ZN8QtCharts31QCandlestickLegendMarkerPrivate7updatedEv@Qt_5 5.10.1 - _ZN8QtCharts31QCandlestickLegendMarkerPrivateC1EPNS_24QCandlestickLegendMarkerEPNS_18QCandlestickSeriesEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts31QCandlestickLegendMarkerPrivateC2EPNS_24QCandlestickLegendMarkerEPNS_18QCandlestickSeriesEPNS_7QLegendE@Qt_5 5.10.1 - _ZN8QtCharts31QCandlestickLegendMarkerPrivateD0Ev@Qt_5 5.10.1 - _ZN8QtCharts31QCandlestickLegendMarkerPrivateD1Ev@Qt_5 5.10.1 - _ZN8QtCharts31QCandlestickLegendMarkerPrivateD2Ev@Qt_5 5.10.1 - _ZN8QtCharts34QHorizontalPercentBarSeriesPrivate16initializeDomainEv@Qt_5 5.10.1 - _ZN8QtCharts34QHorizontalPercentBarSeriesPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts34QHorizontalPercentBarSeriesPrivateC1EPNS_27QHorizontalPercentBarSeriesE@Qt_5 5.10.1 - _ZN8QtCharts34QHorizontalPercentBarSeriesPrivateC2EPNS_27QHorizontalPercentBarSeriesE@Qt_5 5.10.1 - _ZN8QtCharts34QHorizontalStackedBarSeriesPrivate16initializeDomainEv@Qt_5 5.10.1 - _ZN8QtCharts34QHorizontalStackedBarSeriesPrivate18initializeGraphicsEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts34QHorizontalStackedBarSeriesPrivateC1EPNS_27QHorizontalStackedBarSeriesE@Qt_5 5.10.1 - _ZN8QtCharts34QHorizontalStackedBarSeriesPrivateC2EPNS_27QHorizontalStackedBarSeriesE@Qt_5 5.10.1 - _ZN8QtCharts3Bar11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts3Bar11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts3Bar13doubleClickedEiPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts3Bar15hoverEnterEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts3Bar15hoverLeaveEventEP24QGraphicsSceneHoverEvent@Qt_5 5.10.1 - _ZN8QtCharts3Bar15mousePressEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts3Bar16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts3Bar17mouseReleaseEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts3Bar21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts3Bar5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget@Qt_5 5.10.1 - _ZN8QtCharts3Bar7clickedEiPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts3Bar7hoveredEbiPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts3Bar7pressedEiPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts3Bar8releasedEiPNS_7QBarSetE@Qt_5 5.10.1 - _ZN8QtCharts3BarC1EPNS_7QBarSetEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts3BarC2EPNS_7QBarSetEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts3BarD0Ev@Qt_5 5.10.1 - _ZN8QtCharts3BarD1Ev@Qt_5 5.10.1 - _ZN8QtCharts3BarD2Ev@Qt_5 5.10.1 _ZN8QtCharts6QChart10mapToValueERK7QPointFPNS_15QAbstractSeriesE@Qt_5 5.7.1 _ZN8QtCharts6QChart10removeAxisEPNS_13QAbstractAxisE@Qt_5 5.7.1 _ZN8QtCharts6QChart10setMarginsERK8QMargins@Qt_5 5.7.1 _ZN8QtCharts6QChart11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.7.1 _ZN8QtCharts6QChart11qt_metacastEPKc@Qt_5 5.7.1 - _ZN8QtCharts6QChart11setPlotAreaERK6QRectF@Qt_5 5.12.2 _ZN8QtCharts6QChart12removeSeriesEPNS_15QAbstractSeriesE@Qt_5 5.7.1 _ZN8QtCharts6QChart12setTitleFontERK5QFont@Qt_5 5.7.1 _ZN8QtCharts6QChart13mapToPositionERK7QPointFPNS_15QAbstractSeriesE@Qt_5 5.7.1 @@ -2732,62 +1002,6 @@ _ZN8QtCharts7QLegendD0Ev@Qt_5 5.7.1 _ZN8QtCharts7QLegendD1Ev@Qt_5 5.7.1 _ZN8QtCharts7QLegendD2Ev@Qt_5 5.7.1 - _ZN8QtCharts7XYChart11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts7XYChart11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts7XYChart11updateChartER7QVectorI7QPointFES4_i@Qt_5 5.10.1 - _ZN8QtCharts7XYChart12setAnimationEPNS_11XYAnimationE@Qt_5 5.10.1 - _ZN8QtCharts7XYChart13doubleClickedERK7QPointF@Qt_5 5.10.1 - _ZN8QtCharts7XYChart13updateGlChartEv@Qt_5 5.10.1 - _ZN8QtCharts7XYChart14refreshGlChartEv@Qt_5 5.10.1 - _ZN8QtCharts7XYChart16handlePointAddedEi@Qt_5 5.10.1 - _ZN8QtCharts7XYChart16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts7XYChart17setGeometryPointsERK7QVectorI7QPointFE@Qt_5 5.10.1 - _ZN8QtCharts7XYChart18handlePointRemovedEi@Qt_5 5.10.1 - _ZN8QtCharts7XYChart19handleDomainUpdatedEv@Qt_5 5.10.1 - _ZN8QtCharts7XYChart19handlePointReplacedEi@Qt_5 5.10.1 - _ZN8QtCharts7XYChart19handlePointsRemovedEii@Qt_5 5.10.1 - _ZN8QtCharts7XYChart19offGridStatusVectorEv@Qt_5 5.10.1 - _ZN8QtCharts7XYChart20handlePointsReplacedEv@Qt_5 5.10.1 - _ZN8QtCharts7XYChart7clickedERK7QPointF@Qt_5 5.10.1 - _ZN8QtCharts7XYChart7hoveredERK7QPointFb@Qt_5 5.10.1 - _ZN8QtCharts7XYChart7pressedERK7QPointF@Qt_5 5.10.1 - _ZN8QtCharts7XYChart8releasedERK7QPointF@Qt_5 5.10.1 - _ZN8QtCharts7XYChart8setDirtyEb@Qt_5 5.10.1 - _ZN8QtCharts7XYChartC1EPNS_9QXYSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts7XYChartC2EPNS_9QXYSeriesEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts8Scroller10lowerSpeedER7QPointFd@Qt_5 5.10.1 - _ZN8QtCharts8Scroller10scrollTickEv@Qt_5 5.10.1 - _ZN8QtCharts8Scroller10stopTickerEv@Qt_5 5.10.1 - _ZN8QtCharts8Scroller11startTickerEi@Qt_5 5.10.1 - _ZN8QtCharts8Scroller20handleMouseMoveEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts8Scroller21handleMousePressEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts8Scroller23handleMouseReleaseEventEP24QGraphicsSceneMouseEvent@Qt_5 5.10.1 - _ZN8QtCharts8Scroller4moveERK7QPointF@Qt_5 5.10.1 - _ZN8QtCharts8Scroller8scrollToERK7QPointF@Qt_5 5.10.1 - _ZN8QtCharts8ScrollerC1Ev@Qt_5 5.10.1 - _ZN8QtCharts8ScrollerC2Ev@Qt_5 5.10.1 - _ZN8QtCharts8ScrollerD0Ev@Qt_5 5.10.1 - _ZN8QtCharts8ScrollerD1Ev@Qt_5 5.10.1 - _ZN8QtCharts8ScrollerD2Ev@Qt_5 5.10.1 - _ZN8QtCharts8XYDomain11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts8XYDomain11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts8XYDomain16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts8XYDomain4moveEdd@Qt_5 5.10.1 - _ZN8QtCharts8XYDomain6zoomInERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts8XYDomain7zoomOutERK6QRectF@Qt_5 5.10.1 - _ZN8QtCharts8XYDomain8setRangeEdddd@Qt_5 5.10.1 - _ZN8QtCharts8XYDomainC1EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts8XYDomainC2EP7QObject@Qt_5 5.10.1 - _ZN8QtCharts8XYDomainD0Ev@Qt_5 5.10.1 - _ZN8QtCharts8XYDomainD1Ev@Qt_5 5.10.1 - _ZN8QtCharts8XYDomainD2Ev@Qt_5 5.10.1 - _ZN8QtCharts9ChartItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.10.1 - _ZN8QtCharts9ChartItem11qt_metacastEPKc@Qt_5 5.10.1 - _ZN8QtCharts9ChartItem16staticMetaObjectE@Qt_5 5.10.1 - _ZN8QtCharts9ChartItem19handleDomainUpdatedEv@Qt_5 5.10.1 - _ZN8QtCharts9ChartItem7cleanupEv@Qt_5 5.10.1 - _ZN8QtCharts9ChartItemC1EPNS_22QAbstractSeriesPrivateEP13QGraphicsItem@Qt_5 5.10.1 - _ZN8QtCharts9ChartItemC2EPNS_22QAbstractSeriesPrivateEP13QGraphicsItem@Qt_5 5.10.1 _ZN8QtCharts9QPieSlice10labelColorEv@Qt_5 5.7.1 _ZN8QtCharts9QPieSlice10penChangedEv@Qt_5 5.7.1 _ZN8QtCharts9QPieSlice11borderColorEv@Qt_5 5.7.1 @@ -2888,8 +1102,6 @@ _ZN8QtCharts9QXYSeriesD2Ev@Qt_5 5.7.1 _ZN8QtCharts9QXYSerieslsERK5QListI7QPointFE@Qt_5 5.7.1 _ZN8QtCharts9QXYSerieslsERK7QPointF@Qt_5 5.7.1 - _ZNK8QtCharts10ChartTitle4textEv@Qt_5 5.10.1 - _ZNK8QtCharts10ChartTitle8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 _ZNK8QtCharts10QBarSeries10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts10QBarSeries4typeEv@Qt_5 5.7.1 _ZNK8QtCharts10QChartView10metaObjectEv@Qt_5 5.7.1 @@ -2908,28 +1120,12 @@ _ZNK8QtCharts10QPieSeries7pieSizeEv@Qt_5 5.7.1 _ZNK8QtCharts10QPieSeries8holeSizeEv@Qt_5 5.7.1 _ZNK8QtCharts10QValueAxis10metaObjectEv@Qt_5 5.7.1 - _ZNK8QtCharts10QValueAxis10tickAnchorEv@Qt_5 5.12.2 _ZNK8QtCharts10QValueAxis11labelFormatEv@Qt_5 5.7.1 - _ZNK8QtCharts10QValueAxis12tickIntervalEv@Qt_5 5.12.2 _ZNK8QtCharts10QValueAxis14minorTickCountEv@Qt_5 5.7.1 _ZNK8QtCharts10QValueAxis3maxEv@Qt_5 5.7.1 _ZNK8QtCharts10QValueAxis3minEv@Qt_5 5.7.1 _ZNK8QtCharts10QValueAxis4typeEv@Qt_5 5.7.1 - _ZNK8QtCharts10QValueAxis8tickTypeEv@Qt_5 5.12.2 _ZNK8QtCharts10QValueAxis9tickCountEv@Qt_5 5.7.1 - _ZNK8QtCharts11BoxWhiskers10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts11BoxWhiskers12boundingRectEv@Qt_5 5.10.1 - _ZNK8QtCharts11BoxWhiskers8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts11Candlestick10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts11Candlestick12boundingRectEv@Qt_5 5.10.1 - _ZNK8QtCharts11LogXYDomain10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts11LogXYDomain20calculateDomainPointERK7QPointF@Qt_5 5.10.1 - _ZNK8QtCharts11LogXYDomain22calculateGeometryPointERK7QPointFRb@Qt_5 5.10.1 - _ZNK8QtCharts11LogXYDomain23calculateGeometryPointsERK7QVectorI7QPointFE@Qt_5 5.10.1 - _ZNK8QtCharts11PolarDomain10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts11PolarDomain22calculateGeometryPointERK7QPointFRb@Qt_5 5.10.1 - _ZNK8QtCharts11PolarDomain22polarCoordinateToPointEdd@Qt_5 5.10.1 - _ZNK8QtCharts11PolarDomain23calculateGeometryPointsERK7QVectorI7QPointFE@Qt_5 5.10.1 _ZNK8QtCharts11QAreaSeries10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts11QAreaSeries11borderColorEv@Qt_5 5.7.1 _ZNK8QtCharts11QAreaSeries11lowerSeriesEv@Qt_5 5.7.1 @@ -2948,38 +1144,6 @@ _ZNK8QtCharts11QLineSeries4typeEv@Qt_5 5.7.1 _ZNK8QtCharts11QPolarChart10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts11QPolarChart4axesE6QFlagsINS0_16PolarOrientationEEPNS_15QAbstractSeriesE@Qt_5 5.7.1 - _ZNK8QtCharts11XLogYDomain10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts11XLogYDomain20calculateDomainPointERK7QPointF@Qt_5 5.10.1 - _ZNK8QtCharts11XLogYDomain22calculateGeometryPointERK7QPointFRb@Qt_5 5.10.1 - _ZNK8QtCharts11XLogYDomain23calculateGeometryPointsERK7QVectorI7QPointFE@Qt_5 5.10.1 - _ZNK8QtCharts11XYAnimation12interpolatedERK8QVariantS3_d@Qt_5 5.10.1 - _ZNK8QtCharts12BarAnimation10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts12BarAnimation12interpolatedERK8QVariantS3_d@Qt_5 5.10.1 - _ZNK8QtCharts12BarChartItem10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts12ChartDataSet10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts12ChartDataSet15domainForSeriesEPNS_15QAbstractSeriesE@Qt_5 5.10.1 - _ZNK8QtCharts12ChartDataSet4axesEv@Qt_5 5.10.1 - _ZNK8QtCharts12ChartDataSet6seriesEv@Qt_5 5.10.1 - _ZNK8QtCharts12ChartElement12themeManagerEv@Qt_5 5.10.1 - _ZNK8QtCharts12ChartElement7dataSetEv@Qt_5 5.10.1 - _ZNK8QtCharts12ChartElement9presenterEv@Qt_5 5.10.1 - _ZNK8QtCharts12LegendLayout6offsetEv@Qt_5 5.10.1 - _ZNK8QtCharts12LegendLayout8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts12PieAnimation10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts12PieChartItem10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts12PieChartItem9animationEv@Qt_5 5.10.1 - _ZNK8QtCharts12PieSliceItem10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts12PieSliceItem12boundingRectEv@Qt_5 5.10.1 - _ZNK8QtCharts12PieSliceItem5shapeEv@Qt_5 5.10.1 - _ZNK8QtCharts12ScrollTicker10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts12VerticalAxis8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts13AreaChartItem10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts13AreaChartItem12boundingRectEv@Qt_5 5.10.1 - _ZNK8QtCharts13AreaChartItem5shapeEv@Qt_5 5.10.1 - _ZNK8QtCharts13AxisAnimation12interpolatedERK8QVariantS3_d@Qt_5 5.10.1 - _ZNK8QtCharts13LineChartItem10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts13LineChartItem12boundingRectEv@Qt_5 5.10.1 - _ZNK8QtCharts13LineChartItem5shapeEv@Qt_5 5.10.1 _ZNK8QtCharts13QAbstractAxis10labelsFontEv@Qt_5 5.7.1 _ZNK8QtCharts13QAbstractAxis10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts13QAbstractAxis10titleBrushEv@Qt_5 5.7.1 @@ -3036,52 +1200,12 @@ _ZNK8QtCharts13QLogValueAxis9tickCountEv@Qt_5 5.9.0~rc _ZNK8QtCharts13QSplineSeries10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts13QSplineSeries4typeEv@Qt_5 5.7.1 - _ZNK8QtCharts13XYPolarDomain10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts13XYPolarDomain18toRadialCoordinateEdRb@Qt_5 5.10.1 - _ZNK8QtCharts13XYPolarDomain19toAngularCoordinateEdRb@Qt_5 5.10.1 - _ZNK8QtCharts13XYPolarDomain20calculateDomainPointERK7QPointF@Qt_5 5.10.1 - _ZNK8QtCharts14AbstractDomain10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts14AbstractDomain4sizeEv@Qt_5 5.10.1 - _ZNK8QtCharts14AbstractDomain5spanXEv@Qt_5 5.10.1 - _ZNK8QtCharts14AbstractDomain5spanYEv@Qt_5 5.10.1 - _ZNK8QtCharts14AbstractDomain7isEmptyEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartAnimation10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartPresenter10chartItemsEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartPresenter10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartPresenter10titleBrushEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartPresenter13backgroundPenEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartPresenter15backgroundBrushEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartPresenter16animationOptionsEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartPresenter19backgroundRoundnessEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartPresenter19isBackgroundVisibleEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartPresenter21plotAreaBackgroundPenEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartPresenter23plotAreaBackgroundBrushEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartPresenter27isPlotAreaBackgroundVisibleEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartPresenter29isBackgroundDropShadowEnabledEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartPresenter5titleEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartPresenter8geometryEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartPresenter9axisItemsEv@Qt_5 5.10.1 - _ZNK8QtCharts14ChartPresenter9titleFontEv@Qt_5 5.10.1 - _ZNK8QtCharts14HorizontalAxis8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts14LegendScroller10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts14LegendScroller6offsetEv@Qt_5 5.10.1 - _ZNK8QtCharts14LogXLogYDomain10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts14LogXLogYDomain20calculateDomainPointERK7QPointF@Qt_5 5.10.1 - _ZNK8QtCharts14LogXLogYDomain22calculateGeometryPointERK7QPointFRb@Qt_5 5.10.1 - _ZNK8QtCharts14LogXLogYDomain23calculateGeometryPointsERK7QVectorI7QPointFE@Qt_5 5.10.1 - _ZNK8QtCharts14PolarChartAxis10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts14PolarChartAxis12gridGeometryEv@Qt_5 5.10.1 - _ZNK8QtCharts14QBarSetPrivate10metaObjectEv@Qt_5 5.10.1 _ZNK8QtCharts14QBoxPlotSeries10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts14QBoxPlotSeries3penEv@Qt_5 5.7.1 _ZNK8QtCharts14QBoxPlotSeries4typeEv@Qt_5 5.7.1 _ZNK8QtCharts14QBoxPlotSeries5brushEv@Qt_5 5.7.1 _ZNK8QtCharts14QBoxPlotSeries5countEv@Qt_5 5.7.1 _ZNK8QtCharts14QBoxPlotSeries7boxSetsEv@Qt_5 5.7.1 - _ZNK8QtCharts14QBoxSetPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts14QLegendPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts14QLegendPrivate14maxMarkerWidthEv@Qt_5 5.10.1 - _ZNK8QtCharts14QLegendPrivate6offsetEv@Qt_5 5.10.1 _ZNK8QtCharts14QScatterSeries10markerSizeEv@Qt_5 5.7.1 _ZNK8QtCharts14QScatterSeries10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts14QScatterSeries11borderColorEv@Qt_5 5.7.1 @@ -3097,13 +1221,6 @@ _ZNK8QtCharts14QXYModelMapper6seriesEv@Qt_5 5.7.1 _ZNK8QtCharts14QXYModelMapper8xSectionEv@Qt_5 5.7.1 _ZNK8QtCharts14QXYModelMapper8ySectionEv@Qt_5 5.7.1 - _ZNK8QtCharts15ChartBackground8diameterEv@Qt_5 5.10.1 - _ZNK8QtCharts15ChartValueAxisX10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts15ChartValueAxisX15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts15ChartValueAxisX8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts15ChartValueAxisY10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts15ChartValueAxisY15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts15ChartValueAxisY8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 _ZNK8QtCharts15QAbstractSeries10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts15QAbstractSeries4nameEv@Qt_5 5.7.1 _ZNK8QtCharts15QAbstractSeries5chartEv@Qt_5 5.7.1 @@ -3149,44 +1266,6 @@ _ZNK8QtCharts15QVXYModelMapper8firstRowEv@Qt_5 5.7.1 _ZNK8QtCharts15QVXYModelMapper8rowCountEv@Qt_5 5.7.1 _ZNK8QtCharts15QXYLegendMarker10metaObjectEv@Qt_5 5.7.1 - _ZNK8QtCharts15SplineAnimation12interpolatedERK8QVariantS3_d@Qt_5 5.10.1 - _ZNK8QtCharts15SplineChartItem10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts15SplineChartItem12boundingRectEv@Qt_5 5.10.1 - _ZNK8QtCharts15SplineChartItem21controlGeometryPointsEv@Qt_5 5.10.1 - _ZNK8QtCharts15SplineChartItem5shapeEv@Qt_5 5.10.1 - _ZNK8QtCharts15SplineChartItem9animationEv@Qt_5 5.10.1 - _ZNK8QtCharts16BoxPlotAnimation10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts16BoxPlotChartItem10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts16BoxPlotChartItem12boundingRectEv@Qt_5 5.10.1 - _ZNK8QtCharts16ChartAxisElement10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts16ChartAxisElement10tickAnchorEv@Qt_5 5.12.2 - _ZNK8QtCharts16ChartAxisElement11formatLabelERK7QStringRK10QByteArraydiS3_S3_@Qt_5 5.10.1 - _ZNK8QtCharts16ChartAxisElement12tickIntervalEv@Qt_5 5.12.2 - _ZNK8QtCharts16ChartAxisElement17createValueLabelsEddiddNS_10QValueAxis8TickTypeERK7QString@Qt_5 5.12.2 - _ZNK8QtCharts16ChartAxisElement20createDateTimeLabelsEddiRK7QString@Qt_5 5.10.1 - _ZNK8QtCharts16ChartAxisElement20createLogValueLabelsEdddiRK7QString@Qt_5 5.10.1 - _ZNK8QtCharts16ChartAxisElement3maxEv@Qt_5 5.10.1 - _ZNK8QtCharts16ChartAxisElement3minEv@Qt_5 5.10.1 - _ZNK8QtCharts16LegendMarkerItem10labelBrushEv@Qt_5 5.10.1 - _ZNK8QtCharts16LegendMarkerItem10markerRectEv@Qt_5 5.10.1 - _ZNK8QtCharts16LegendMarkerItem10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts16LegendMarkerItem11markerShapeEv@Qt_5 5.10.1 - _ZNK8QtCharts16LegendMarkerItem11useMaxWidthEv@Qt_5 5.10.1 - _ZNK8QtCharts16LegendMarkerItem12boundingRectEv@Qt_5 5.10.1 - _ZNK8QtCharts16LegendMarkerItem14displayedLabelEv@Qt_5 5.10.1 - _ZNK8QtCharts16LegendMarkerItem20effectiveMarkerShapeEv@Qt_5 5.10.1 - _ZNK8QtCharts16LegendMarkerItem20effectiveMarkerWidthEv@Qt_5 5.10.1 - _ZNK8QtCharts16LegendMarkerItem3penEv@Qt_5 5.10.1 - _ZNK8QtCharts16LegendMarkerItem4fontEv@Qt_5 5.10.1 - _ZNK8QtCharts16LegendMarkerItem5brushEv@Qt_5 5.10.1 - _ZNK8QtCharts16LegendMarkerItem5labelEv@Qt_5 5.10.1 - _ZNK8QtCharts16LegendMarkerItem8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts16LogXYPolarDomain10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts16LogXYPolarDomain18toRadialCoordinateEdRb@Qt_5 5.10.1 - _ZNK8QtCharts16LogXYPolarDomain19toAngularCoordinateEdRb@Qt_5 5.10.1 - _ZNK8QtCharts16LogXYPolarDomain20calculateDomainPointERK7QPointF@Qt_5 5.10.1 - _ZNK8QtCharts16PolarChartLayout20calculateAxisMinimumERK6QRectFRK5QListIPNS_16ChartAxisElementEE@Qt_5 5.10.1 - _ZNK8QtCharts16PolarChartLayout21calculateAxisGeometryERK6QRectFRK5QListIPNS_16ChartAxisElementEEb@Qt_5 5.12.2 _ZNK8QtCharts16QBarCategoryAxis10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts16QBarCategoryAxis2atEi@Qt_5 5.7.1 _ZNK8QtCharts16QBarCategoryAxis3maxEv@Qt_5 5.7.1 @@ -3209,7 +1288,6 @@ _ZNK8QtCharts16QHPieModelMapper9labelsRowEv@Qt_5 5.7.1 _ZNK8QtCharts16QHPieModelMapper9valuesRowEv@Qt_5 5.7.1 _ZNK8QtCharts16QPieLegendMarker10metaObjectEv@Qt_5 5.7.1 - _ZNK8QtCharts16QPieSlicePrivate10metaObjectEv@Qt_5 5.10.1 _ZNK8QtCharts16QVBarModelMapper10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts16QVBarModelMapper16lastBarSetColumnEv@Qt_5 5.7.1 _ZNK8QtCharts16QVBarModelMapper17firstBarSetColumnEv@Qt_5 5.7.1 @@ -3224,62 +1302,19 @@ _ZNK8QtCharts16QVPieModelMapper6seriesEv@Qt_5 5.7.1 _ZNK8QtCharts16QVPieModelMapper8firstRowEv@Qt_5 5.7.1 _ZNK8QtCharts16QVPieModelMapper8rowCountEv@Qt_5 5.7.1 - _ZNK8QtCharts16QXYSeriesPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts16QXYSeriesPrivate15defaultAxisTypeEN2Qt11OrientationE@Qt_5 5.10.1 - _ZNK8QtCharts16QXYSeriesPrivate17createDefaultAxisEN2Qt11OrientationE@Qt_5 5.10.1 - _ZNK8QtCharts16ScatterChartItem10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts16ScatterChartItem12boundingRectEv@Qt_5 5.10.1 - _ZNK8QtCharts16XLogYPolarDomain10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts16XLogYPolarDomain18toRadialCoordinateEdRb@Qt_5 5.10.1 - _ZNK8QtCharts16XLogYPolarDomain19toAngularCoordinateEdRb@Qt_5 5.10.1 - _ZNK8QtCharts16XLogYPolarDomain20calculateDomainPointERK7QPointF@Qt_5 5.10.1 - _ZNK8QtCharts17ChartThemeManager10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts17ChartThemeManager11seriesCountENS_15QAbstractSeries10SeriesTypeE@Qt_5 5.10.1 - _ZNK8QtCharts17ChartThemeManager13decorateChartEPNS_6QChartEPNS_10ChartThemeE@Qt_5 5.10.1 - _ZNK8QtCharts17ChartThemeManager14createIndexKeyE5QListIiE@Qt_5 5.10.1 - _ZNK8QtCharts17ChartThemeManager14decorateLegendEPNS_7QLegendEPNS_10ChartThemeE@Qt_5 5.10.1 - _ZNK8QtCharts17PieSliceAnimation12interpolatedERK8QVariantS3_d@Qt_5 5.10.1 _ZNK8QtCharts17QAreaLegendMarker10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts17QPercentBarSeries10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts17QPercentBarSeries4typeEv@Qt_5 5.7.1 - _ZNK8QtCharts17QPieSeriesPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts17QPieSeriesPrivate15defaultAxisTypeEN2Qt11OrientationE@Qt_5 5.10.1 - _ZNK8QtCharts17QPieSeriesPrivate17createDefaultAxisEN2Qt11OrientationE@Qt_5 5.10.1 _ZNK8QtCharts17QStackedBarSeries10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts17QStackedBarSeries4typeEv@Qt_5 5.7.1 - _ZNK8QtCharts17QValueAxisPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts18CartesianChartAxis10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts18CartesianChartAxis8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts18ChartCategoryAxisX10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts18ChartCategoryAxisX15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts18ChartCategoryAxisX8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts18ChartCategoryAxisY10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts18ChartCategoryAxisY15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts18ChartCategoryAxisY8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts18ChartDateTimeAxisX10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts18ChartDateTimeAxisX15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts18ChartDateTimeAxisX8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts18ChartDateTimeAxisY10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts18ChartDateTimeAxisY15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts18ChartDateTimeAxisY8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts18ChartLogValueAxisX10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts18ChartLogValueAxisX15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts18ChartLogValueAxisX8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts18ChartLogValueAxisY10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts18ChartLogValueAxisY15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts18ChartLogValueAxisY8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 _ZNK8QtCharts18QAbstractBarSeries10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts18QAbstractBarSeries11labelsAngleEv@Qt_5 5.7.1 _ZNK8QtCharts18QAbstractBarSeries12labelsFormatEv@Qt_5 5.7.1 _ZNK8QtCharts18QAbstractBarSeries14labelsPositionEv@Qt_5 5.7.1 _ZNK8QtCharts18QAbstractBarSeries15isLabelsVisibleEv@Qt_5 5.7.1 - _ZNK8QtCharts18QAbstractBarSeries15labelsPrecisionEv@Qt_5 5.11.1 _ZNK8QtCharts18QAbstractBarSeries5countEv@Qt_5 5.7.1 _ZNK8QtCharts18QAbstractBarSeries7barSetsEv@Qt_5 5.7.1 _ZNK8QtCharts18QAbstractBarSeries8barWidthEv@Qt_5 5.7.1 - _ZNK8QtCharts18QAreaSeriesPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts18QAreaSeriesPrivate15defaultAxisTypeEN2Qt11OrientationE@Qt_5 5.10.1 - _ZNK8QtCharts18QAreaSeriesPrivate17createDefaultAxisEN2Qt11OrientationE@Qt_5 5.10.1 _ZNK8QtCharts18QCandlestickSeries10metaObjectEv@Qt_5 5.9.0~rc _ZNK8QtCharts18QCandlestickSeries11capsVisibleEv@Qt_5 5.9.0~rc _ZNK8QtCharts18QCandlestickSeries15decreasingColorEv@Qt_5 5.9.0~rc @@ -3294,21 +1329,6 @@ _ZNK8QtCharts18QCandlestickSeries5countEv@Qt_5 5.9.0~rc _ZNK8QtCharts18QCandlestickSeries9bodyWidthEv@Qt_5 5.9.0~rc _ZNK8QtCharts18QCandlestickSeries9capsWidthEv@Qt_5 5.9.0~rc - _ZNK8QtCharts19AbstractChartLayout21calculateTitleMinimumERK6QRectFPNS_10ChartTitleE@Qt_5 5.10.1 - _ZNK8QtCharts19AbstractChartLayout22calculateLegendMinimumERK6QRectFPNS_7QLegendE@Qt_5 5.10.1 - _ZNK8QtCharts19AbstractChartLayout22calculateTitleGeometryERK6QRectFPNS_10ChartTitleEb@Qt_5 5.12.2 - _ZNK8QtCharts19AbstractChartLayout23calculateContentMinimumERK6QRectF@Qt_5 5.10.1 - _ZNK8QtCharts19AbstractChartLayout23calculateLegendGeometryERK6QRectFPNS_7QLegendEb@Qt_5 5.12.2 - _ZNK8QtCharts19AbstractChartLayout24calculateContentGeometryERK6QRectF@Qt_5 5.10.1 - _ZNK8QtCharts19AbstractChartLayout26calculateBackgroundMinimumERK6QRectF@Qt_5 5.10.1 - _ZNK8QtCharts19AbstractChartLayout27calculateBackgroundGeometryERK6QRectFPNS_15ChartBackgroundEb@Qt_5 5.12.2 - _ZNK8QtCharts19AbstractChartLayout7marginsEv@Qt_5 5.10.1 - _ZNK8QtCharts19AbstractChartLayout8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts19LogXLogYPolarDomain10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts19LogXLogYPolarDomain18toRadialCoordinateEdRb@Qt_5 5.10.1 - _ZNK8QtCharts19LogXLogYPolarDomain19toAngularCoordinateEdRb@Qt_5 5.10.1 - _ZNK8QtCharts19LogXLogYPolarDomain20calculateDomainPointERK7QPointF@Qt_5 5.10.1 - _ZNK8QtCharts19PercentBarChartItem10metaObjectEv@Qt_5 5.10.1 _ZNK8QtCharts19QBoxPlotModelMapper10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts19QBoxPlotModelMapper11orientationEv@Qt_5 5.7.1 _ZNK8QtCharts19QBoxPlotModelMapper17lastBoxSetSectionEv@Qt_5 5.7.1 @@ -3317,25 +1337,7 @@ _ZNK8QtCharts19QBoxPlotModelMapper5firstEv@Qt_5 5.7.1 _ZNK8QtCharts19QBoxPlotModelMapper5modelEv@Qt_5 5.7.1 _ZNK8QtCharts19QBoxPlotModelMapper6seriesEv@Qt_5 5.7.1 - _ZNK8QtCharts19StackedBarChartItem10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts20AbstractBarChartItem10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts20AbstractBarChartItem12boundingRectEv@Qt_5 5.10.1 - _ZNK8QtCharts20AbstractBarChartItem9animationEv@Qt_5 5.11.1 - _ZNK8QtCharts20BoxWhiskersAnimation10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts20BoxWhiskersAnimation12interpolatedERK8QVariantS3_d@Qt_5 5.10.1 - _ZNK8QtCharts20CandlestickAnimation10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts20CandlestickChartItem10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts20CandlestickChartItem12boundingRectEv@Qt_5 5.10.1 - _ZNK8QtCharts20CartesianChartLayout20calculateAxisMinimumERK6QRectFRK5QListIPNS_16ChartAxisElementEE@Qt_5 5.10.1 - _ZNK8QtCharts20CartesianChartLayout21calculateAxisGeometryERK6QRectFRK5QListIPNS_16ChartAxisElementEEb@Qt_5 5.12.2 - _ZNK8QtCharts20PolarChartAxisRadial10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts20PolarChartAxisRadial11orientationEv@Qt_5 5.10.1 - _ZNK8QtCharts20PolarChartAxisRadial8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts20QAbstractAxisPrivate10metaObjectEv@Qt_5 5.10.1 _ZNK8QtCharts20QBoxPlotLegendMarker10metaObjectEv@Qt_5 5.7.1 - _ZNK8QtCharts20QCategoryAxisPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts20QCategoryAxisPrivate10ticksCountEv@Qt_5 5.10.1 - _ZNK8QtCharts20QDateTimeAxisPrivate10metaObjectEv@Qt_5 5.10.1 _ZNK8QtCharts20QHBoxPlotModelMapper10metaObjectEv@Qt_5 5.9.0~rc _ZNK8QtCharts20QHBoxPlotModelMapper11columnCountEv@Qt_5 5.9.0~rc _ZNK8QtCharts20QHBoxPlotModelMapper11firstColumnEv@Qt_5 5.9.0~rc @@ -3345,9 +1347,6 @@ _ZNK8QtCharts20QHBoxPlotModelMapper6seriesEv@Qt_5 5.9.0~rc _ZNK8QtCharts20QHorizontalBarSeries10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts20QHorizontalBarSeries4typeEv@Qt_5 5.7.1 - _ZNK8QtCharts20QLegendMarkerPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts20QLogValueAxisPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts20QSplineSeriesPrivate10metaObjectEv@Qt_5 5.10.1 _ZNK8QtCharts20QVBoxPlotModelMapper10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts20QVBoxPlotModelMapper16lastBoxSetColumnEv@Qt_5 5.7.1 _ZNK8QtCharts20QVBoxPlotModelMapper17firstBoxSetColumnEv@Qt_5 5.7.1 @@ -3355,35 +1354,6 @@ _ZNK8QtCharts20QVBoxPlotModelMapper6seriesEv@Qt_5 5.7.1 _ZNK8QtCharts20QVBoxPlotModelMapper8firstRowEv@Qt_5 5.7.1 _ZNK8QtCharts20QVBoxPlotModelMapper8rowCountEv@Qt_5 5.7.1 - _ZNK8QtCharts21ChartBarCategoryAxisX10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts21ChartBarCategoryAxisX15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts21ChartBarCategoryAxisX20createCategoryLabelsERK7QVectorIdE@Qt_5 5.10.1 - _ZNK8QtCharts21ChartBarCategoryAxisX8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts21ChartBarCategoryAxisY10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts21ChartBarCategoryAxisY15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts21ChartBarCategoryAxisY20createCategoryLabelsERK7QVectorIdE@Qt_5 5.10.1 - _ZNK8QtCharts21ChartBarCategoryAxisY8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts21GLXYSeriesDataManager10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts21PolarChartAxisAngular10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts21PolarChartAxisAngular11orientationEv@Qt_5 5.10.1 - _ZNK8QtCharts21PolarChartAxisAngular19moveLabelToPositionEd7QPointF6QRectF@Qt_5 5.10.1 - _ZNK8QtCharts21PolarChartAxisAngular8sizeHintEN2Qt8SizeHintERK6QSizeF@Qt_5 5.10.1 - _ZNK8QtCharts21QBoxPlotSeriesPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts21QBoxPlotSeriesPrivate15defaultAxisTypeEN2Qt11OrientationE@Qt_5 5.10.1 - _ZNK8QtCharts21QBoxPlotSeriesPrivate17createDefaultAxisEN2Qt11OrientationE@Qt_5 5.10.1 - _ZNK8QtCharts21QXYModelMapperPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts22HorizontalBarChartItem10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts22QAbstractSeriesPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts22QAbstractSeriesPrivate9presenterEv@Qt_5 5.10.1 - _ZNK8QtCharts22QBarModelMapperPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts22QCandlestickSetPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts22QPieModelMapperPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts22QPieModelMapperPrivate12isLabelIndexE11QModelIndex@Qt_5 5.10.1 - _ZNK8QtCharts22QPieModelMapperPrivate12isValueIndexE11QModelIndex@Qt_5 5.10.1 - _ZNK8QtCharts22QPieModelMapperPrivate8pieSliceE11QModelIndex@Qt_5 5.10.1 - _ZNK8QtCharts22QXYLegendMarkerPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts23QBarCategoryAxisPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts23QBarLegendMarkerPrivate10metaObjectEv@Qt_5 5.10.1 _ZNK8QtCharts23QCandlestickModelMapper10metaObjectEv@Qt_5 5.9.0~rc _ZNK8QtCharts23QCandlestickModelMapper14lastSetSectionEv@Qt_5 5.9.0~rc _ZNK8QtCharts23QCandlestickModelMapper15firstSetSectionEv@Qt_5 5.9.0~rc @@ -3394,8 +1364,6 @@ _ZNK8QtCharts23QCandlestickModelMapper5modelEv@Qt_5 5.9.0~rc _ZNK8QtCharts23QCandlestickModelMapper6seriesEv@Qt_5 5.9.0~rc _ZNK8QtCharts23QCandlestickModelMapper9timestampEv@Qt_5 5.9.0~rc - _ZNK8QtCharts23QPieLegendMarkerPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts24QAreaLegendMarkerPrivate10metaObjectEv@Qt_5 5.10.1 _ZNK8QtCharts24QCandlestickLegendMarker10metaObjectEv@Qt_5 5.9.0~rc _ZNK8QtCharts24QHCandlestickModelMapper10highColumnEv@Qt_5 5.9.0~rc _ZNK8QtCharts24QHCandlestickModelMapper10lastSetRowEv@Qt_5 5.9.0~rc @@ -3415,43 +1383,10 @@ _ZNK8QtCharts24QVCandlestickModelMapper7highRowEv@Qt_5 5.9.0~rc _ZNK8QtCharts24QVCandlestickModelMapper7openRowEv@Qt_5 5.9.0~rc _ZNK8QtCharts24QVCandlestickModelMapper8closeRowEv@Qt_5 5.9.0~rc - _ZNK8QtCharts25PolarChartValueAxisRadial10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts25PolarChartValueAxisRadial15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts25QAbstractBarSeriesPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts25QAbstractBarSeriesPrivate11labelsAngleEv@Qt_5 5.10.1 - _ZNK8QtCharts25QAbstractBarSeriesPrivate13categoryCountEv@Qt_5 5.10.1 - _ZNK8QtCharts25QAbstractBarSeriesPrivate15defaultAxisTypeEN2Qt11OrientationE@Qt_5 5.10.1 - _ZNK8QtCharts25QAbstractBarSeriesPrivate17createDefaultAxisEN2Qt11OrientationE@Qt_5 5.10.1 - _ZNK8QtCharts25QAbstractBarSeriesPrivate8barWidthEv@Qt_5 5.10.1 - _ZNK8QtCharts25QCandlestickSeriesPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts25QCandlestickSeriesPrivate15defaultAxisTypeEN2Qt11OrientationE@Qt_5 5.10.1 - _ZNK8QtCharts25QCandlestickSeriesPrivate17createDefaultAxisEN2Qt11OrientationE@Qt_5 5.10.1 - _ZNK8QtCharts26PolarChartValueAxisAngular10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts26PolarChartValueAxisAngular15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts27QBoxPlotLegendMarkerPrivate10metaObjectEv@Qt_5 5.10.1 _ZNK8QtCharts27QHorizontalPercentBarSeries10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts27QHorizontalPercentBarSeries4typeEv@Qt_5 5.7.1 _ZNK8QtCharts27QHorizontalStackedBarSeries10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts27QHorizontalStackedBarSeries4typeEv@Qt_5 5.7.1 - _ZNK8QtCharts28PolarChartCategoryAxisRadial10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts28PolarChartCategoryAxisRadial15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts28PolarChartDateTimeAxisRadial10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts28PolarChartDateTimeAxisRadial15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts28PolarChartLogValueAxisRadial10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts28PolarChartLogValueAxisRadial15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts29CandlestickBodyWicksAnimation10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts29CandlestickBodyWicksAnimation12interpolatedERK8QVariantS3_d@Qt_5 5.10.1 - _ZNK8QtCharts29HorizontalPercentBarChartItem10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts29HorizontalStackedBarChartItem10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts29PolarChartCategoryAxisAngular10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts29PolarChartCategoryAxisAngular15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts29PolarChartDateTimeAxisAngular10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts29PolarChartDateTimeAxisAngular15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts29PolarChartLogValueAxisAngular10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts29PolarChartLogValueAxisAngular15calculateLayoutEv@Qt_5 5.10.1 - _ZNK8QtCharts30QCandlestickModelMapperPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts31QCandlestickLegendMarkerPrivate10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts3Bar10metaObjectEv@Qt_5 5.10.1 _ZNK8QtCharts6QChart10metaObjectEv@Qt_5 5.7.1 _ZNK8QtCharts6QChart10titleBrushEv@Qt_5 5.7.1 _ZNK8QtCharts6QChart13backgroundPenEv@Qt_5 5.7.1 @@ -3506,13 +1441,6 @@ _ZNK8QtCharts7QLegend5brushEv@Qt_5 5.7.1 _ZNK8QtCharts7QLegend7markersEPNS_15QAbstractSeriesE@Qt_5 5.7.1 _ZNK8QtCharts7QLegend9alignmentEv@Qt_5 5.7.1 - _ZNK8QtCharts7XYChart10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts8XYDomain10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts8XYDomain20calculateDomainPointERK7QPointF@Qt_5 5.10.1 - _ZNK8QtCharts8XYDomain22calculateGeometryPointERK7QPointFRb@Qt_5 5.10.1 - _ZNK8QtCharts8XYDomain23calculateGeometryPointsERK7QVectorI7QPointFE@Qt_5 5.10.1 - _ZNK8QtCharts9ChartItem10metaObjectEv@Qt_5 5.10.1 - _ZNK8QtCharts9ChartItem6domainEv@Qt_5 5.10.1 _ZNK8QtCharts9QPieSlice10isExplodedEv@Qt_5 5.7.1 _ZNK8QtCharts9QPieSlice10labelBrushEv@Qt_5 5.7.1 _ZNK8QtCharts9QPieSlice10metaObjectEv@Qt_5 5.7.1 @@ -3543,59 +1471,22 @@ _ZNK8QtCharts9QXYSeries5countEv@Qt_5 5.7.1 _ZNK8QtCharts9QXYSeries6pointsEv@Qt_5 5.7.1 _ZTI16QOpenGLFunctions@Qt_5 5.7.1 - _ZTIN8QtCharts10ChartTitleE@Qt_5 5.10.1 _ZTIN8QtCharts10QBarSeriesE@Qt_5 5.7.1 _ZTIN8QtCharts10QChartViewE@Qt_5 5.7.1 _ZTIN8QtCharts10QPieSeriesE@Qt_5 5.7.1 _ZTIN8QtCharts10QValueAxisE@Qt_5 5.7.1 - _ZTIN8QtCharts11BoxWhiskersE@Qt_5 5.10.1 - _ZTIN8QtCharts11CandlestickE@Qt_5 5.10.1 - _ZTIN8QtCharts11LogXYDomainE@Qt_5 5.10.1 - _ZTIN8QtCharts11PolarDomainE@Qt_5 5.10.1 _ZTIN8QtCharts11QAreaSeriesE@Qt_5 5.7.1 _ZTIN8QtCharts11QLineSeriesE@Qt_5 5.7.1 _ZTIN8QtCharts11QPolarChartE@Qt_5 5.7.1 - _ZTIN8QtCharts11XLogYDomainE@Qt_5 5.10.1 - _ZTIN8QtCharts11XYAnimationE@Qt_5 5.10.1 - _ZTIN8QtCharts12BarAnimationE@Qt_5 5.10.1 - _ZTIN8QtCharts12BarChartItemE@Qt_5 5.10.1 - _ZTIN8QtCharts12ChartDataSetE@Qt_5 5.10.1 - _ZTIN8QtCharts12ChartElementE@Qt_5 5.10.1 - _ZTIN8QtCharts12CircleMarkerE@Qt_5 5.10.1 - _ZTIN8QtCharts12LegendLayoutE@Qt_5 5.10.1 - _ZTIN8QtCharts12PieAnimationE@Qt_5 5.10.1 - _ZTIN8QtCharts12PieChartItemE@Qt_5 5.10.1 - _ZTIN8QtCharts12PieSliceItemE@Qt_5 5.10.1 - _ZTIN8QtCharts12ScrollTickerE@Qt_5 5.10.1 - _ZTIN8QtCharts12VerticalAxisE@Qt_5 5.10.1 - _ZTIN8QtCharts13AreaBoundItemE@Qt_5 5.10.1 - _ZTIN8QtCharts13AreaChartItemE@Qt_5 5.10.1 - _ZTIN8QtCharts13AxisAnimationE@Qt_5 5.10.1 - _ZTIN8QtCharts13LineArrowItemE@Qt_5 5.10.1 - _ZTIN8QtCharts13LineChartItemE@Qt_5 5.10.1 _ZTIN8QtCharts13QAbstractAxisE@Qt_5 5.7.1 _ZTIN8QtCharts13QCategoryAxisE@Qt_5 5.7.1 _ZTIN8QtCharts13QDateTimeAxisE@Qt_5 5.7.1 _ZTIN8QtCharts13QLegendMarkerE@Qt_5 5.7.1 _ZTIN8QtCharts13QLogValueAxisE@Qt_5 5.7.1 _ZTIN8QtCharts13QSplineSeriesE@Qt_5 5.7.1 - _ZTIN8QtCharts13XYPolarDomainE@Qt_5 5.10.1 - _ZTIN8QtCharts14AbstractDomainE@Qt_5 5.10.1 - _ZTIN8QtCharts14ChartAnimationE@Qt_5 5.10.1 - _ZTIN8QtCharts14ChartPresenterE@Qt_5 5.10.1 - _ZTIN8QtCharts14HorizontalAxisE@Qt_5 5.10.1 - _ZTIN8QtCharts14LegendScrollerE@Qt_5 5.10.1 - _ZTIN8QtCharts14LogXLogYDomainE@Qt_5 5.10.1 - _ZTIN8QtCharts14PolarChartAxisE@Qt_5 5.10.1 - _ZTIN8QtCharts14QBarSetPrivateE@Qt_5 5.10.1 _ZTIN8QtCharts14QBoxPlotSeriesE@Qt_5 5.7.1 - _ZTIN8QtCharts14QBoxSetPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts14QLegendPrivateE@Qt_5 5.10.1 _ZTIN8QtCharts14QScatterSeriesE@Qt_5 5.7.1 _ZTIN8QtCharts14QXYModelMapperE@Qt_5 5.7.1 - _ZTIN8QtCharts15ChartBackgroundE@Qt_5 5.10.1 - _ZTIN8QtCharts15ChartValueAxisXE@Qt_5 5.10.1 - _ZTIN8QtCharts15ChartValueAxisYE@Qt_5 5.10.1 _ZTIN8QtCharts15QAbstractSeriesE@Qt_5 5.7.1 _ZTIN8QtCharts15QBarModelMapperE@Qt_5 5.7.1 _ZTIN8QtCharts15QCandlestickSetE@Qt_5 5.9.0~rc @@ -3603,176 +1494,52 @@ _ZTIN8QtCharts15QPieModelMapperE@Qt_5 5.7.1 _ZTIN8QtCharts15QVXYModelMapperE@Qt_5 5.7.1 _ZTIN8QtCharts15QXYLegendMarkerE@Qt_5 5.7.1 - _ZTIN8QtCharts15RectangleMarkerE@Qt_5 5.10.1 - _ZTIN8QtCharts15SplineAnimationE@Qt_5 5.10.1 - _ZTIN8QtCharts15SplineChartItemE@Qt_5 5.10.1 - _ZTIN8QtCharts16BoxPlotAnimationE@Qt_5 5.10.1 - _ZTIN8QtCharts16BoxPlotChartItemE@Qt_5 5.10.1 - _ZTIN8QtCharts16ChartAxisElementE@Qt_5 5.10.1 - _ZTIN8QtCharts16LegendMarkerItemE@Qt_5 5.10.1 - _ZTIN8QtCharts16LogXYPolarDomainE@Qt_5 5.10.1 - _ZTIN8QtCharts16PolarChartLayoutE@Qt_5 5.10.1 _ZTIN8QtCharts16QBarCategoryAxisE@Qt_5 5.7.1 _ZTIN8QtCharts16QBarLegendMarkerE@Qt_5 5.7.1 _ZTIN8QtCharts16QHBarModelMapperE@Qt_5 5.7.1 _ZTIN8QtCharts16QHPieModelMapperE@Qt_5 5.7.1 _ZTIN8QtCharts16QPieLegendMarkerE@Qt_5 5.7.1 - _ZTIN8QtCharts16QPieSlicePrivateE@Qt_5 5.10.1 _ZTIN8QtCharts16QVBarModelMapperE@Qt_5 5.7.1 _ZTIN8QtCharts16QVPieModelMapperE@Qt_5 5.7.1 - _ZTIN8QtCharts16QXYSeriesPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts16ScatterAnimationE@Qt_5 5.10.1 - _ZTIN8QtCharts16ScatterChartItemE@Qt_5 5.10.1 - _ZTIN8QtCharts16XLogYPolarDomainE@Qt_5 5.10.1 - _ZTIN8QtCharts17ChartThemeManagerE@Qt_5 5.10.1 - _ZTIN8QtCharts17PieSliceAnimationE@Qt_5 5.10.1 _ZTIN8QtCharts17QAreaLegendMarkerE@Qt_5 5.7.1 - _ZTIN8QtCharts17QBarSeriesPrivateE@Qt_5 5.10.1 _ZTIN8QtCharts17QPercentBarSeriesE@Qt_5 5.7.1 - _ZTIN8QtCharts17QPieSeriesPrivateE@Qt_5 5.10.1 _ZTIN8QtCharts17QStackedBarSeriesE@Qt_5 5.7.1 - _ZTIN8QtCharts17QValueAxisPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts18CartesianChartAxisE@Qt_5 5.10.1 - _ZTIN8QtCharts18ChartCategoryAxisXE@Qt_5 5.10.1 - _ZTIN8QtCharts18ChartCategoryAxisYE@Qt_5 5.10.1 - _ZTIN8QtCharts18ChartDateTimeAxisXE@Qt_5 5.10.1 - _ZTIN8QtCharts18ChartDateTimeAxisYE@Qt_5 5.10.1 - _ZTIN8QtCharts18ChartLogValueAxisXE@Qt_5 5.10.1 - _ZTIN8QtCharts18ChartLogValueAxisYE@Qt_5 5.10.1 _ZTIN8QtCharts18QAbstractBarSeriesE@Qt_5 5.7.1 - _ZTIN8QtCharts18QAreaSeriesPrivateE@Qt_5 5.10.1 _ZTIN8QtCharts18QCandlestickSeriesE@Qt_5 5.9.0~rc - _ZTIN8QtCharts18QLineSeriesPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts19AbstractChartLayoutE@Qt_5 5.10.1 - _ZTIN8QtCharts19LogXLogYPolarDomainE@Qt_5 5.10.1 - _ZTIN8QtCharts19PercentBarChartItemE@Qt_5 5.10.1 _ZTIN8QtCharts19QBoxPlotModelMapperE@Qt_5 5.7.1 - _ZTIN8QtCharts19StackedBarChartItemE@Qt_5 5.10.1 - _ZTIN8QtCharts20AbstractBarChartItemE@Qt_5 5.10.1 - _ZTIN8QtCharts20BoxWhiskersAnimationE@Qt_5 5.10.1 - _ZTIN8QtCharts20CandlestickAnimationE@Qt_5 5.10.1 - _ZTIN8QtCharts20CandlestickChartItemE@Qt_5 5.10.1 - _ZTIN8QtCharts20CartesianChartLayoutE@Qt_5 5.10.1 - _ZTIN8QtCharts20PolarChartAxisRadialE@Qt_5 5.10.1 - _ZTIN8QtCharts20QAbstractAxisPrivateE@Qt_5 5.10.1 _ZTIN8QtCharts20QBoxPlotLegendMarkerE@Qt_5 5.7.1 - _ZTIN8QtCharts20QCategoryAxisPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts20QDateTimeAxisPrivateE@Qt_5 5.10.1 _ZTIN8QtCharts20QHBoxPlotModelMapperE@Qt_5 5.9.0~rc _ZTIN8QtCharts20QHorizontalBarSeriesE@Qt_5 5.7.1 - _ZTIN8QtCharts20QLegendMarkerPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts20QLogValueAxisPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts20QSplineSeriesPrivateE@Qt_5 5.10.1 _ZTIN8QtCharts20QVBoxPlotModelMapperE@Qt_5 5.7.1 - _ZTIN8QtCharts21ChartBarCategoryAxisXE@Qt_5 5.10.1 - _ZTIN8QtCharts21ChartBarCategoryAxisYE@Qt_5 5.10.1 - _ZTIN8QtCharts21GLXYSeriesDataManagerE@Qt_5 5.10.1 - _ZTIN8QtCharts21PolarChartAxisAngularE@Qt_5 5.10.1 - _ZTIN8QtCharts21QBoxPlotSeriesPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts21QScatterSeriesPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts21QXYModelMapperPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts22HorizontalBarChartItemE@Qt_5 5.10.1 - _ZTIN8QtCharts22QAbstractSeriesPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts22QBarModelMapperPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts22QCandlestickSetPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts22QPieModelMapperPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts22QXYLegendMarkerPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts23QBarCategoryAxisPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts23QBarLegendMarkerPrivateE@Qt_5 5.10.1 _ZTIN8QtCharts23QCandlestickModelMapperE@Qt_5 5.9.0~rc - _ZTIN8QtCharts23QPieLegendMarkerPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts24QAreaLegendMarkerPrivateE@Qt_5 5.10.1 _ZTIN8QtCharts24QCandlestickLegendMarkerE@Qt_5 5.9.0~rc _ZTIN8QtCharts24QHCandlestickModelMapperE@Qt_5 5.9.0~rc - _ZTIN8QtCharts24QPercentBarSeriesPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts24QStackedBarSeriesPrivateE@Qt_5 5.10.1 _ZTIN8QtCharts24QVCandlestickModelMapperE@Qt_5 5.9.0~rc - _ZTIN8QtCharts25PolarChartValueAxisRadialE@Qt_5 5.10.1 - _ZTIN8QtCharts25QAbstractBarSeriesPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts25QCandlestickSeriesPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts26PolarChartValueAxisAngularE@Qt_5 5.10.1 - _ZTIN8QtCharts27QBoxPlotLegendMarkerPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts27QHorizontalBarSeriesPrivateE@Qt_5 5.10.1 _ZTIN8QtCharts27QHorizontalPercentBarSeriesE@Qt_5 5.7.1 _ZTIN8QtCharts27QHorizontalStackedBarSeriesE@Qt_5 5.7.1 - _ZTIN8QtCharts28PolarChartCategoryAxisRadialE@Qt_5 5.10.1 - _ZTIN8QtCharts28PolarChartDateTimeAxisRadialE@Qt_5 5.10.1 - _ZTIN8QtCharts28PolarChartLogValueAxisRadialE@Qt_5 5.10.1 - _ZTIN8QtCharts29CandlestickBodyWicksAnimationE@Qt_5 5.10.1 - _ZTIN8QtCharts29HorizontalPercentBarChartItemE@Qt_5 5.10.1 - _ZTIN8QtCharts29HorizontalStackedBarChartItemE@Qt_5 5.10.1 - _ZTIN8QtCharts29PolarChartCategoryAxisAngularE@Qt_5 5.10.1 - _ZTIN8QtCharts29PolarChartDateTimeAxisAngularE@Qt_5 5.10.1 - _ZTIN8QtCharts29PolarChartLogValueAxisAngularE@Qt_5 5.10.1 - _ZTIN8QtCharts30QCandlestickModelMapperPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts31QCandlestickLegendMarkerPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts34QHorizontalPercentBarSeriesPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts34QHorizontalStackedBarSeriesPrivateE@Qt_5 5.10.1 - _ZTIN8QtCharts3BarE@Qt_5 5.10.1 _ZTIN8QtCharts6QChartE@Qt_5 5.7.1 _ZTIN8QtCharts7QBarSetE@Qt_5 5.7.1 _ZTIN8QtCharts7QBoxSetE@Qt_5 5.7.1 _ZTIN8QtCharts7QLegendE@Qt_5 5.7.1 - _ZTIN8QtCharts7XYChartE@Qt_5 5.10.1 - _ZTIN8QtCharts8ScrollerE@Qt_5 5.10.1 - _ZTIN8QtCharts8XYDomainE@Qt_5 5.10.1 - _ZTIN8QtCharts9ChartItemE@Qt_5 5.10.1 _ZTIN8QtCharts9QPieSliceE@Qt_5 5.7.1 _ZTIN8QtCharts9QXYSeriesE@Qt_5 5.7.1 _ZTS16QOpenGLFunctions@Qt_5 5.7.1 - _ZTSN8QtCharts10ChartTitleE@Qt_5 5.10.1 _ZTSN8QtCharts10QBarSeriesE@Qt_5 5.7.1 _ZTSN8QtCharts10QChartViewE@Qt_5 5.7.1 _ZTSN8QtCharts10QPieSeriesE@Qt_5 5.7.1 _ZTSN8QtCharts10QValueAxisE@Qt_5 5.7.1 - _ZTSN8QtCharts11BoxWhiskersE@Qt_5 5.10.1 - _ZTSN8QtCharts11CandlestickE@Qt_5 5.10.1 - _ZTSN8QtCharts11LogXYDomainE@Qt_5 5.10.1 - _ZTSN8QtCharts11PolarDomainE@Qt_5 5.10.1 _ZTSN8QtCharts11QAreaSeriesE@Qt_5 5.7.1 _ZTSN8QtCharts11QLineSeriesE@Qt_5 5.7.1 _ZTSN8QtCharts11QPolarChartE@Qt_5 5.7.1 - _ZTSN8QtCharts11XLogYDomainE@Qt_5 5.10.1 - _ZTSN8QtCharts11XYAnimationE@Qt_5 5.10.1 - _ZTSN8QtCharts12BarAnimationE@Qt_5 5.10.1 - _ZTSN8QtCharts12BarChartItemE@Qt_5 5.10.1 - _ZTSN8QtCharts12ChartDataSetE@Qt_5 5.10.1 - _ZTSN8QtCharts12ChartElementE@Qt_5 5.10.1 - _ZTSN8QtCharts12CircleMarkerE@Qt_5 5.10.1 - _ZTSN8QtCharts12LegendLayoutE@Qt_5 5.10.1 - _ZTSN8QtCharts12PieAnimationE@Qt_5 5.10.1 - _ZTSN8QtCharts12PieChartItemE@Qt_5 5.10.1 - _ZTSN8QtCharts12PieSliceItemE@Qt_5 5.10.1 - _ZTSN8QtCharts12ScrollTickerE@Qt_5 5.10.1 - _ZTSN8QtCharts12VerticalAxisE@Qt_5 5.10.1 - _ZTSN8QtCharts13AreaBoundItemE@Qt_5 5.10.1 - _ZTSN8QtCharts13AreaChartItemE@Qt_5 5.10.1 - _ZTSN8QtCharts13AxisAnimationE@Qt_5 5.10.1 - _ZTSN8QtCharts13LineArrowItemE@Qt_5 5.10.1 - _ZTSN8QtCharts13LineChartItemE@Qt_5 5.10.1 _ZTSN8QtCharts13QAbstractAxisE@Qt_5 5.7.1 _ZTSN8QtCharts13QCategoryAxisE@Qt_5 5.7.1 _ZTSN8QtCharts13QDateTimeAxisE@Qt_5 5.7.1 _ZTSN8QtCharts13QLegendMarkerE@Qt_5 5.7.1 _ZTSN8QtCharts13QLogValueAxisE@Qt_5 5.7.1 _ZTSN8QtCharts13QSplineSeriesE@Qt_5 5.7.1 - _ZTSN8QtCharts13XYPolarDomainE@Qt_5 5.10.1 - _ZTSN8QtCharts14AbstractDomainE@Qt_5 5.10.1 - _ZTSN8QtCharts14ChartAnimationE@Qt_5 5.10.1 - _ZTSN8QtCharts14ChartPresenterE@Qt_5 5.10.1 - _ZTSN8QtCharts14HorizontalAxisE@Qt_5 5.10.1 - _ZTSN8QtCharts14LegendScrollerE@Qt_5 5.10.1 - _ZTSN8QtCharts14LogXLogYDomainE@Qt_5 5.10.1 - _ZTSN8QtCharts14PolarChartAxisE@Qt_5 5.10.1 - _ZTSN8QtCharts14QBarSetPrivateE@Qt_5 5.10.1 _ZTSN8QtCharts14QBoxPlotSeriesE@Qt_5 5.7.1 - _ZTSN8QtCharts14QBoxSetPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts14QLegendPrivateE@Qt_5 5.10.1 _ZTSN8QtCharts14QScatterSeriesE@Qt_5 5.7.1 _ZTSN8QtCharts14QXYModelMapperE@Qt_5 5.7.1 - _ZTSN8QtCharts15ChartBackgroundE@Qt_5 5.10.1 - _ZTSN8QtCharts15ChartValueAxisXE@Qt_5 5.10.1 - _ZTSN8QtCharts15ChartValueAxisYE@Qt_5 5.10.1 _ZTSN8QtCharts15QAbstractSeriesE@Qt_5 5.7.1 _ZTSN8QtCharts15QBarModelMapperE@Qt_5 5.7.1 _ZTSN8QtCharts15QCandlestickSetE@Qt_5 5.9.0~rc @@ -3780,175 +1547,51 @@ _ZTSN8QtCharts15QPieModelMapperE@Qt_5 5.7.1 _ZTSN8QtCharts15QVXYModelMapperE@Qt_5 5.7.1 _ZTSN8QtCharts15QXYLegendMarkerE@Qt_5 5.7.1 - _ZTSN8QtCharts15RectangleMarkerE@Qt_5 5.10.1 - _ZTSN8QtCharts15SplineAnimationE@Qt_5 5.10.1 - _ZTSN8QtCharts15SplineChartItemE@Qt_5 5.10.1 - _ZTSN8QtCharts16BoxPlotAnimationE@Qt_5 5.10.1 - _ZTSN8QtCharts16BoxPlotChartItemE@Qt_5 5.10.1 - _ZTSN8QtCharts16ChartAxisElementE@Qt_5 5.10.1 - _ZTSN8QtCharts16LegendMarkerItemE@Qt_5 5.10.1 - _ZTSN8QtCharts16LogXYPolarDomainE@Qt_5 5.10.1 - _ZTSN8QtCharts16PolarChartLayoutE@Qt_5 5.10.1 _ZTSN8QtCharts16QBarCategoryAxisE@Qt_5 5.7.1 _ZTSN8QtCharts16QBarLegendMarkerE@Qt_5 5.7.1 _ZTSN8QtCharts16QHBarModelMapperE@Qt_5 5.7.1 _ZTSN8QtCharts16QHPieModelMapperE@Qt_5 5.7.1 _ZTSN8QtCharts16QPieLegendMarkerE@Qt_5 5.7.1 - _ZTSN8QtCharts16QPieSlicePrivateE@Qt_5 5.10.1 _ZTSN8QtCharts16QVBarModelMapperE@Qt_5 5.7.1 _ZTSN8QtCharts16QVPieModelMapperE@Qt_5 5.7.1 - _ZTSN8QtCharts16QXYSeriesPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts16ScatterAnimationE@Qt_5 5.10.1 - _ZTSN8QtCharts16ScatterChartItemE@Qt_5 5.10.1 - _ZTSN8QtCharts16XLogYPolarDomainE@Qt_5 5.10.1 - _ZTSN8QtCharts17ChartThemeManagerE@Qt_5 5.10.1 - _ZTSN8QtCharts17PieSliceAnimationE@Qt_5 5.10.1 _ZTSN8QtCharts17QAreaLegendMarkerE@Qt_5 5.7.1 - _ZTSN8QtCharts17QBarSeriesPrivateE@Qt_5 5.10.1 _ZTSN8QtCharts17QPercentBarSeriesE@Qt_5 5.7.1 - _ZTSN8QtCharts17QPieSeriesPrivateE@Qt_5 5.10.1 _ZTSN8QtCharts17QStackedBarSeriesE@Qt_5 5.7.1 - _ZTSN8QtCharts17QValueAxisPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts18CartesianChartAxisE@Qt_5 5.10.1 - _ZTSN8QtCharts18ChartCategoryAxisXE@Qt_5 5.10.1 - _ZTSN8QtCharts18ChartCategoryAxisYE@Qt_5 5.10.1 - _ZTSN8QtCharts18ChartDateTimeAxisXE@Qt_5 5.10.1 - _ZTSN8QtCharts18ChartDateTimeAxisYE@Qt_5 5.10.1 - _ZTSN8QtCharts18ChartLogValueAxisXE@Qt_5 5.10.1 - _ZTSN8QtCharts18ChartLogValueAxisYE@Qt_5 5.10.1 _ZTSN8QtCharts18QAbstractBarSeriesE@Qt_5 5.7.1 - _ZTSN8QtCharts18QAreaSeriesPrivateE@Qt_5 5.10.1 _ZTSN8QtCharts18QCandlestickSeriesE@Qt_5 5.9.0~rc - _ZTSN8QtCharts18QLineSeriesPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts19AbstractChartLayoutE@Qt_5 5.10.1 - _ZTSN8QtCharts19LogXLogYPolarDomainE@Qt_5 5.10.1 - _ZTSN8QtCharts19PercentBarChartItemE@Qt_5 5.10.1 _ZTSN8QtCharts19QBoxPlotModelMapperE@Qt_5 5.7.1 - _ZTSN8QtCharts19StackedBarChartItemE@Qt_5 5.10.1 - _ZTSN8QtCharts20AbstractBarChartItemE@Qt_5 5.10.1 - _ZTSN8QtCharts20BoxWhiskersAnimationE@Qt_5 5.10.1 - _ZTSN8QtCharts20CandlestickAnimationE@Qt_5 5.10.1 - _ZTSN8QtCharts20CandlestickChartItemE@Qt_5 5.10.1 - _ZTSN8QtCharts20CartesianChartLayoutE@Qt_5 5.10.1 - _ZTSN8QtCharts20PolarChartAxisRadialE@Qt_5 5.10.1 - _ZTSN8QtCharts20QAbstractAxisPrivateE@Qt_5 5.10.1 _ZTSN8QtCharts20QBoxPlotLegendMarkerE@Qt_5 5.7.1 - _ZTSN8QtCharts20QCategoryAxisPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts20QDateTimeAxisPrivateE@Qt_5 5.10.1 _ZTSN8QtCharts20QHBoxPlotModelMapperE@Qt_5 5.9.0~rc _ZTSN8QtCharts20QHorizontalBarSeriesE@Qt_5 5.7.1 - _ZTSN8QtCharts20QLegendMarkerPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts20QLogValueAxisPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts20QSplineSeriesPrivateE@Qt_5 5.10.1 _ZTSN8QtCharts20QVBoxPlotModelMapperE@Qt_5 5.7.1 - _ZTSN8QtCharts21ChartBarCategoryAxisXE@Qt_5 5.10.1 - _ZTSN8QtCharts21ChartBarCategoryAxisYE@Qt_5 5.10.1 - _ZTSN8QtCharts21GLXYSeriesDataManagerE@Qt_5 5.10.1 - _ZTSN8QtCharts21PolarChartAxisAngularE@Qt_5 5.10.1 - _ZTSN8QtCharts21QBoxPlotSeriesPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts21QScatterSeriesPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts21QXYModelMapperPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts22HorizontalBarChartItemE@Qt_5 5.10.1 - _ZTSN8QtCharts22QAbstractSeriesPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts22QBarModelMapperPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts22QCandlestickSetPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts22QPieModelMapperPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts22QXYLegendMarkerPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts23QBarCategoryAxisPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts23QBarLegendMarkerPrivateE@Qt_5 5.10.1 _ZTSN8QtCharts23QCandlestickModelMapperE@Qt_5 5.9.0~rc - _ZTSN8QtCharts23QPieLegendMarkerPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts24QAreaLegendMarkerPrivateE@Qt_5 5.10.1 _ZTSN8QtCharts24QCandlestickLegendMarkerE@Qt_5 5.9.0~rc _ZTSN8QtCharts24QHCandlestickModelMapperE@Qt_5 5.9.0~rc - _ZTSN8QtCharts24QPercentBarSeriesPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts24QStackedBarSeriesPrivateE@Qt_5 5.10.1 _ZTSN8QtCharts24QVCandlestickModelMapperE@Qt_5 5.9.0~rc - _ZTSN8QtCharts25PolarChartValueAxisRadialE@Qt_5 5.10.1 - _ZTSN8QtCharts25QAbstractBarSeriesPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts25QCandlestickSeriesPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts26PolarChartValueAxisAngularE@Qt_5 5.10.1 - _ZTSN8QtCharts27QBoxPlotLegendMarkerPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts27QHorizontalBarSeriesPrivateE@Qt_5 5.10.1 _ZTSN8QtCharts27QHorizontalPercentBarSeriesE@Qt_5 5.7.1 _ZTSN8QtCharts27QHorizontalStackedBarSeriesE@Qt_5 5.7.1 - _ZTSN8QtCharts28PolarChartCategoryAxisRadialE@Qt_5 5.10.1 - _ZTSN8QtCharts28PolarChartDateTimeAxisRadialE@Qt_5 5.10.1 - _ZTSN8QtCharts28PolarChartLogValueAxisRadialE@Qt_5 5.10.1 - _ZTSN8QtCharts29CandlestickBodyWicksAnimationE@Qt_5 5.10.1 - _ZTSN8QtCharts29HorizontalPercentBarChartItemE@Qt_5 5.10.1 - _ZTSN8QtCharts29HorizontalStackedBarChartItemE@Qt_5 5.10.1 - _ZTSN8QtCharts29PolarChartCategoryAxisAngularE@Qt_5 5.10.1 - _ZTSN8QtCharts29PolarChartDateTimeAxisAngularE@Qt_5 5.10.1 - _ZTSN8QtCharts29PolarChartLogValueAxisAngularE@Qt_5 5.10.1 - _ZTSN8QtCharts30QCandlestickModelMapperPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts31QCandlestickLegendMarkerPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts34QHorizontalPercentBarSeriesPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts34QHorizontalStackedBarSeriesPrivateE@Qt_5 5.10.1 - _ZTSN8QtCharts3BarE@Qt_5 5.10.1 _ZTSN8QtCharts6QChartE@Qt_5 5.7.1 _ZTSN8QtCharts7QBarSetE@Qt_5 5.7.1 _ZTSN8QtCharts7QBoxSetE@Qt_5 5.7.1 _ZTSN8QtCharts7QLegendE@Qt_5 5.7.1 - _ZTSN8QtCharts7XYChartE@Qt_5 5.10.1 - _ZTSN8QtCharts8ScrollerE@Qt_5 5.10.1 - _ZTSN8QtCharts8XYDomainE@Qt_5 5.10.1 - _ZTSN8QtCharts9ChartItemE@Qt_5 5.10.1 _ZTSN8QtCharts9QPieSliceE@Qt_5 5.7.1 _ZTSN8QtCharts9QXYSeriesE@Qt_5 5.7.1 - _ZTVN8QtCharts10ChartTitleE@Qt_5 5.10.1 _ZTVN8QtCharts10QBarSeriesE@Qt_5 5.7.1 _ZTVN8QtCharts10QChartViewE@Qt_5 5.7.1 _ZTVN8QtCharts10QPieSeriesE@Qt_5 5.7.1 _ZTVN8QtCharts10QValueAxisE@Qt_5 5.7.1 - _ZTVN8QtCharts11BoxWhiskersE@Qt_5 5.10.1 - _ZTVN8QtCharts11CandlestickE@Qt_5 5.10.1 - _ZTVN8QtCharts11LogXYDomainE@Qt_5 5.10.1 - _ZTVN8QtCharts11PolarDomainE@Qt_5 5.10.1 _ZTVN8QtCharts11QAreaSeriesE@Qt_5 5.7.1 _ZTVN8QtCharts11QLineSeriesE@Qt_5 5.7.1 _ZTVN8QtCharts11QPolarChartE@Qt_5 5.7.1 - _ZTVN8QtCharts11XLogYDomainE@Qt_5 5.10.1 - _ZTVN8QtCharts11XYAnimationE@Qt_5 5.10.1 - _ZTVN8QtCharts12BarAnimationE@Qt_5 5.10.1 - _ZTVN8QtCharts12BarChartItemE@Qt_5 5.10.1 - _ZTVN8QtCharts12ChartDataSetE@Qt_5 5.10.1 - _ZTVN8QtCharts12ChartElementE@Qt_5 5.10.1 - _ZTVN8QtCharts12CircleMarkerE@Qt_5 5.10.1 - _ZTVN8QtCharts12LegendLayoutE@Qt_5 5.10.1 - _ZTVN8QtCharts12PieAnimationE@Qt_5 5.10.1 - _ZTVN8QtCharts12PieChartItemE@Qt_5 5.10.1 - _ZTVN8QtCharts12PieSliceItemE@Qt_5 5.10.1 - _ZTVN8QtCharts12ScrollTickerE@Qt_5 5.10.1 - _ZTVN8QtCharts12VerticalAxisE@Qt_5 5.10.1 - _ZTVN8QtCharts13AreaBoundItemE@Qt_5 5.10.1 - _ZTVN8QtCharts13AreaChartItemE@Qt_5 5.10.1 - _ZTVN8QtCharts13AxisAnimationE@Qt_5 5.10.1 - _ZTVN8QtCharts13LineArrowItemE@Qt_5 5.10.1 - _ZTVN8QtCharts13LineChartItemE@Qt_5 5.10.1 _ZTVN8QtCharts13QAbstractAxisE@Qt_5 5.7.1 _ZTVN8QtCharts13QCategoryAxisE@Qt_5 5.7.1 _ZTVN8QtCharts13QDateTimeAxisE@Qt_5 5.7.1 _ZTVN8QtCharts13QLegendMarkerE@Qt_5 5.7.1 _ZTVN8QtCharts13QLogValueAxisE@Qt_5 5.7.1 _ZTVN8QtCharts13QSplineSeriesE@Qt_5 5.7.1 - _ZTVN8QtCharts13XYPolarDomainE@Qt_5 5.10.1 - _ZTVN8QtCharts14AbstractDomainE@Qt_5 5.10.1 - _ZTVN8QtCharts14ChartAnimationE@Qt_5 5.10.1 - _ZTVN8QtCharts14ChartPresenterE@Qt_5 5.10.1 - _ZTVN8QtCharts14HorizontalAxisE@Qt_5 5.10.1 - _ZTVN8QtCharts14LegendScrollerE@Qt_5 5.10.1 - _ZTVN8QtCharts14LogXLogYDomainE@Qt_5 5.10.1 - _ZTVN8QtCharts14PolarChartAxisE@Qt_5 5.10.1 - _ZTVN8QtCharts14QBarSetPrivateE@Qt_5 5.10.1 _ZTVN8QtCharts14QBoxPlotSeriesE@Qt_5 5.7.1 - _ZTVN8QtCharts14QBoxSetPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts14QLegendPrivateE@Qt_5 5.10.1 _ZTVN8QtCharts14QScatterSeriesE@Qt_5 5.7.1 _ZTVN8QtCharts14QXYModelMapperE@Qt_5 5.7.1 - _ZTVN8QtCharts15ChartBackgroundE@Qt_5 5.10.1 - _ZTVN8QtCharts15ChartValueAxisXE@Qt_5 5.10.1 - _ZTVN8QtCharts15ChartValueAxisYE@Qt_5 5.10.1 _ZTVN8QtCharts15QAbstractSeriesE@Qt_5 5.7.1 _ZTVN8QtCharts15QBarModelMapperE@Qt_5 5.7.1 _ZTVN8QtCharts15QCandlestickSetE@Qt_5 5.9.0~rc @@ -3956,265 +1599,37 @@ _ZTVN8QtCharts15QPieModelMapperE@Qt_5 5.7.1 _ZTVN8QtCharts15QVXYModelMapperE@Qt_5 5.7.1 _ZTVN8QtCharts15QXYLegendMarkerE@Qt_5 5.7.1 - _ZTVN8QtCharts15RectangleMarkerE@Qt_5 5.10.1 - _ZTVN8QtCharts15SplineAnimationE@Qt_5 5.10.1 - _ZTVN8QtCharts15SplineChartItemE@Qt_5 5.10.1 - _ZTVN8QtCharts16BoxPlotAnimationE@Qt_5 5.10.1 - _ZTVN8QtCharts16BoxPlotChartItemE@Qt_5 5.10.1 - _ZTVN8QtCharts16ChartAxisElementE@Qt_5 5.10.1 - _ZTVN8QtCharts16LegendMarkerItemE@Qt_5 5.10.1 - _ZTVN8QtCharts16LogXYPolarDomainE@Qt_5 5.10.1 - _ZTVN8QtCharts16PolarChartLayoutE@Qt_5 5.10.1 _ZTVN8QtCharts16QBarCategoryAxisE@Qt_5 5.7.1 _ZTVN8QtCharts16QBarLegendMarkerE@Qt_5 5.7.1 _ZTVN8QtCharts16QHBarModelMapperE@Qt_5 5.7.1 _ZTVN8QtCharts16QHPieModelMapperE@Qt_5 5.7.1 _ZTVN8QtCharts16QPieLegendMarkerE@Qt_5 5.7.1 - _ZTVN8QtCharts16QPieSlicePrivateE@Qt_5 5.10.1 _ZTVN8QtCharts16QVBarModelMapperE@Qt_5 5.7.1 _ZTVN8QtCharts16QVPieModelMapperE@Qt_5 5.7.1 - _ZTVN8QtCharts16QXYSeriesPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts16ScatterAnimationE@Qt_5 5.10.1 - _ZTVN8QtCharts16ScatterChartItemE@Qt_5 5.10.1 - _ZTVN8QtCharts16XLogYPolarDomainE@Qt_5 5.10.1 - _ZTVN8QtCharts17ChartThemeManagerE@Qt_5 5.10.1 - _ZTVN8QtCharts17PieSliceAnimationE@Qt_5 5.10.1 _ZTVN8QtCharts17QAreaLegendMarkerE@Qt_5 5.7.1 - _ZTVN8QtCharts17QBarSeriesPrivateE@Qt_5 5.10.1 _ZTVN8QtCharts17QPercentBarSeriesE@Qt_5 5.7.1 - _ZTVN8QtCharts17QPieSeriesPrivateE@Qt_5 5.10.1 _ZTVN8QtCharts17QStackedBarSeriesE@Qt_5 5.7.1 - _ZTVN8QtCharts17QValueAxisPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts18CartesianChartAxisE@Qt_5 5.10.1 - _ZTVN8QtCharts18ChartCategoryAxisXE@Qt_5 5.10.1 - _ZTVN8QtCharts18ChartCategoryAxisYE@Qt_5 5.10.1 - _ZTVN8QtCharts18ChartDateTimeAxisXE@Qt_5 5.10.1 - _ZTVN8QtCharts18ChartDateTimeAxisYE@Qt_5 5.10.1 - _ZTVN8QtCharts18ChartLogValueAxisXE@Qt_5 5.10.1 - _ZTVN8QtCharts18ChartLogValueAxisYE@Qt_5 5.10.1 _ZTVN8QtCharts18QAbstractBarSeriesE@Qt_5 5.7.1 - _ZTVN8QtCharts18QAreaSeriesPrivateE@Qt_5 5.10.1 _ZTVN8QtCharts18QCandlestickSeriesE@Qt_5 5.9.0~rc - _ZTVN8QtCharts18QLineSeriesPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts19AbstractChartLayoutE@Qt_5 5.10.1 - _ZTVN8QtCharts19LogXLogYPolarDomainE@Qt_5 5.10.1 - _ZTVN8QtCharts19PercentBarChartItemE@Qt_5 5.10.1 _ZTVN8QtCharts19QBoxPlotModelMapperE@Qt_5 5.7.1 - _ZTVN8QtCharts19StackedBarChartItemE@Qt_5 5.10.1 - _ZTVN8QtCharts20AbstractBarChartItemE@Qt_5 5.10.1 - _ZTVN8QtCharts20BoxWhiskersAnimationE@Qt_5 5.10.1 - _ZTVN8QtCharts20CandlestickAnimationE@Qt_5 5.10.1 - _ZTVN8QtCharts20CandlestickChartItemE@Qt_5 5.10.1 - _ZTVN8QtCharts20CartesianChartLayoutE@Qt_5 5.10.1 - _ZTVN8QtCharts20PolarChartAxisRadialE@Qt_5 5.10.1 - _ZTVN8QtCharts20QAbstractAxisPrivateE@Qt_5 5.10.1 _ZTVN8QtCharts20QBoxPlotLegendMarkerE@Qt_5 5.7.1 - _ZTVN8QtCharts20QCategoryAxisPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts20QDateTimeAxisPrivateE@Qt_5 5.10.1 _ZTVN8QtCharts20QHBoxPlotModelMapperE@Qt_5 5.9.0~rc _ZTVN8QtCharts20QHorizontalBarSeriesE@Qt_5 5.7.1 - _ZTVN8QtCharts20QLegendMarkerPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts20QLogValueAxisPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts20QSplineSeriesPrivateE@Qt_5 5.10.1 _ZTVN8QtCharts20QVBoxPlotModelMapperE@Qt_5 5.7.1 - _ZTVN8QtCharts21ChartBarCategoryAxisXE@Qt_5 5.10.1 - _ZTVN8QtCharts21ChartBarCategoryAxisYE@Qt_5 5.10.1 - _ZTVN8QtCharts21GLXYSeriesDataManagerE@Qt_5 5.10.1 - _ZTVN8QtCharts21PolarChartAxisAngularE@Qt_5 5.10.1 - _ZTVN8QtCharts21QBoxPlotSeriesPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts21QScatterSeriesPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts21QXYModelMapperPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts22HorizontalBarChartItemE@Qt_5 5.10.1 - _ZTVN8QtCharts22QAbstractSeriesPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts22QBarModelMapperPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts22QCandlestickSetPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts22QPieModelMapperPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts22QXYLegendMarkerPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts23QBarCategoryAxisPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts23QBarLegendMarkerPrivateE@Qt_5 5.10.1 _ZTVN8QtCharts23QCandlestickModelMapperE@Qt_5 5.9.0~rc - _ZTVN8QtCharts23QPieLegendMarkerPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts24QAreaLegendMarkerPrivateE@Qt_5 5.10.1 _ZTVN8QtCharts24QCandlestickLegendMarkerE@Qt_5 5.9.0~rc _ZTVN8QtCharts24QHCandlestickModelMapperE@Qt_5 5.9.0~rc - _ZTVN8QtCharts24QPercentBarSeriesPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts24QStackedBarSeriesPrivateE@Qt_5 5.10.1 _ZTVN8QtCharts24QVCandlestickModelMapperE@Qt_5 5.9.0~rc - _ZTVN8QtCharts25PolarChartValueAxisRadialE@Qt_5 5.10.1 - _ZTVN8QtCharts25QAbstractBarSeriesPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts25QCandlestickSeriesPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts26PolarChartValueAxisAngularE@Qt_5 5.10.1 - _ZTVN8QtCharts27QBoxPlotLegendMarkerPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts27QHorizontalBarSeriesPrivateE@Qt_5 5.10.1 _ZTVN8QtCharts27QHorizontalPercentBarSeriesE@Qt_5 5.7.1 _ZTVN8QtCharts27QHorizontalStackedBarSeriesE@Qt_5 5.7.1 - _ZTVN8QtCharts28PolarChartCategoryAxisRadialE@Qt_5 5.10.1 - _ZTVN8QtCharts28PolarChartDateTimeAxisRadialE@Qt_5 5.10.1 - _ZTVN8QtCharts28PolarChartLogValueAxisRadialE@Qt_5 5.10.1 - _ZTVN8QtCharts29CandlestickBodyWicksAnimationE@Qt_5 5.10.1 - _ZTVN8QtCharts29HorizontalPercentBarChartItemE@Qt_5 5.10.1 - _ZTVN8QtCharts29HorizontalStackedBarChartItemE@Qt_5 5.10.1 - _ZTVN8QtCharts29PolarChartCategoryAxisAngularE@Qt_5 5.10.1 - _ZTVN8QtCharts29PolarChartDateTimeAxisAngularE@Qt_5 5.10.1 - _ZTVN8QtCharts29PolarChartLogValueAxisAngularE@Qt_5 5.10.1 - _ZTVN8QtCharts30QCandlestickModelMapperPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts31QCandlestickLegendMarkerPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts34QHorizontalPercentBarSeriesPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts34QHorizontalStackedBarSeriesPrivateE@Qt_5 5.10.1 - _ZTVN8QtCharts3BarE@Qt_5 5.10.1 _ZTVN8QtCharts6QChartE@Qt_5 5.7.1 _ZTVN8QtCharts7QBarSetE@Qt_5 5.7.1 _ZTVN8QtCharts7QBoxSetE@Qt_5 5.7.1 _ZTVN8QtCharts7QLegendE@Qt_5 5.7.1 - _ZTVN8QtCharts7XYChartE@Qt_5 5.10.1 - _ZTVN8QtCharts8ScrollerE@Qt_5 5.10.1 - _ZTVN8QtCharts8XYDomainE@Qt_5 5.10.1 - _ZTVN8QtCharts9ChartItemE@Qt_5 5.10.1 _ZTVN8QtCharts9QPieSliceE@Qt_5 5.7.1 _ZTVN8QtCharts9QXYSeriesE@Qt_5 5.7.1 - (c++)"non-virtual thunk to QtCharts::AbstractBarChartItem::boundingRect() const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::AbstractBarChartItem::paint(QPainter*, QStyleOptionGraphicsItem const*, QWidget*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::AbstractBarChartItem::~AbstractBarChartItem()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::AreaChartItem::boundingRect() const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::AreaChartItem::hoverEnterEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::AreaChartItem::hoverLeaveEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::AreaChartItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::AreaChartItem::mousePressEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::AreaChartItem::mouseReleaseEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::AreaChartItem::paint(QPainter*, QStyleOptionGraphicsItem const*, QWidget*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::AreaChartItem::shape() const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::AreaChartItem::~AreaChartItem()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::Bar::hoverEnterEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::Bar::hoverLeaveEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::Bar::mouseDoubleClickEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::Bar::mousePressEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::Bar::mouseReleaseEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::Bar::paint(QPainter*, QStyleOptionGraphicsItem const*, QWidget*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::Bar::~Bar()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::BoxPlotChartItem::boundingRect() const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::BoxPlotChartItem::paint(QPainter*, QStyleOptionGraphicsItem const*, QWidget*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::BoxPlotChartItem::~BoxPlotChartItem()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::BoxWhiskers::boundingRect() const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::BoxWhiskers::hoverEnterEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::BoxWhiskers::hoverLeaveEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::BoxWhiskers::mouseDoubleClickEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::BoxWhiskers::mousePressEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::BoxWhiskers::mouseReleaseEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::BoxWhiskers::paint(QPainter*, QStyleOptionGraphicsItem const*, QWidget*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::BoxWhiskers::~BoxWhiskers()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::Candlestick::boundingRect() const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::Candlestick::hoverEnterEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::Candlestick::hoverLeaveEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::Candlestick::mouseDoubleClickEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::Candlestick::mousePressEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::Candlestick::mouseReleaseEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::Candlestick::paint(QPainter*, QStyleOptionGraphicsItem const*, QWidget*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::Candlestick::~Candlestick()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::CandlestickChartItem::boundingRect() const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::CandlestickChartItem::paint(QPainter*, QStyleOptionGraphicsItem const*, QWidget*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::CandlestickChartItem::~CandlestickChartItem()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::CartesianChartAxis::sizeHint(Qt::SizeHint, QSizeF const&) const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::CartesianChartAxis::~CartesianChartAxis()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartAxisElement::~ChartAxisElement()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartBarCategoryAxisX::sizeHint(Qt::SizeHint, QSizeF const&) const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartBarCategoryAxisX::updateGeometry()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartBarCategoryAxisX::~ChartBarCategoryAxisX()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartBarCategoryAxisY::sizeHint(Qt::SizeHint, QSizeF const&) const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartBarCategoryAxisY::updateGeometry()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartBarCategoryAxisY::~ChartBarCategoryAxisY()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartCategoryAxisX::sizeHint(Qt::SizeHint, QSizeF const&) const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartCategoryAxisX::updateGeometry()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartCategoryAxisX::~ChartCategoryAxisX()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartCategoryAxisY::sizeHint(Qt::SizeHint, QSizeF const&) const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartCategoryAxisY::updateGeometry()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartCategoryAxisY::~ChartCategoryAxisY()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartDateTimeAxisX::sizeHint(Qt::SizeHint, QSizeF const&) const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartDateTimeAxisX::updateGeometry()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartDateTimeAxisX::~ChartDateTimeAxisX()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartDateTimeAxisY::sizeHint(Qt::SizeHint, QSizeF const&) const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartDateTimeAxisY::updateGeometry()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartDateTimeAxisY::~ChartDateTimeAxisY()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartLogValueAxisX::sizeHint(Qt::SizeHint, QSizeF const&) const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartLogValueAxisX::updateGeometry()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartLogValueAxisX::~ChartLogValueAxisX()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartLogValueAxisY::sizeHint(Qt::SizeHint, QSizeF const&) const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartLogValueAxisY::updateGeometry()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartLogValueAxisY::~ChartLogValueAxisY()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartTitle::~ChartTitle()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartValueAxisX::sizeHint(Qt::SizeHint, QSizeF const&) const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartValueAxisX::updateGeometry()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartValueAxisX::~ChartValueAxisX()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartValueAxisY::sizeHint(Qt::SizeHint, QSizeF const&) const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartValueAxisY::updateGeometry()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ChartValueAxisY::~ChartValueAxisY()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::HorizontalAxis::sizeHint(Qt::SizeHint, QSizeF const&) const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::HorizontalAxis::updateGeometry()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::HorizontalAxis::~HorizontalAxis()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LegendMarkerItem::boundingRect() const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LegendMarkerItem::hoverEnterEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LegendMarkerItem::hoverLeaveEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LegendMarkerItem::paint(QPainter*, QStyleOptionGraphicsItem const*, QWidget*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LegendMarkerItem::setGeometry(QRectF const&)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LegendMarkerItem::sizeHint(Qt::SizeHint, QSizeF const&) const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LegendMarkerItem::~LegendMarkerItem()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LegendScroller::mouseMoveEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LegendScroller::mousePressEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LegendScroller::mouseReleaseEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LegendScroller::offset() const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LegendScroller::setOffset(QPointF const&)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LineChartItem::boundingRect() const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LineChartItem::hoverEnterEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LineChartItem::hoverLeaveEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LineChartItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LineChartItem::mousePressEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LineChartItem::mouseReleaseEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LineChartItem::paint(QPainter*, QStyleOptionGraphicsItem const*, QWidget*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::LineChartItem::shape() const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PieChartItem::hoverEnterEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PieChartItem::hoverLeaveEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PieChartItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PieChartItem::mousePressEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PieChartItem::mouseReleaseEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PieChartItem::~PieChartItem()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PieSliceItem::boundingRect() const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PieSliceItem::hoverEnterEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PieSliceItem::hoverLeaveEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PieSliceItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PieSliceItem::mousePressEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PieSliceItem::mouseReleaseEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PieSliceItem::paint(QPainter*, QStyleOptionGraphicsItem const*, QWidget*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PieSliceItem::shape() const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PieSliceItem::~PieSliceItem()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PolarChartAxis::~PolarChartAxis()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PolarChartAxisAngular::sizeHint(Qt::SizeHint, QSizeF const&) const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PolarChartAxisAngular::updateGeometry()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PolarChartAxisAngular::~PolarChartAxisAngular()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PolarChartAxisRadial::sizeHint(Qt::SizeHint, QSizeF const&) const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PolarChartAxisRadial::updateGeometry()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PolarChartAxisRadial::~PolarChartAxisRadial()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PolarChartCategoryAxisAngular::~PolarChartCategoryAxisAngular()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PolarChartCategoryAxisRadial::~PolarChartCategoryAxisRadial()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PolarChartDateTimeAxisAngular::~PolarChartDateTimeAxisAngular()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PolarChartDateTimeAxisRadial::~PolarChartDateTimeAxisRadial()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PolarChartLogValueAxisAngular::~PolarChartLogValueAxisAngular()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PolarChartLogValueAxisRadial::~PolarChartLogValueAxisRadial()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PolarChartValueAxisAngular::~PolarChartValueAxisAngular()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::PolarChartValueAxisRadial::~PolarChartValueAxisRadial()@Qt_5" 5.10.1 (c++)"non-virtual thunk to QtCharts::QChart::~QChart()@Qt_5" 5.7.1 (c++)"non-virtual thunk to QtCharts::QChartView::~QChartView()@Qt_5" 5.7.1 (c++)"non-virtual thunk to QtCharts::QLegend::paint(QPainter*, QStyleOptionGraphicsItem const*, QWidget*)@Qt_5" 5.7.1 (c++)"non-virtual thunk to QtCharts::QLegend::~QLegend()@Qt_5" 5.7.1 (c++)"non-virtual thunk to QtCharts::QPolarChart::~QPolarChart()@Qt_5" 5.7.1 - (c++)"non-virtual thunk to QtCharts::ScatterChartItem::boundingRect() const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::ScatterChartItem::paint(QPainter*, QStyleOptionGraphicsItem const*, QWidget*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::SplineChartItem::boundingRect() const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::SplineChartItem::hoverEnterEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::SplineChartItem::hoverLeaveEvent(QGraphicsSceneHoverEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::SplineChartItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::SplineChartItem::mousePressEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::SplineChartItem::mouseReleaseEvent(QGraphicsSceneMouseEvent*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::SplineChartItem::paint(QPainter*, QStyleOptionGraphicsItem const*, QWidget*)@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::SplineChartItem::shape() const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::VerticalAxis::sizeHint(Qt::SizeHint, QSizeF const&) const@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::VerticalAxis::updateGeometry()@Qt_5" 5.10.1 - (c++)"non-virtual thunk to QtCharts::VerticalAxis::~VerticalAxis()@Qt_5" 5.10.1 diff -Nru qtcharts-opensource-src-5.12.5/debian/not-installed qtcharts-opensource-src-5.9.5/debian/not-installed --- qtcharts-opensource-src-5.12.5/debian/not-installed 2019-10-22 18:06:25.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/debian/not-installed 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/include/*/qt5/QtCharts/5.* -usr/lib/*/libQt5Charts.la -usr/lib/*/qt5/mkspecs/modules/qt_lib_charts_private.pri diff -Nru qtcharts-opensource-src-5.12.5/debian/qtcharts5-doc-html.doc-base qtcharts-opensource-src-5.9.5/debian/qtcharts5-doc-html.doc-base --- qtcharts-opensource-src-5.12.5/debian/qtcharts5-doc-html.doc-base 2019-10-22 18:06:25.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/debian/qtcharts5-doc-html.doc-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -Document: qt5-charts -Title: Qt 5 Charts module -Author: The Qt Company Ltd -Abstract: This is the HTML documentation for Qt 5 Charts -Section: Programming/C++ - -Format: HTML -Index: /usr/share/doc/qtcharts5-doc-html/html/qtcharts/qtcharts-index.html -Files: /usr/share/doc/qtcharts5-doc-html/html/qtcharts/*.html diff -Nru qtcharts-opensource-src-5.12.5/debian/qtcharts5-doc-html.links qtcharts-opensource-src-5.9.5/debian/qtcharts5-doc-html.links --- qtcharts-opensource-src-5.12.5/debian/qtcharts5-doc-html.links 2019-10-22 18:06:25.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/debian/qtcharts5-doc-html.links 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/qt5/doc usr/share/doc/qtcharts5-doc-html/html diff -Nru qtcharts-opensource-src-5.12.5/debian/rules qtcharts-opensource-src-5.9.5/debian/rules --- qtcharts-opensource-src-5.12.5/debian/rules 2019-10-22 18:06:25.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/debian/rules 2018-04-14 19:07:27.000000000 +0000 @@ -14,7 +14,7 @@ dh $@ --with pkgkde_symbolshelper override_dh_auto_configure: - dh_auto_configure -- QT_BUILD_PARTS+=tests + qmake QT_BUILD_PARTS+=tests override_dh_auto_build-indep: dh_auto_build -- docs @@ -22,14 +22,23 @@ override_dh_auto_install-indep: $(MAKE) install_docs -Csrc INSTALL_ROOT=$(CURDIR)/debian/tmp +override_dh_auto_install-arch: + dh_auto_install + + # Remove private headers and the .pri file + rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtCharts/5.* + rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/modules/qt_lib_charts_private.pri + + # Remove the libtool-like file + rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt5Charts.la + override_dh_missing: dh_missing --fail-missing override_dh_auto_test-arch: $(MAKE) install -Csrc/chartsqml2 INSTALL_ROOT=$(CURDIR)/test_root - dh_auto_test -- -Ctests/auto \ - TESTRUNNER='xvfb-run -a -s "-screen 0 1024x768x24 +extension GLX"' \ - QTEST_ENVIRONMENT=ci QSG_NO_DEPTH_BUFFER=1 \ + -xvfb-run -a -s "-screen 0 1024x768x24 +extension GLX" \ + dh_auto_test -- -Ctests/auto \ QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml override_dh_auto_test-indep: diff -Nru qtcharts-opensource-src-5.12.5/debian/watch qtcharts-opensource-src-5.9.5/debian/watch --- qtcharts-opensource-src-5.12.5/debian/watch 2019-10-22 18:06:25.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/debian/watch 2018-04-14 19:07:27.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -https://download.qt.io/official_releases/qt/([\d\.]*)/([\d\.]*)/submodules/qtcharts-everywhere-src-([^-]*)\.tar\.xz +https://download.qt.io/official_releases/qt/([\d\.]*)/([\d\.]*)/submodules/qtcharts-opensource-src-([^-]*)\.tar\.xz diff -Nru qtcharts-opensource-src-5.12.5/dist/changes-5.10.0 qtcharts-opensource-src-5.9.5/dist/changes-5.10.0 --- qtcharts-opensource-src-5.12.5/dist/changes-5.10.0 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/dist/changes-5.10.0 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Qt 5.10 introduces many new features and improvements as well as bugfixes -over the 5.9.x series. For more details, refer to the online documentation -included in this distribution. The documentation is also available online: - -http://doc.qt.io/qt-5/index.html - -The Qt version 5.10 series is binary compatible with the 5.10.x series. -Applications compiled for 5.9 will continue to run with 5.10. - -Some of the changes listed in this file include issue tracking numbers -corresponding to tasks in the Qt Bug Tracker: - -https://bugreports.qt.io/ - -Each of these identifiers can be entered in the bug tracker to obtain more -information about a particular change. - -**************************************************************************** -* Qt 5.10.0 Changes * -**************************************************************************** - - - This release contains only minor code improvements. diff -Nru qtcharts-opensource-src-5.12.5/dist/changes-5.10.1 qtcharts-opensource-src-5.9.5/dist/changes-5.10.1 --- qtcharts-opensource-src-5.12.5/dist/changes-5.10.1 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/dist/changes-5.10.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -Qt 5.10.1 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.10.0. - -For more details, refer to the online documentation included in this -distribution. The documentation is also available online: - -http://doc.qt.io/qt-5/index.html - -The Qt version 5.10 series is binary compatible with the 5.9.x series. -Applications compiled for 5.9 will continue to run with 5.10. - -Some of the changes listed in this file include issue tracking numbers -corresponding to tasks in the Qt Bug Tracker: - -https://bugreports.qt.io/ - -Each of these identifiers can be entered in the bug tracker to obtain more -information about a particular change. - -This release contains all fixes included in the Qt 5.9.4 release. - -**************************************************************************** -* Qt 5.10.1 Changes * -**************************************************************************** - - - This release contains only minor code improvements. diff -Nru qtcharts-opensource-src-5.12.5/dist/changes-5.11.0 qtcharts-opensource-src-5.9.5/dist/changes-5.11.0 --- qtcharts-opensource-src-5.12.5/dist/changes-5.11.0 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/dist/changes-5.11.0 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Qt 5.11 introduces many new features and improvements as well as bugfixes -over the 5.10.x series. For more details, refer to the online documentation -included in this distribution. The documentation is also available online: - -http://doc.qt.io/qt-5/index.html - -The Qt version 5.11 series is binary compatible with the 5.10.x series. -Applications compiled for 5.10 will continue to run with 5.11. - -Some of the changes listed in this file include issue tracking numbers -corresponding to tasks in the Qt Bug Tracker: - -https://bugreports.qt.io/ - -Each of these identifiers can be entered in the bug tracker to obtain more -information about a particular change. - -**************************************************************************** -* Qt 5.11.0 Changes * -**************************************************************************** - -- [QTBUG-64370] Add labelsPrecision property to bar charts -- [QTBUG-66319] Fix empty chart when using QHBoxPlotModelMapper -- [QTBUG-66712] Fix few cases of dividing by zero diff -Nru qtcharts-opensource-src-5.12.5/dist/changes-5.11.1 qtcharts-opensource-src-5.9.5/dist/changes-5.11.1 --- qtcharts-opensource-src-5.12.5/dist/changes-5.11.1 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/dist/changes-5.11.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -Qt 5.11.1 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.11.0. - -For more details, refer to the online documentation included in this -distribution. The documentation is also available online: - -http://doc.qt.io/qt-5/index.html - -The Qt version 5.11 series is binary compatible with the 5.10.x series. -Applications compiled for 5.10 will continue to run with 5.11. - -Some of the changes listed in this file include issue tracking numbers -corresponding to tasks in the Qt Bug Tracker: - -https://bugreports.qt.io/ - -Each of these identifiers can be entered in the bug tracker to obtain more -information about a particular change. - -**************************************************************************** -* Qt 5.11.1 Changes * -**************************************************************************** - -- [QTBUG-62082] Maintain correct order of legend items when inserting pie - chart items diff -Nru qtcharts-opensource-src-5.12.5/dist/changes-5.11.2 qtcharts-opensource-src-5.9.5/dist/changes-5.11.2 --- qtcharts-opensource-src-5.12.5/dist/changes-5.11.2 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/dist/changes-5.11.2 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Qt 5.11.2 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.11.0 through 5.11.1. - -For more details, refer to the online documentation included in this -distribution. The documentation is also available online: - -http://doc.qt.io/qt-5/index.html - -The Qt version 5.11 series is binary compatible with the 5.10.x series. -Applications compiled for 5.10 will continue to run with 5.11. - -Some of the changes listed in this file include issue tracking numbers -corresponding to tasks in the Qt Bug Tracker: - -https://bugreports.qt.io/ - -Each of these identifiers can be entered in the bug tracker to obtain more -information about a particular change. - -**************************************************************************** -* Qt 5.11.2 Changes * -**************************************************************************** - - - This release contains only minor code improvements. diff -Nru qtcharts-opensource-src-5.12.5/dist/changes-5.11.3 qtcharts-opensource-src-5.9.5/dist/changes-5.11.3 --- qtcharts-opensource-src-5.12.5/dist/changes-5.11.3 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/dist/changes-5.11.3 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Qt 5.11.3 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.11.0 through 5.11.2. - -For more details, refer to the online documentation included in this -distribution. The documentation is also available online: - -http://doc.qt.io/qt-5/index.html - -The Qt version 5.11 series is binary compatible with the 5.10.x series. -Applications compiled for 5.10 will continue to run with 5.11. - -Some of the changes listed in this file include issue tracking numbers -corresponding to tasks in the Qt Bug Tracker: - -https://bugreports.qt.io/ - -Each of these identifiers can be entered in the bug tracker to obtain more -information about a particular change. - - - This release contains only minor code improvements. diff -Nru qtcharts-opensource-src-5.12.5/dist/changes-5.12.0 qtcharts-opensource-src-5.9.5/dist/changes-5.12.0 --- qtcharts-opensource-src-5.12.5/dist/changes-5.12.0 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/dist/changes-5.12.0 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -more Qt 5.12 introduces many new features and improvements as well as bugfixes -over the 5.11.x series. For more details, refer to the online documentation -included in this distribution. The documentation is also available online: - -https://doc.qt.io/qt-5/index.html - -The Qt version 5.12 series is binary compatible with the 5.11.x series. -Applications compiled for 5.11 will continue to run with 5.12. - -Some of the changes listed in this file include issue tracking numbers -corresponding to tasks in the Qt Bug Tracker: - -https://bugreports.qt.io/ - -Each of these identifiers can be entered in the bug tracker to obtain more -information about a particular change. - -**************************************************************************** -* New Features * -**************************************************************************** - -- Dynamic tick handling for ValueAxis - -**************************************************************************** -* Bug Fixes * -**************************************************************************** - -- [QTBUG-61782] Fix rendering lines with Antialiasing render hint -- [QTBUG-69133] Fix usage of size constraints for QChartView -- [QTBUG-59674] Fix data normalization in GLXYSeriesDataManager diff -Nru qtcharts-opensource-src-5.12.5/dist/changes-5.12.1 qtcharts-opensource-src-5.9.5/dist/changes-5.12.1 --- qtcharts-opensource-src-5.12.5/dist/changes-5.12.1 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/dist/changes-5.12.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -Qt 5.12.1 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.12.0. - -For more details, refer to the online documentation included in this -distribution. The documentation is also available online: - -http://doc.qt.io/qt-5/index.html - -The Qt version 5.12 series is binary compatible with the 5.11.x series. -Applications compiled for 5.11 will continue to run with 5.12. - -Some of the changes listed in this file include issue tracking numbers -corresponding to tasks in the Qt Bug Tracker: - -https://bugreports.qt.io/ - -Each of these identifiers can be entered in the bug tracker to obtain more -information about a particular change. - -**************************************************************************** -* Bug Fixes * -**************************************************************************** - -- [QTBUG-67981] Fix printing of labels for line series charts -- [QTBUG-71013] Fix access to bar sets instantiated inside the module diff -Nru qtcharts-opensource-src-5.12.5/dist/changes-5.12.2 qtcharts-opensource-src-5.9.5/dist/changes-5.12.2 --- qtcharts-opensource-src-5.12.5/dist/changes-5.12.2 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/dist/changes-5.12.2 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Qt 5.12.2 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.12.0 through 5.12.1. - -For more details, refer to the online documentation included in this -distribution. The documentation is also available online: - -https://doc.qt.io/qt-5/index.html - -The Qt version 5.12 series is binary compatible with the 5.11.x series. -Applications compiled for 5.11 will continue to run with 5.12. - -Some of the changes listed in this file include issue tracking numbers -corresponding to tasks in the Qt Bug Tracker: - -https://bugreports.qt.io/ - -Each of these identifiers can be entered in the bug tracker to obtain more -information about a particular change. - - - This release contains only minor code improvements. diff -Nru qtcharts-opensource-src-5.12.5/dist/changes-5.12.3 qtcharts-opensource-src-5.9.5/dist/changes-5.12.3 --- qtcharts-opensource-src-5.12.5/dist/changes-5.12.3 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/dist/changes-5.12.3 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Qt 5.12.3 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.12.0 through 5.12.2. - -For more details, refer to the online documentation included in this -distribution. The documentation is also available online: - -https://doc.qt.io/qt-5/index.html - -The Qt version 5.12 series is binary compatible with the 5.11.x series. -Applications compiled for 5.11 will continue to run with 5.12. - -Some of the changes listed in this file include issue tracking numbers -corresponding to tasks in the Qt Bug Tracker: - -https://bugreports.qt.io/ - -Each of these identifiers can be entered in the bug tracker to obtain more -information about a particular change. - -**************************************************************************** -* Bug Fixes * -**************************************************************************** - -- [QTBUG-74613] Fix static building of QML applications using charts diff -Nru qtcharts-opensource-src-5.12.5/dist/changes-5.12.4 qtcharts-opensource-src-5.9.5/dist/changes-5.12.4 --- qtcharts-opensource-src-5.12.5/dist/changes-5.12.4 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/dist/changes-5.12.4 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -Qt 5.12.4 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.12.0 through 5.12.3. - -For more details, refer to the online documentation included in this -distribution. The documentation is also available online: - -https://doc.qt.io/qt-5/index.html - -The Qt version 5.12 series is binary compatible with the 5.11.x series. -Applications compiled for 5.11 will continue to run with 5.12. - -Some of the changes listed in this file include issue tracking numbers -corresponding to tasks in the Qt Bug Tracker: - -https://bugreports.qt.io/ - -Each of these identifiers can be entered in the bug tracker to obtain more -information about a particular change. - - **************************************************************************** -* Bug Fixes * -**************************************************************************** - -- QCandlestickSeries: remove sets on destroy to prevent leaks -- [QTBUG-70987] Fix crash on ChartView component destroy diff -Nru qtcharts-opensource-src-5.12.5/dist/changes-5.12.5 qtcharts-opensource-src-5.9.5/dist/changes-5.12.5 --- qtcharts-opensource-src-5.12.5/dist/changes-5.12.5 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/dist/changes-5.12.5 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -Qt 5.12.5 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.12.0 through 5.12.4. - -For more details, refer to the online documentation included in this -distribution. The documentation is also available online: - -https://doc.qt.io/qt-5/index.html - -The Qt version 5.12 series is binary compatible with the 5.11.x series. -Applications compiled for 5.11 will continue to run with 5.12. - -Some of the changes listed in this file include issue tracking numbers -corresponding to tasks in the Qt Bug Tracker: - -https://bugreports.qt.io/ - -Each of these identifiers can be entered in the bug tracker to obtain more -information about a particular change. - -**************************************************************************** -* Bug Fixes * -**************************************************************************** - -- [QTBUG-76271] Revert "Fix rendering lines with Antialiasing render hint" -- [QTBUG-60384] Force entire chart update when points label clipping changes diff -Nru qtcharts-opensource-src-5.12.5/dist/changes-5.9.6 qtcharts-opensource-src-5.9.5/dist/changes-5.9.6 --- qtcharts-opensource-src-5.12.5/dist/changes-5.9.6 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/dist/changes-5.9.6 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Qt 5.9.6 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.9.0 through 5.9.5. - -For more details, refer to the online documentation included in this -distribution. The documentation is also available online: - -http://doc.qt.io/qt-5/index.html - -The Qt version 5.9 series is binary compatible with the 5.8.x series. -Applications compiled for 5.8 will continue to run with 5.9. - -Some of the changes listed in this file include issue tracking numbers -corresponding to tasks in the Qt Bug Tracker: - -https://bugreports.qt.io/ - -Each of these identifiers can be entered in the bug tracker to obtain more -information about a particular change. - -**************************************************************************** -* Qt 5.9.6 Changes * -**************************************************************************** - - - This release contains only minor code improvements. diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/areachart/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/areachart/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/areachart/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/areachart/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -70,8 +70,8 @@ chart->addSeries(series); chart->setTitle("Simple areachart example"); chart->createDefaultAxes(); - chart->axes(Qt::Horizontal).first()->setRange(0, 20); - chart->axes(Qt::Vertical).first()->setRange(0, 10); + chart->axisX()->setRange(0, 20); + chart->axisY()->setRange(0, 10); //![4] //![5] diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/audio/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/audio/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/audio/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/audio/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -27,24 +27,13 @@ ** ****************************************************************************/ -#include "widget.h" - -#include #include -#include +#include "widget.h" int main(int argc, char *argv[]) { QApplication a(argc, argv); - - const QAudioDeviceInfo inputDevice = QAudioDeviceInfo::defaultInputDevice(); - if (inputDevice.isNull()) { - QMessageBox::warning(nullptr, "audio", - "There is no audio input device available."); - return -1; - } - - Widget w(inputDevice); + Widget w; w.show(); return a.exec(); diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/audio/widget.cpp qtcharts-opensource-src-5.9.5/examples/charts/audio/widget.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/audio/widget.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/audio/widget.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -28,44 +28,44 @@ ****************************************************************************/ #include "widget.h" -#include "xyseriesiodevice.h" - #include #include - #include #include #include -#include - #include +#include +#include "xyseriesiodevice.h" QT_CHARTS_USE_NAMESPACE -Widget::Widget(const QAudioDeviceInfo &deviceInfo, QWidget *parent) : - QWidget(parent), - m_chart(new QChart), - m_series(new QLineSeries) +Widget::Widget(QWidget *parent) + : QWidget(parent), + m_device(0), + m_chart(0), + m_series(0), + m_audioInput(0) { + m_chart = new QChart; QChartView *chartView = new QChartView(m_chart); chartView->setMinimumSize(800, 600); + m_series = new QLineSeries; m_chart->addSeries(m_series); QValueAxis *axisX = new QValueAxis; - axisX->setRange(0, XYSeriesIODevice::sampleCount); + axisX->setRange(0, 2000); axisX->setLabelFormat("%g"); axisX->setTitleText("Samples"); QValueAxis *axisY = new QValueAxis; axisY->setRange(-1, 1); axisY->setTitleText("Audio level"); - m_chart->addAxis(axisX, Qt::AlignBottom); - m_series->attachAxis(axisX); - m_chart->addAxis(axisY, Qt::AlignLeft); - m_series->attachAxis(axisY); + m_chart->setAxisX(axisX, m_series); + m_chart->setAxisY(axisY, m_series); m_chart->legend()->hide(); - m_chart->setTitle("Data from the microphone (" + deviceInfo.deviceName() + ')'); + m_chart->setTitle("Data from the microphone"); - QVBoxLayout *mainLayout = new QVBoxLayout(this); + QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->addWidget(chartView); + setLayout(mainLayout); QAudioFormat formatAudio; formatAudio.setSampleRate(8000); @@ -75,7 +75,8 @@ formatAudio.setByteOrder(QAudioFormat::LittleEndian); formatAudio.setSampleType(QAudioFormat::UnSignedInt); - m_audioInput = new QAudioInput(deviceInfo, formatAudio, this); + QAudioDeviceInfo inputDevices = QAudioDeviceInfo::defaultInputDevice(); + m_audioInput = new QAudioInput(inputDevices,formatAudio, this); m_device = new XYSeriesIODevice(m_series, this); m_device->open(QIODevice::WriteOnly); diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/audio/widget.h qtcharts-opensource-src-5.9.5/examples/charts/audio/widget.h --- qtcharts-opensource-src-5.12.5/examples/charts/audio/widget.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/audio/widget.h 2018-03-19 05:05:55.000000000 +0000 @@ -44,7 +44,6 @@ QT_BEGIN_NAMESPACE class QAudioInput; -class QAudioDeviceInfo; QT_END_NAMESPACE class Widget : public QWidget @@ -52,14 +51,14 @@ Q_OBJECT public: - explicit Widget(const QAudioDeviceInfo &deviceInfo, QWidget *parent = nullptr); + Widget(QWidget *parent = 0); ~Widget(); private: - XYSeriesIODevice *m_device = nullptr; + XYSeriesIODevice *m_device; QChart *m_chart; - QLineSeries *m_series ; - QAudioInput *m_audioInput = nullptr; + QLineSeries *m_series; + QAudioInput *m_audioInput; }; #endif // WIDGET_H diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/audio/xyseriesiodevice.cpp qtcharts-opensource-src-5.9.5/examples/charts/audio/xyseriesiodevice.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/audio/xyseriesiodevice.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/audio/xyseriesiodevice.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -28,43 +28,39 @@ ****************************************************************************/ #include "xyseriesiodevice.h" - #include -XYSeriesIODevice::XYSeriesIODevice(QXYSeries *series, QObject *parent) : +XYSeriesIODevice::XYSeriesIODevice(QXYSeries * series, QObject *parent) : QIODevice(parent), m_series(series) { } -qint64 XYSeriesIODevice::readData(char *data, qint64 maxSize) +qint64 XYSeriesIODevice::readData(char * data, qint64 maxSize) { Q_UNUSED(data) Q_UNUSED(maxSize) return -1; } -qint64 XYSeriesIODevice::writeData(const char *data, qint64 maxSize) +qint64 XYSeriesIODevice::writeData(const char * data, qint64 maxSize) { - static const int resolution = 4; - - if (m_buffer.isEmpty()) { - m_buffer.reserve(sampleCount); - for (int i = 0; i < sampleCount; ++i) - m_buffer.append(QPointF(i, 0)); - } - - int start = 0; - const int availableSamples = int(maxSize) / resolution; - if (availableSamples < sampleCount) { - start = sampleCount - availableSamples; - for (int s = 0; s < start; ++s) - m_buffer[s].setY(m_buffer.at(s + availableSamples).y()); + qint64 range = 2000; + QVector oldPoints = m_series->pointsVector(); + QVector points; + int resolution = 4; + + if (oldPoints.count() < range) { + points = m_series->pointsVector(); + } else { + for (int i = maxSize/resolution; i < oldPoints.count(); i++) + points.append(QPointF(i - maxSize/resolution, oldPoints.at(i).y())); } - for (int s = start; s < sampleCount; ++s, data += resolution) - m_buffer[s].setY(qreal(uchar(*data) -128) / qreal(128)); + qint64 size = points.count(); + for (int k = 0; k < maxSize/resolution; k++) + points.append(QPointF(k + size, ((quint8)data[resolution * k] - 128)/128.0)); - m_series->replace(m_buffer); - return (sampleCount - start) * resolution; + m_series->replace(points); + return maxSize; } diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/audio/xyseriesiodevice.h qtcharts-opensource-src-5.9.5/examples/charts/audio/xyseriesiodevice.h --- qtcharts-opensource-src-5.12.5/examples/charts/audio/xyseriesiodevice.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/audio/xyseriesiodevice.h 2018-03-19 05:05:55.000000000 +0000 @@ -31,8 +31,6 @@ #define XYSERIESIODEVICE_H #include -#include -#include #include QT_CHARTS_BEGIN_NAMESPACE @@ -45,17 +43,14 @@ { Q_OBJECT public: - explicit XYSeriesIODevice(QXYSeries *series, QObject *parent = nullptr); - - static const int sampleCount = 2000; + explicit XYSeriesIODevice(QXYSeries * series, QObject *parent = 0); protected: - qint64 readData(char *data, qint64 maxSize) override; - qint64 writeData(const char *data, qint64 maxSize) override; + qint64 readData(char * data, qint64 maxSize); + qint64 writeData(const char * data, qint64 maxSize); private: QXYSeries *m_series; - QVector m_buffer; }; #endif // XYSERIESIODEVICE_H diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/barchart/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/barchart/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/barchart/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/barchart/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -34,7 +34,6 @@ #include #include #include -#include QT_CHARTS_USE_NAMESPACE @@ -76,15 +75,10 @@ //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoryAxis *axisX = new QBarCategoryAxis(); - axisX->append(categories); - chart->addAxis(axisX, Qt::AlignBottom); - series->attachAxis(axisX); - - QValueAxis *axisY = new QValueAxis(); - axisY->setRange(0,15); - chart->addAxis(axisY, Qt::AlignLeft); - series->attachAxis(axisY); + QBarCategoryAxis *axis = new QBarCategoryAxis(); + axis->append(categories); + chart->createDefaultAxes(); + chart->setAxisX(axis, series); //![4] //![5] diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/barmodelmapper/barmodelmapper.pro qtcharts-opensource-src-5.9.5/examples/charts/barmodelmapper/barmodelmapper.pro --- qtcharts-opensource-src-5.12.5/examples/charts/barmodelmapper/barmodelmapper.pro 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/barmodelmapper/barmodelmapper.pro 2018-03-19 05:05:55.000000000 +0000 @@ -1,5 +1,4 @@ QT += charts -requires(qtConfig(tableview)) HEADERS += \ customtablemodel.h \ diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/barmodelmapper/customtablemodel.cpp qtcharts-opensource-src-5.9.5/examples/charts/barmodelmapper/customtablemodel.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/barmodelmapper/customtablemodel.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/barmodelmapper/customtablemodel.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -31,12 +31,13 @@ #include #include #include -#include #include CustomTableModel::CustomTableModel(QObject *parent) : QAbstractTableModel(parent) { + qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); + m_columnCount = 6; m_rowCount = 12; @@ -45,9 +46,9 @@ QVector* dataVec = new QVector(m_columnCount); for (int k = 0; k < dataVec->size(); k++) { if (k % 2 == 0) - dataVec->replace(k, i * 50 + QRandomGenerator::global()->bounded(20)); + dataVec->replace(k, i * 50 + qrand() % 20); else - dataVec->replace(k, QRandomGenerator::global()->bounded(100)); + dataVec->replace(k, qrand() % 100); } m_data.append(dataVec); } diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/barmodelmapper/tablewidget.cpp qtcharts-opensource-src-5.9.5/examples/charts/barmodelmapper/tablewidget.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/barmodelmapper/tablewidget.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/barmodelmapper/tablewidget.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -39,7 +39,6 @@ #include #include #include -#include QT_CHARTS_USE_NAMESPACE @@ -98,13 +97,10 @@ //! [6] QStringList categories; categories << "April" << "May" << "June" << "July" << "August"; - QBarCategoryAxis *axisX = new QBarCategoryAxis(); - axisX->append(categories); - chart->addAxis(axisX, Qt::AlignBottom); - series->attachAxis(axisX); - QValueAxis *axisY = new QValueAxis(); - chart->addAxis(axisY, Qt::AlignLeft); - series->attachAxis(axisY); + QBarCategoryAxis *axis = new QBarCategoryAxis(); + axis->append(categories); + chart->createDefaultAxes(); + chart->setAxisX(axis, series); //! [6] //! [7] diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/boxplotchart/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/boxplotchart/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/boxplotchart/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/boxplotchart/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -88,8 +88,8 @@ //! [5] chart->createDefaultAxes(); - chart->axes(Qt::Vertical).first()->setMin(15.0); - chart->axes(Qt::Horizontal).first()->setMax(34.0); + chart->axisY()->setMin(15.0); + chart->axisY()->setMax(34.0); //! [5] //! [6] diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/chartinteractions/chart.cpp qtcharts-opensource-src-5.9.5/examples/charts/chartinteractions/chart.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/chartinteractions/chart.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/chartinteractions/chart.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -78,12 +78,12 @@ //Get the x- and y axis to be able to convert the mapped //coordinate point to the charts scale. - QAbstractAxis *axisx = axes(Qt::Horizontal).first(); + QAbstractAxis *axisx = this->axisX(); QValueAxis *haxis = 0; if (axisx->type() == QAbstractAxis::AxisTypeValue) haxis = qobject_cast(axisx); - QAbstractAxis *axisy = axes(Qt::Vertical).first(); + QAbstractAxis *axisy = this->axisY(); QValueAxis *vaxis = 0; if (axisy->type() == QAbstractAxis::AxisTypeValue) vaxis = qobject_cast(axisy); diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/chartinteractions/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/chartinteractions/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/chartinteractions/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/chartinteractions/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -58,17 +58,16 @@ QPen p = series->pen(); p.setWidth(5); series->setPen(p); + chart->createDefaultAxes(); chart->setTitle("Drag'n drop to move data points"); QValueAxis *axisX = new QValueAxis(); - chart->addAxis(axisX, Qt::AlignBottom); + chart->setAxisX(axisX, series); axisX->setRange(0, 20); - series->attachAxis(axisX); QValueAxis *axisY = new QValueAxis(); - chart->addAxis(axisY, Qt::AlignLeft); + chart->setAxisY(axisY, series); axisY->setRange(0, 13); - series->attachAxis(axisY); QObject::connect(series, &QLineSeries::pressed, chart, &Chart::clickPoint); diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/chartthemes/chartthemes.pro qtcharts-opensource-src-5.9.5/examples/charts/chartthemes/chartthemes.pro --- qtcharts-opensource-src-5.12.5/examples/charts/chartthemes/chartthemes.pro 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/chartthemes/chartthemes.pro 2018-03-19 05:05:55.000000000 +0000 @@ -1,5 +1,4 @@ QT += charts -requires(qtConfig(combobox)) HEADERS += \ themewidget.h @@ -10,6 +9,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/charts/chartthemes INSTALLS += target - -FORMS += \ - themewidget.ui diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/chartthemes/themewidget.cpp qtcharts-opensource-src-5.9.5/examples/charts/chartthemes/themewidget.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/chartthemes/themewidget.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/chartthemes/themewidget.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -28,7 +28,6 @@ ****************************************************************************/ #include "themewidget.h" -#include "ui_themewidget.h" #include #include @@ -50,10 +49,8 @@ #include #include #include -#include +#include #include -#include -#include ThemeWidget::ThemeWidget(QWidget *parent) : QWidget(parent), @@ -61,73 +58,94 @@ m_valueMax(10), m_valueCount(7), m_dataTable(generateRandomData(m_listCount, m_valueMax, m_valueCount)), - m_ui(new Ui_ThemeWidgetForm) -{ - m_ui->setupUi(this); - populateThemeBox(); - populateAnimationBox(); - populateLegendBox(); + m_themeComboBox(createThemeBox()), + m_antialiasCheckBox(new QCheckBox("Anti-aliasing")), + m_animatedComboBox(createAnimationBox()), + m_legendComboBox(createLegendBox()) +{ + connectSignals(); + // create layout + QGridLayout *baseLayout = new QGridLayout(); + QHBoxLayout *settingsLayout = new QHBoxLayout(); + settingsLayout->addWidget(new QLabel("Theme:")); + settingsLayout->addWidget(m_themeComboBox); + settingsLayout->addWidget(new QLabel("Animation:")); + settingsLayout->addWidget(m_animatedComboBox); + settingsLayout->addWidget(new QLabel("Legend:")); + settingsLayout->addWidget(m_legendComboBox); + settingsLayout->addWidget(m_antialiasCheckBox); + settingsLayout->addStretch(); + baseLayout->addLayout(settingsLayout, 0, 0, 1, 3); //create charts QChartView *chartView; chartView = new QChartView(createAreaChart()); - m_ui->gridLayout->addWidget(chartView, 1, 0); + baseLayout->addWidget(chartView, 1, 0); m_charts << chartView; - chartView = new QChartView(createPieChart()); - // Funny things happen if the pie slice labels do not fit the screen, so we ignore size policy - chartView->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); - m_ui->gridLayout->addWidget(chartView, 1, 1); + chartView = new QChartView(createBarChart(m_valueCount)); + baseLayout->addWidget(chartView, 1, 1); m_charts << chartView; - //![5] chartView = new QChartView(createLineChart()); - m_ui->gridLayout->addWidget(chartView, 1, 2); - //![5] + baseLayout->addWidget(chartView, 1, 2); m_charts << chartView; - chartView = new QChartView(createBarChart(m_valueCount)); - m_ui->gridLayout->addWidget(chartView, 2, 0); + chartView = new QChartView(createPieChart()); + // Funny things happen if the pie slice labels do not fit the screen, so we ignore size policy + chartView->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); + baseLayout->addWidget(chartView, 2, 0); m_charts << chartView; chartView = new QChartView(createSplineChart()); - m_ui->gridLayout->addWidget(chartView, 2, 1); + baseLayout->addWidget(chartView, 2, 1); m_charts << chartView; chartView = new QChartView(createScatterChart()); - m_ui->gridLayout->addWidget(chartView, 2, 2); + baseLayout->addWidget(chartView, 2, 2); m_charts << chartView; - // Set defaults - m_ui->antialiasCheckBox->setChecked(true); - - // Set the colors from the light theme as default ones - QPalette pal = qApp->palette(); - pal.setColor(QPalette::Window, QRgb(0xf0f0f0)); - pal.setColor(QPalette::WindowText, QRgb(0x404044)); - qApp->setPalette(pal); + setLayout(baseLayout); + // Set defaults + m_antialiasCheckBox->setChecked(true); updateUI(); } ThemeWidget::~ThemeWidget() { - delete m_ui; +} + +void ThemeWidget::connectSignals() +{ + connect(m_themeComboBox, + static_cast(&QComboBox::currentIndexChanged), + this, &ThemeWidget::updateUI); + connect(m_antialiasCheckBox, &QCheckBox::toggled, this, &ThemeWidget::updateUI); + connect(m_animatedComboBox, + static_cast(&QComboBox::currentIndexChanged), + this, &ThemeWidget::updateUI); + connect(m_legendComboBox, + static_cast(&QComboBox::currentIndexChanged), + this, &ThemeWidget::updateUI); } DataTable ThemeWidget::generateRandomData(int listCount, int valueMax, int valueCount) const { DataTable dataTable; + // set seed for random stuff + qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); + // generate random data for (int i(0); i < listCount; i++) { DataList dataList; qreal yValue(0); for (int j(0); j < valueCount; j++) { - yValue = yValue + QRandomGenerator::global()->bounded(valueMax / (qreal) valueCount); - QPointF value((j + QRandomGenerator::global()->generateDouble()) * ((qreal) m_valueMax / (qreal) valueCount), + yValue = yValue + (qreal)(qrand() % valueMax) / (qreal) valueCount; + QPointF value((j + (qreal) rand() / (qreal) RAND_MAX) * ((qreal) m_valueMax / (qreal) valueCount), yValue); QString label = "Slice " + QString::number(i) + ":" + QString::number(j); dataList << Data(value, label); @@ -138,36 +156,41 @@ return dataTable; } -void ThemeWidget::populateThemeBox() +QComboBox *ThemeWidget::createThemeBox() const { - // add items to theme combobox - m_ui->themeComboBox->addItem("Light", QChart::ChartThemeLight); - m_ui->themeComboBox->addItem("Blue Cerulean", QChart::ChartThemeBlueCerulean); - m_ui->themeComboBox->addItem("Dark", QChart::ChartThemeDark); - m_ui->themeComboBox->addItem("Brown Sand", QChart::ChartThemeBrownSand); - m_ui->themeComboBox->addItem("Blue NCS", QChart::ChartThemeBlueNcs); - m_ui->themeComboBox->addItem("High Contrast", QChart::ChartThemeHighContrast); - m_ui->themeComboBox->addItem("Blue Icy", QChart::ChartThemeBlueIcy); - m_ui->themeComboBox->addItem("Qt", QChart::ChartThemeQt); -} - -void ThemeWidget::populateAnimationBox() -{ - // add items to animation combobox - m_ui->animatedComboBox->addItem("No Animations", QChart::NoAnimation); - m_ui->animatedComboBox->addItem("GridAxis Animations", QChart::GridAxisAnimations); - m_ui->animatedComboBox->addItem("Series Animations", QChart::SeriesAnimations); - m_ui->animatedComboBox->addItem("All Animations", QChart::AllAnimations); -} - -void ThemeWidget::populateLegendBox() -{ - // add items to legend combobox - m_ui->legendComboBox->addItem("No Legend ", 0); - m_ui->legendComboBox->addItem("Legend Top", Qt::AlignTop); - m_ui->legendComboBox->addItem("Legend Bottom", Qt::AlignBottom); - m_ui->legendComboBox->addItem("Legend Left", Qt::AlignLeft); - m_ui->legendComboBox->addItem("Legend Right", Qt::AlignRight); + // settings layout + QComboBox *themeComboBox = new QComboBox(); + themeComboBox->addItem("Light", QChart::ChartThemeLight); + themeComboBox->addItem("Blue Cerulean", QChart::ChartThemeBlueCerulean); + themeComboBox->addItem("Dark", QChart::ChartThemeDark); + themeComboBox->addItem("Brown Sand", QChart::ChartThemeBrownSand); + themeComboBox->addItem("Blue NCS", QChart::ChartThemeBlueNcs); + themeComboBox->addItem("High Contrast", QChart::ChartThemeHighContrast); + themeComboBox->addItem("Blue Icy", QChart::ChartThemeBlueIcy); + themeComboBox->addItem("Qt", QChart::ChartThemeQt); + return themeComboBox; +} + +QComboBox *ThemeWidget::createAnimationBox() const +{ + // settings layout + QComboBox *animationComboBox = new QComboBox(); + animationComboBox->addItem("No Animations", QChart::NoAnimation); + animationComboBox->addItem("GridAxis Animations", QChart::GridAxisAnimations); + animationComboBox->addItem("Series Animations", QChart::SeriesAnimations); + animationComboBox->addItem("All Animations", QChart::AllAnimations); + return animationComboBox; +} + +QComboBox *ThemeWidget::createLegendBox() const +{ + QComboBox *legendComboBox = new QComboBox(); + legendComboBox->addItem("No Legend ", 0); + legendComboBox->addItem("Legend Top", Qt::AlignTop); + legendComboBox->addItem("Legend Bottom", Qt::AlignBottom); + legendComboBox->addItem("Legend Left", Qt::AlignLeft); + legendComboBox->addItem("Legend Right", Qt::AlignRight); + return legendComboBox; } QChart *ThemeWidget::createAreaChart() const @@ -194,17 +217,10 @@ area->setName(name + QString::number(nameIndex)); nameIndex++; chart->addSeries(area); + chart->createDefaultAxes(); lowerSeries = upperSeries; } - chart->createDefaultAxes(); - chart->axes(Qt::Horizontal).first()->setRange(0, m_valueCount - 1); - chart->axes(Qt::Vertical).first()->setRange(0, m_valueMax); - // Add space to label to add space between labels and axis - QValueAxis *axisY = qobject_cast(chart->axes(Qt::Vertical).first()); - Q_ASSERT(axisY); - axisY->setLabelFormat("%.1f "); - return chart; } @@ -222,25 +238,16 @@ series->append(set); } chart->addSeries(series); - chart->createDefaultAxes(); - chart->axes(Qt::Vertical).first()->setRange(0, m_valueMax * 2); - // Add space to label to add space between labels and axis - QValueAxis *axisY = qobject_cast(chart->axes(Qt::Vertical).first()); - Q_ASSERT(axisY); - axisY->setLabelFormat("%.1f "); return chart; } QChart *ThemeWidget::createLineChart() const { - //![1] QChart *chart = new QChart(); chart->setTitle("Line chart"); - //![1] - //![2] QString name("Series "); int nameIndex = 0; for (const DataList &list : m_dataTable) { @@ -251,19 +258,7 @@ nameIndex++; chart->addSeries(series); } - //![2] - - //![3] chart->createDefaultAxes(); - chart->axes(Qt::Horizontal).first()->setRange(0, m_valueMax); - chart->axes(Qt::Vertical).first()->setRange(0, m_valueCount); - //![3] - //![4] - // Add space to label to add space between labels and axis - QValueAxis *axisY = qobject_cast(chart->axes(Qt::Vertical).first()); - Q_ASSERT(axisY); - axisY->setLabelFormat("%.1f "); - //![4] return chart; } @@ -273,24 +268,29 @@ QChart *chart = new QChart(); chart->setTitle("Pie chart"); - QPieSeries *series = new QPieSeries(chart); - for (const Data &data : m_dataTable[0]) { - QPieSlice *slice = series->append(data.second, data.first.y()); - if (data == m_dataTable[0].first()) { - // Show the first slice exploded with label - slice->setLabelVisible(); - slice->setExploded(); - slice->setExplodeDistanceFactor(0.5); + qreal pieSize = 1.0 / m_dataTable.count(); + for (int i = 0; i < m_dataTable.count(); i++) { + QPieSeries *series = new QPieSeries(chart); + for (const Data &data : m_dataTable[i]) { + QPieSlice *slice = series->append(data.second, data.first.y()); + if (data == m_dataTable[i].first()) { + slice->setLabelVisible(); + slice->setExploded(); + } } + qreal hPos = (pieSize / 2) + (i / (qreal) m_dataTable.count()); + series->setPieSize(pieSize); + series->setHorizontalPosition(hPos); + series->setVerticalPosition(0.5); + chart->addSeries(series); } - series->setPieSize(0.4); - chart->addSeries(series); return chart; } QChart *ThemeWidget::createSplineChart() const { + // spine chart QChart *chart = new QChart(); chart->setTitle("Spline chart"); QString name("Series "); @@ -303,15 +303,7 @@ nameIndex++; chart->addSeries(series); } - chart->createDefaultAxes(); - chart->axes(Qt::Horizontal).first()->setRange(0, m_valueMax); - chart->axes(Qt::Vertical).first()->setRange(0, m_valueCount); - - // Add space to label to add space between labels and axis - QValueAxis *axisY = qobject_cast(chart->axes(Qt::Vertical).first()); - Q_ASSERT(axisY); - axisY->setLabelFormat("%.1f "); return chart; } @@ -330,38 +322,24 @@ nameIndex++; chart->addSeries(series); } - chart->createDefaultAxes(); - chart->axes(Qt::Horizontal).first()->setRange(0, m_valueMax); - chart->axes(Qt::Vertical).first()->setRange(0, m_valueCount); - // Add space to label to add space between labels and axis - QValueAxis *axisY = qobject_cast(chart->axes(Qt::Vertical).first()); - Q_ASSERT(axisY); - axisY->setLabelFormat("%.1f "); return chart; } void ThemeWidget::updateUI() { - //![6] QChart::ChartTheme theme = static_cast( - m_ui->themeComboBox->itemData(m_ui->themeComboBox->currentIndex()).toInt()); - //![6] + m_themeComboBox->itemData(m_themeComboBox->currentIndex()).toInt()); + const auto charts = m_charts; - if (!m_charts.isEmpty() && m_charts.at(0)->chart()->theme() != theme) { - for (QChartView *chartView : charts) { - //![7] + if (m_charts.at(0)->chart()->theme() != theme) { + for (QChartView *chartView : charts) chartView->chart()->setTheme(theme); - //![7] - } - // Set palette colors based on selected theme - //![8] QPalette pal = window()->palette(); if (theme == QChart::ChartThemeLight) { pal.setColor(QPalette::Window, QRgb(0xf0f0f0)); pal.setColor(QPalette::WindowText, QRgb(0x404044)); - //![8] } else if (theme == QChart::ChartThemeDark) { pal.setColor(QPalette::Window, QRgb(0x121218)); pal.setColor(QPalette::WindowText, QRgb(0xd6d6d6)); @@ -387,27 +365,18 @@ window()->setPalette(pal); } - // Update antialiasing - //![11] - bool checked = m_ui->antialiasCheckBox->isChecked(); + bool checked = m_antialiasCheckBox->isChecked(); for (QChartView *chart : charts) chart->setRenderHint(QPainter::Antialiasing, checked); - //![11] - // Update animation options - //![9] QChart::AnimationOptions options( - m_ui->animatedComboBox->itemData(m_ui->animatedComboBox->currentIndex()).toInt()); - if (!m_charts.isEmpty() && m_charts.at(0)->chart()->animationOptions() != options) { + m_animatedComboBox->itemData(m_animatedComboBox->currentIndex()).toInt()); + if (m_charts.at(0)->chart()->animationOptions() != options) { for (QChartView *chartView : charts) chartView->chart()->setAnimationOptions(options); } - //![9] - // Update legend alignment - //![10] - Qt::Alignment alignment( - m_ui->legendComboBox->itemData(m_ui->legendComboBox->currentIndex()).toInt()); + Qt::Alignment alignment(m_legendComboBox->itemData(m_legendComboBox->currentIndex()).toInt()); if (!alignment) { for (QChartView *chartView : charts) @@ -418,6 +387,5 @@ chartView->chart()->legend()->show(); } } - //![10] } diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/chartthemes/themewidget.h qtcharts-opensource-src-5.9.5/examples/charts/chartthemes/themewidget.h --- qtcharts-opensource-src-5.12.5/examples/charts/chartthemes/themewidget.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/chartthemes/themewidget.h 2018-03-19 05:05:55.000000000 +0000 @@ -36,7 +36,6 @@ QT_BEGIN_NAMESPACE class QComboBox; class QCheckBox; -class Ui_ThemeWidgetForm; QT_END_NAMESPACE QT_CHARTS_BEGIN_NAMESPACE @@ -62,9 +61,9 @@ private: DataTable generateRandomData(int listCount, int valueMax, int valueCount) const; - void populateThemeBox(); - void populateAnimationBox(); - void populateLegendBox(); + QComboBox *createThemeBox() const; + QComboBox *createAnimationBox() const; + QComboBox *createLegendBox() const; void connectSignals(); QChart *createAreaChart() const; QChart *createBarChart(int valueCount) const; @@ -80,7 +79,10 @@ QList m_charts; DataTable m_dataTable; - Ui_ThemeWidgetForm *m_ui; + QComboBox *m_themeComboBox; + QCheckBox *m_antialiasCheckBox; + QComboBox *m_animatedComboBox; + QComboBox *m_legendComboBox; }; #endif /* THEMEWIDGET_H */ diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/chartthemes/themewidget.ui qtcharts-opensource-src-5.9.5/examples/charts/chartthemes/themewidget.ui --- qtcharts-opensource-src-5.12.5/examples/charts/chartthemes/themewidget.ui 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/chartthemes/themewidget.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ - - - ThemeWidgetForm - - - - 0 - 0 - 900 - 600 - - - - - - - - - Theme: - - - - - - - - - - Animation: - - - - - - - - - - Legend: - - - - - - - - - - Anti-aliasing - - - false - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - themeComboBox - currentIndexChanged(int) - ThemeWidgetForm - updateUI() - - - antialiasCheckBox - toggled(bool) - ThemeWidgetForm - updateUI() - - - legendComboBox - currentIndexChanged(int) - ThemeWidgetForm - updateUI() - - - animatedComboBox - currentIndexChanged(int) - ThemeWidgetForm - updateUI() - - - - updateUI() - - diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/customchart/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/customchart/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/customchart/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/customchart/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -120,10 +120,8 @@ axisY->append("fast", 30); axisY->setRange(0, 30); - chart->addAxis(axisX, Qt::AlignBottom); - chart->addAxis(axisY, Qt::AlignLeft); - series->attachAxis(axisX); - series->attachAxis(axisY); + chart->setAxisX(axisX, series); + chart->setAxisY(axisY, series); //![4] //![5] diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/datetimeaxis/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/datetimeaxis/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/datetimeaxis/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/datetimeaxis/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -43,6 +43,7 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); + qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); //![1] QLineSeries *series = new QLineSeries(); diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/dynamicspline/chart.cpp qtcharts-opensource-src-5.9.5/examples/charts/dynamicspline/chart.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/dynamicspline/chart.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/dynamicspline/chart.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -31,18 +31,19 @@ #include #include #include -#include +#include #include Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags): QChart(QChart::ChartTypeCartesian, parent, wFlags), m_series(0), - m_axisX(new QValueAxis()), - m_axisY(new QValueAxis()), + m_axis(new QValueAxis), m_step(0), m_x(5), m_y(1) { + qsrand((uint) QTime::currentTime().msec()); + QObject::connect(&m_timer, &QTimer::timeout, this, &Chart::handleTimeout); m_timer.setInterval(1000); @@ -53,14 +54,11 @@ m_series->append(m_x, m_y); addSeries(m_series); - - addAxis(m_axisX,Qt::AlignBottom); - addAxis(m_axisY,Qt::AlignLeft); - m_series->attachAxis(m_axisX); - m_series->attachAxis(m_axisY); - m_axisX->setTickCount(5); - m_axisX->setRange(0, 10); - m_axisY->setRange(-5, 10); + createDefaultAxes(); + setAxisX(m_axis, m_series); + m_axis->setTickCount(5); + axisX()->setRange(0, 10); + axisY()->setRange(-5, 10); m_timer.start(); } @@ -72,10 +70,10 @@ void Chart::handleTimeout() { - qreal x = plotArea().width() / m_axisX->tickCount(); - qreal y = (m_axisX->max() - m_axisX->min()) / m_axisX->tickCount(); + qreal x = plotArea().width() / m_axis->tickCount(); + qreal y = (m_axis->max() - m_axis->min()) / m_axis->tickCount(); m_x += y; - m_y = QRandomGenerator::global()->bounded(5) - 2.5; + m_y = qrand() % 5 - 2.5; m_series->append(m_x, m_y); scroll(x, 0); if (m_x == 100) diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/dynamicspline/chart.h qtcharts-opensource-src-5.9.5/examples/charts/dynamicspline/chart.h --- qtcharts-opensource-src-5.12.5/examples/charts/dynamicspline/chart.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/dynamicspline/chart.h 2018-03-19 05:05:55.000000000 +0000 @@ -55,8 +55,7 @@ QTimer m_timer; QSplineSeries *m_series; QStringList m_titles; - QValueAxis *m_axisX; - QValueAxis *m_axisY; + QValueAxis *m_axis; qreal m_step; qreal m_x; qreal m_y; diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/horizontalbarchart/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/horizontalbarchart/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/horizontalbarchart/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/horizontalbarchart/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -78,11 +78,9 @@ categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; QBarCategoryAxis *axisY = new QBarCategoryAxis(); axisY->append(categories); - chart->addAxis(axisY, Qt::AlignLeft); - series->attachAxis(axisY); + chart->setAxisY(axisY, series); QValueAxis *axisX = new QValueAxis(); - chart->addAxis(axisX, Qt::AlignBottom); - series->attachAxis(axisX); + chart->setAxisX(axisX, series); axisX->applyNiceNumbers(); //![4] diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/horizontalpercentbarchart/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/horizontalpercentbarchart/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/horizontalpercentbarchart/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/horizontalpercentbarchart/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -35,7 +35,6 @@ #include #include #include -#include QT_CHARTS_USE_NAMESPACE @@ -77,13 +76,10 @@ //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoryAxis *axisY = new QBarCategoryAxis(); - axisY->append(categories); - chart->addAxis(axisY, Qt::AlignLeft); - series->attachAxis(axisY); - QValueAxis *axisX = new QValueAxis(); - chart->addAxis(axisX, Qt::AlignBottom); - series->attachAxis(axisX); + QBarCategoryAxis *axis = new QBarCategoryAxis(); + axis->append(categories); + chart->createDefaultAxes(); + chart->setAxisY(axis, series); //![4] //![5] diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/horizontalstackedbarchart/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/horizontalstackedbarchart/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/horizontalstackedbarchart/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/horizontalstackedbarchart/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -35,7 +35,6 @@ #include #include #include -#include QT_CHARTS_USE_NAMESPACE @@ -77,13 +76,10 @@ //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoryAxis *axisY = new QBarCategoryAxis(); - axisY->append(categories); - chart->addAxis(axisY, Qt::AlignLeft); - series->attachAxis(axisY); - QValueAxis *axisX = new QValueAxis(); - chart->addAxis(axisX, Qt::AlignBottom); - series->attachAxis(axisX); + QBarCategoryAxis *axis = new QBarCategoryAxis(); + axis->append(categories); + chart->createDefaultAxes(); + chart->setAxisY(axis, series); //![4] //![5] diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/legendmarkers/mainwidget.cpp qtcharts-opensource-src-5.9.5/examples/charts/legendmarkers/mainwidget.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/legendmarkers/mainwidget.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/legendmarkers/mainwidget.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -82,7 +82,7 @@ int offset = m_chart->series().count(); for (int i = 0; i < 360; i++) { qreal x = offset * 20 + i; - data.append(QPointF(i, qSin(qDegreesToRadians(x)))); + data.append(QPointF(i, qSin(2.0 * 3.141592 * x / 360.0))); } series->append(data); diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/lineandbar/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/lineandbar/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/lineandbar/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/lineandbar/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -89,15 +89,13 @@ categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; QBarCategoryAxis *axisX = new QBarCategoryAxis(); axisX->append(categories); - chart->addAxis(axisX, Qt::AlignBottom); - lineseries->attachAxis(axisX); - barseries->attachAxis(axisX); + chart->setAxisX(axisX, lineseries); + chart->setAxisX(axisX, barseries); axisX->setRange(QString("Jan"), QString("Jun")); QValueAxis *axisY = new QValueAxis(); - chart->addAxis(axisY, Qt::AlignLeft); - lineseries->attachAxis(axisY); - barseries->attachAxis(axisY); + chart->setAxisY(axisY, lineseries); + chart->setAxisY(axisY, barseries); axisY->setRange(0, 20); //![4] diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/modeldata/customtablemodel.cpp qtcharts-opensource-src-5.9.5/examples/charts/modeldata/customtablemodel.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/modeldata/customtablemodel.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/modeldata/customtablemodel.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -29,13 +29,15 @@ #include "customtablemodel.h" #include -#include +#include #include #include CustomTableModel::CustomTableModel(QObject *parent) : QAbstractTableModel(parent) { + qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); + m_columnCount = 4; m_rowCount = 15; @@ -44,9 +46,9 @@ QVector* dataVec = new QVector(m_columnCount); for (int k = 0; k < dataVec->size(); k++) { if (k % 2 == 0) - dataVec->replace(k, i * 50 + QRandomGenerator::global()->bounded(20)); + dataVec->replace(k, i * 50 + qrand() % 20); else - dataVec->replace(k, QRandomGenerator::global()->bounded(100)); + dataVec->replace(k, qrand() % 100); } m_data.append(dataVec); } diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/modeldata/modeldata.pro qtcharts-opensource-src-5.9.5/examples/charts/modeldata/modeldata.pro --- qtcharts-opensource-src-5.12.5/examples/charts/modeldata/modeldata.pro 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/modeldata/modeldata.pro 2018-03-19 05:05:55.000000000 +0000 @@ -1,5 +1,4 @@ QT += charts -requires(qtConfig(tableview)) HEADERS += \ customtablemodel.h \ diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/nesteddonuts/widget.cpp qtcharts-opensource-src-5.9.5/examples/charts/nesteddonuts/widget.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/nesteddonuts/widget.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/nesteddonuts/widget.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include @@ -42,6 +42,7 @@ : QWidget(parent) { setMinimumSize(800, 600); + qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); //! [1] QChartView *chartView = new QChartView; @@ -61,9 +62,9 @@ //! [3] for (int i = 0; i < donutCount; i++) { QPieSeries *donut = new QPieSeries; - int sliceCount = 3 + QRandomGenerator::global()->bounded(3); + int sliceCount = 3 + qrand() % 3; for (int j = 0; j < sliceCount; j++) { - qreal value = 100 + QRandomGenerator::global()->bounded(100); + qreal value = 100 + qrand() % 100; QPieSlice *slice = new QPieSlice(QString("%1").arg(value), value); slice->setLabelVisible(true); slice->setLabelColor(Qt::white); @@ -102,7 +103,7 @@ { for (int i = 0; i < m_donuts.count(); i++) { QPieSeries *donut = m_donuts.at(i); - qreal phaseShift = -50 + QRandomGenerator::global()->bounded(100); + qreal phaseShift = -50 + qrand() % 100; donut->setPieStartAngle(donut->pieStartAngle() + phaseShift); donut->setPieEndAngle(donut->pieEndAngle() + phaseShift); } diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/openglseries/datasource.cpp qtcharts-opensource-src-5.9.5/examples/charts/openglseries/datasource.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/openglseries/datasource.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/openglseries/datasource.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -29,7 +29,6 @@ #include "datasource.h" #include -#include QT_CHARTS_USE_NAMESPACE @@ -112,8 +111,8 @@ qreal x(0); qreal y(0); // data with sin + random component - y = height + (yMultiplier * qSin(M_PI / 50 * j) - + (yMultiplier * QRandomGenerator::global()->generateDouble())); + y = height + (yMultiplier * qSin(3.14159265358979 / 50 * j) + + (yMultiplier * (qreal) rand() / (qreal) RAND_MAX)); // 0.000001 added to make values logaxis compatible x = 0.000001 + 20.0 * (qreal(j) / qreal(colCount)) + (xAdjustment * qreal(i)); points.append(QPointF(x, y)); diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/percentbarchart/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/percentbarchart/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/percentbarchart/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/percentbarchart/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -34,7 +34,6 @@ #include #include #include -#include QT_CHARTS_USE_NAMESPACE @@ -75,13 +74,10 @@ //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoryAxis *axisX = new QBarCategoryAxis(); - axisX->append(categories); - chart->addAxis(axisX, Qt::AlignBottom); - series->attachAxis(axisX); - QValueAxis *axisY = new QValueAxis(); - chart->addAxis(axisY, Qt::AlignLeft); - series->attachAxis(axisY); + QBarCategoryAxis *axis = new QBarCategoryAxis(); + axis->append(categories); + chart->createDefaultAxes(); + chart->setAxisX(axis, series); //![4] //![5] diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/piechartcustomization/piechartcustomization.pro qtcharts-opensource-src-5.9.5/examples/charts/piechartcustomization/piechartcustomization.pro --- qtcharts-opensource-src-5.12.5/examples/charts/piechartcustomization/piechartcustomization.pro 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/piechartcustomization/piechartcustomization.pro 2018-03-19 05:05:55.000000000 +0000 @@ -1,5 +1,4 @@ QT += charts -requires(qtConfig(combobox)) HEADERS += \ brushtool.h \ diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/piechartdrilldown/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/piechartdrilldown/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/piechartdrilldown/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/piechartdrilldown/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -31,7 +31,7 @@ #include "drilldownslice.h" #include #include -#include +#include #include #include #include @@ -42,6 +42,8 @@ { QApplication a(argc, argv); + qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); + QMainWindow window; DrilldownChart *chart = new DrilldownChart(); @@ -65,7 +67,7 @@ series->setName("Sales by month - " + name); for (const QString &month : months) - *series << new DrilldownSlice(QRandomGenerator::global()->bounded(1000), month, yearSeries); + *series << new DrilldownSlice(qrand() % 1000, month, yearSeries); QObject::connect(series, &QPieSeries::clicked, chart, &DrilldownChart::handleSliceClicked); diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/qmlchart/qml/qmlchart/MainForm.ui.qml qtcharts-opensource-src-5.9.5/examples/charts/qmlchart/qml/qmlchart/MainForm.ui.qml --- qtcharts-opensource-src-5.12.5/examples/charts/qmlchart/qml/qmlchart/MainForm.ui.qml 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/qmlchart/qml/qmlchart/MainForm.ui.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -Item { - width: 600 - height: 400 - property bool sourceLoaded: false - property alias currentIndex: root.currentIndex - property alias info: infoText - - ListView { - id: root - focus: true - anchors.fill: parent - snapMode: ListView.SnapOneItem - highlightRangeMode: ListView.StrictlyEnforceRange - highlightMoveDuration: 250 - orientation: ListView.Horizontal - boundsBehavior: Flickable.StopAtBounds - - model: ListModel { - ListElement {component: "View1.qml"} - ListElement {component: "View2.qml"} - ListElement {component: "View3.qml"} - ListElement {component: "View4.qml"} - ListElement {component: "View5.qml"} - ListElement {component: "View6.qml"} - ListElement {component: "View7.qml"} - ListElement {component: "View8.qml"} - ListElement {component: "View9.qml"} - ListElement {component: "View10.qml"} - ListElement {component: "View11.qml"} - ListElement {component: "View12.qml"} - } - - delegate: Loader { - width: root.width - height: root.height - - source: component - asynchronous: true - - onLoaded: sourceLoaded = true - } - } - - Rectangle { - id: infoText - anchors.centerIn: parent - width: parent.width - height: 40 - color: "black" - Text { - color: "white" - anchors.centerIn: parent - text: "You can navigate between views using swipe or arrow keys" - } - } -} diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/qmlchart/qml/qmlchart/main.qml qtcharts-opensource-src-5.9.5/examples/charts/qmlchart/qml/qmlchart/main.qml --- qtcharts-opensource-src-5.12.5/examples/charts/qmlchart/qml/qmlchart/main.qml 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/qmlchart/qml/qmlchart/main.qml 2018-03-19 05:05:55.000000000 +0000 @@ -34,20 +34,66 @@ Item { width: 600 height: 400 + property bool sourceLoaded: false - MainForm { + ListView { + id: root + focus: true anchors.fill: parent - // Hide the default info text once view changes away from the first view + snapMode: ListView.SnapOneItem + highlightRangeMode: ListView.StrictlyEnforceRange + highlightMoveDuration: 250 + orientation: ListView.Horizontal + boundsBehavior: Flickable.StopAtBounds + onCurrentIndexChanged: { - if (info.opacity > 0.0) { + if (infoText.opacity > 0.0) { if (sourceLoaded) - info.opacity = 0.0; + infoText.opacity = 0.0; else if (currentIndex != 0) currentIndex = 0; } } - Behavior on info.opacity { + model: ListModel { + ListElement {component: "View1.qml"} + ListElement {component: "View2.qml"} + ListElement {component: "View3.qml"} + ListElement {component: "View4.qml"} + ListElement {component: "View5.qml"} + ListElement {component: "View6.qml"} + ListElement {component: "View7.qml"} + ListElement {component: "View8.qml"} + ListElement {component: "View9.qml"} + ListElement {component: "View10.qml"} + ListElement {component: "View11.qml"} + ListElement {component: "View12.qml"} + } + + delegate: Loader { + width: root.width + height: root.height + + source: component + asynchronous: true + + onLoaded: sourceLoaded = true + } + } + + Rectangle { + id: infoText + anchors.centerIn: parent + width: parent.width + height: 40 + color: "black" + Text { + color: "white" + anchors.centerIn: parent + text: "You can navigate between views using swipe or arrow keys" + } + + Behavior on opacity { NumberAnimation { duration: 400 } } } diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/qmlchart/qml/qmlchart/View12.qml qtcharts-opensource-src-5.9.5/examples/charts/qmlchart/qml/qmlchart/View12.qml --- qtcharts-opensource-src-5.12.5/examples/charts/qmlchart/qml/qmlchart/View12.qml 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/qmlchart/qml/qmlchart/View12.qml 2018-03-19 05:05:55.000000000 +0000 @@ -45,9 +45,9 @@ id: pieOuter size: 0.96 holeSize: 0.7 - PieSlice { id: slice; label: "Alpha"; value: 19511; color: "#99CA53" } - PieSlice { label: "Epsilon"; value: 11105; color: "#209FDF" } - PieSlice { label: "Psi"; value: 9352; color: "#F6A625" } + PieSlice { id: slice; label: "Alpha"; value: 19511; color: "#8AB846"; borderColor: "#163430" } + PieSlice { label: "Epsilon"; value: 11105; color: "#C0EEFF"; borderColor: "#3B391C" } + PieSlice { label: "Psi"; value: 9352; color: "#DF8939"; borderColor: "#13060C" } } PieSeries { @@ -55,17 +55,17 @@ id: pieInner holeSize: 0.25 - PieSlice { label: "Materials"; value: 10334; color: "#B9DB8A" } - PieSlice { label: "Employee"; value: 3066; color: "#DCEDC4" } - PieSlice { label: "Logistics"; value: 6111; color: "#F3F9EB" } + PieSlice { label: "Materials"; value: 10334; color: "#8AB846"; borderColor: "#163430" } + PieSlice { label: "Employee"; value: 3066; color: "#AAE356"; borderColor: "#163430" } + PieSlice { label: "Logistics"; value: 6111; color: "#99CC4E"; borderColor: "#163430" } - PieSlice { label: "Materials"; value: 7371; color: "#63BCE9" } - PieSlice { label: "Employee"; value: 2443; color: "#A6D9F2" } - PieSlice { label: "Logistics"; value: 1291; color: "#E9F5FC" } + PieSlice { label: "Materials"; value: 7371; color: "#C0EEFF"; borderColor: "#3B391C" } + PieSlice { label: "Employee"; value: 2443; color: "#C9FAFF"; borderColor: "#3B391C" } + PieSlice { label: "Logistics"; value: 1291; color: "#B0FAFF"; borderColor: "#3B391C" } - PieSlice { label: "Materials"; value: 4022; color: "#F9C36C" } - PieSlice { label: "Employee"; value: 3998; color: "#FCE1B6" } - PieSlice { label: "Logistics"; value: 1332; color: "#FEF5E7" } + PieSlice { label: "Materials"; value: 4022; color: "#DF8939"; borderColor: "#13060C" } + PieSlice { label: "Employee"; value: 3998; color: "#FC9D42"; borderColor: "#13060C" } + PieSlice { label: "Logistics"; value: 1332; color: "#F2963F"; borderColor: "#13060C" } } } diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/qmlchart/qml/qmlchart/View1.qml qtcharts-opensource-src-5.9.5/examples/charts/qmlchart/qml/qmlchart/View1.qml --- qtcharts-opensource-src-5.12.5/examples/charts/qmlchart/qml/qmlchart/View1.qml 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/qmlchart/qml/qmlchart/View1.qml 2018-03-19 05:05:55.000000000 +0000 @@ -55,7 +55,7 @@ } Component.onCompleted: { - // You can also manipulate slices dynamically, like append a slice or set a slice exploded + // You can also manipulate slices dynamically othersSlice = pieSeries.append("Others", 52.0); pieSeries.find("Volkswagen").exploded = true; } diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/qmlchart/qml/qmlchart/View4.qml qtcharts-opensource-src-5.9.5/examples/charts/qmlchart/qml/qmlchart/View4.qml --- qtcharts-opensource-src-5.12.5/examples/charts/qmlchart/qml/qmlchart/View4.qml 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/qmlchart/qml/qmlchart/View4.qml 2018-03-19 05:05:55.000000000 +0000 @@ -39,7 +39,6 @@ anchors.fill: parent antialiasing: true - // Define x-axis to be used with the series instead of default one ValueAxis { id: valueAxis min: 2000 @@ -50,6 +49,9 @@ AreaSeries { name: "Russian" + color: "#FFD52B1E" + borderColor: "#FF0039A5" + borderWidth: 3 axisX: valueAxis upperSeries: LineSeries { XYPoint { x: 2000; y: 1 } @@ -70,6 +72,9 @@ AreaSeries { name: "Swedish" + color: "#AF005292" + borderColor: "#AFFDCA00" + borderWidth: 3 axisX: valueAxis upperSeries: LineSeries { XYPoint { x: 2000; y: 1 } @@ -89,6 +94,9 @@ AreaSeries { name: "Finnish" + color: "#00357F" + borderColor: "#FEFEFE" + borderWidth: 3 axisX: valueAxis upperSeries: LineSeries { XYPoint { x: 2000; y: 0 } diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/qmlchart/resources.qrc qtcharts-opensource-src-5.9.5/examples/charts/qmlchart/resources.qrc --- qtcharts-opensource-src-5.12.5/examples/charts/qmlchart/resources.qrc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/qmlchart/resources.qrc 2018-03-19 05:05:55.000000000 +0000 @@ -13,6 +13,5 @@ qml/qmlchart/View10.qml qml/qmlchart/View11.qml qml/qmlchart/View12.qml - qml/qmlchart/MainForm.ui.qml diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/qmloscilloscope/datasource.cpp qtcharts-opensource-src-5.9.5/examples/charts/qmloscilloscope/datasource.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/qmloscilloscope/datasource.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/qmloscilloscope/datasource.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -33,7 +33,6 @@ #include #include #include -#include #include QT_CHARTS_USE_NAMESPACE @@ -81,7 +80,7 @@ switch (type) { case 0: // data with sin + random component - y = qSin(M_PI / 50 * j) + 0.5 + QRandomGenerator::global()->generateDouble(); + y = qSin(3.14159265358979 / 50 * j) + 0.5 + (qreal) rand() / (qreal) RAND_MAX; x = j; break; case 1: diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/scatterchart/chartview.cpp qtcharts-opensource-src-5.9.5/examples/charts/scatterchart/chartview.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/scatterchart/chartview.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/scatterchart/chartview.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -34,6 +34,8 @@ #include #include +const float Pi = 3.14159f; + ChartView::ChartView(QWidget *parent) : QChartView(new QChart(), parent) { @@ -69,8 +71,8 @@ QPainterPath starPath; starPath.moveTo(28, 15); for (int i = 1; i < 5; ++i) { - starPath.lineTo(14 + 14 * qCos(0.8 * i * M_PI), - 15 + 14 * qSin(0.8 * i * M_PI)); + starPath.lineTo(14 + 14 * qCos(0.8 * i * Pi), + 15 + 14 * qSin(0.8 * i * Pi)); } starPath.closeSubpath(); diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/scatterinteractions/chartview.cpp qtcharts-opensource-src-5.9.5/examples/charts/scatterinteractions/chartview.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/scatterinteractions/chartview.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/scatterinteractions/chartview.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -54,8 +54,8 @@ chart()->addSeries(m_scatter2); chart()->addSeries(m_scatter); chart()->createDefaultAxes(); - chart()->axes(Qt::Horizontal).first()->setRange(0, 4.5); - chart()->axes(Qt::Vertical).first()->setRange(0, 4.5); + chart()->axisX()->setRange(0, 4.5); + chart()->axisY()->setRange(0, 4.5); connect(m_scatter, &QScatterSeries::clicked, this, &ChartView::handleClickedPoint); } diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/splinechart/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/splinechart/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/splinechart/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/splinechart/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -58,7 +58,7 @@ chart->addSeries(series); chart->setTitle("Simple spline chart example"); chart->createDefaultAxes(); - chart->axes(Qt::Vertical).first()->setRange(0, 10); + chart->axisY()->setRange(0, 10); //![3] //![4] diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/stackedbarchart/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/stackedbarchart/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/stackedbarchart/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/stackedbarchart/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -34,7 +34,6 @@ #include #include #include -#include QT_CHARTS_USE_NAMESPACE @@ -75,13 +74,10 @@ //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoryAxis *axisX = new QBarCategoryAxis(); - axisX->append(categories); - chart->addAxis(axisX, Qt::AlignBottom); - series->attachAxis(axisX); - QValueAxis *axisY = new QValueAxis(); - chart->addAxis(axisY, Qt::AlignLeft); - series->attachAxis(axisY); + QBarCategoryAxis *axis = new QBarCategoryAxis(); + axis->append(categories); + chart->createDefaultAxes(); + chart->setAxisX(axis, series); //![4] //![5] diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp qtcharts-opensource-src-5.9.5/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -29,18 +29,13 @@ #include "drilldownchart.h" #include -#include QT_CHARTS_USE_NAMESPACE DrilldownChart::DrilldownChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QChart(QChart::ChartTypeCartesian, parent, wFlags), - m_currentSeries(0), - m_axisX(new QBarCategoryAxis()), - m_axisY(new QValueAxis()) + m_currentSeries(0) { - addAxis(m_axisY, Qt::AlignLeft); - addAxis(m_axisX, Qt::AlignBottom); } void DrilldownChart::changeSeries(DrilldownBarSeries *series) @@ -51,11 +46,15 @@ m_currentSeries = series; // Reset axis - m_axisX->setCategories(m_currentSeries->categories()); + QBarCategoryAxis *axis = new QBarCategoryAxis(); + axis->append(m_currentSeries->categories()); + addSeries(series); - series->attachAxis(m_axisX); - series->attachAxis(m_axisY); - m_axisY->setRange(0,m_currentSeries->maxValue()); + + createDefaultAxes(); + setAxisX(axis, series); + axisY()->setTitleText("Crops"); + setTitle(series->name()); } diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/stackedbarchartdrilldown/drilldownchart.h qtcharts-opensource-src-5.9.5/examples/charts/stackedbarchartdrilldown/drilldownchart.h --- qtcharts-opensource-src-5.12.5/examples/charts/stackedbarchartdrilldown/drilldownchart.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/stackedbarchartdrilldown/drilldownchart.h 2018-03-19 05:05:55.000000000 +0000 @@ -33,11 +33,6 @@ #include #include "drilldownseries.h" -namespace QtCharts { -class QBarCategoryAxis; -class QValueAxis; -} - QT_CHARTS_USE_NAMESPACE //! [1] @@ -54,8 +49,6 @@ private: DrilldownBarSeries *m_currentSeries; - QBarCategoryAxis *m_axisX; - QValueAxis *m_axisY; }; //! [1] diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/stackedbarchartdrilldown/drilldownseries.cpp qtcharts-opensource-src-5.9.5/examples/charts/stackedbarchartdrilldown/drilldownseries.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/stackedbarchartdrilldown/drilldownseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/stackedbarchartdrilldown/drilldownseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -31,9 +31,8 @@ QT_CHARTS_USE_NAMESPACE -DrilldownBarSeries::DrilldownBarSeries(QStringList categories, int maxValue, QObject *parent) - : QStackedBarSeries(parent), - m_maxValue(maxValue) +DrilldownBarSeries::DrilldownBarSeries(QStringList categories, QObject *parent) + : QStackedBarSeries(parent) { m_categories = categories; } @@ -53,9 +52,4 @@ return m_categories; } -int DrilldownBarSeries::maxValue() -{ - return m_maxValue; -} - #include "moc_drilldownseries.cpp" diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/stackedbarchartdrilldown/drilldownseries.h qtcharts-opensource-src-5.9.5/examples/charts/stackedbarchartdrilldown/drilldownseries.h --- qtcharts-opensource-src-5.12.5/examples/charts/stackedbarchartdrilldown/drilldownseries.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/stackedbarchartdrilldown/drilldownseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,7 @@ { Q_OBJECT public: - DrilldownBarSeries(QStringList categories, int maxValue, QObject *parent = 0); + DrilldownBarSeries(QStringList categories, QObject *parent = 0); void mapDrilldownSeries(int index, DrilldownBarSeries *drilldownSeries); @@ -48,12 +48,9 @@ QStringList categories(); - int maxValue(); - private: QMap m_DrilldownSeries; QStringList m_categories; - int m_maxValue; }; //! [1] diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/stackedbarchartdrilldown/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/stackedbarchartdrilldown/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/stackedbarchartdrilldown/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/stackedbarchartdrilldown/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -29,7 +29,6 @@ #include #include -#include #include #include #include @@ -63,14 +62,14 @@ //! [3] // Create drilldown structure - DrilldownBarSeries *seasonSeries = new DrilldownBarSeries(months, 320, drilldownChart); + DrilldownBarSeries *seasonSeries = new DrilldownBarSeries(months, drilldownChart); seasonSeries->setName("Crop by month - Season"); // Each month in season series has drilldown series for weekly data for (int month = 0; month < months.count(); month++) { // Create drilldown series for every week - DrilldownBarSeries *weeklySeries = new DrilldownBarSeries(weeks, 80, drilldownChart); + DrilldownBarSeries *weeklySeries = new DrilldownBarSeries(weeks, drilldownChart); seasonSeries->mapDrilldownSeries(month, weeklySeries); // Drilling down from weekly data brings us back to season data. @@ -96,7 +95,7 @@ for (int month = 0; month < months.count(); month++) { QBarSet *weeklyCrop = new QBarSet(plant); for (int week = 0; week < weeks.count(); week++) - *weeklyCrop << QRandomGenerator::global()->bounded(20); + *weeklyCrop << (qrand() % 20); // Get the drilldown series from season series and add crop to it. seasonSeries->drilldownSeries(month)->append(weeklyCrop); *monthlyCrop << weeklyCrop->sum(); @@ -112,7 +111,7 @@ //! [5] //! [6] - drilldownChart->axes(Qt::Horizontal).first()->setGridLineVisible(false); + drilldownChart->axisX()->setGridLineVisible(false); drilldownChart->legend()->setVisible(true); drilldownChart->legend()->setAlignment(Qt::AlignBottom); //! [6] diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/temperaturerecords/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/temperaturerecords/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/temperaturerecords/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/temperaturerecords/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -35,7 +35,6 @@ #include #include #include -#include QT_CHARTS_USE_NAMESPACE @@ -71,16 +70,13 @@ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; - QBarCategoryAxis *axisX = new QBarCategoryAxis(); - axisX->append(categories); - axisX->setTitleText("Month"); - chart->addAxis(axisX, Qt::AlignBottom); - QValueAxis *axisY = new QValueAxis(); - axisY->setRange(-52, 52); - axisY->setTitleText("Temperature [°C]"); - chart->addAxis(axisY, Qt::AlignLeft); - series->attachAxis(axisX); - series->attachAxis(axisY); + QBarCategoryAxis *axis = new QBarCategoryAxis(); + axis->append(categories); + axis->setTitleText("Month"); + chart->createDefaultAxes(); + chart->setAxisX(axis, series); + chart->axisY(series)->setRange(-52, 52); + chart->axisY(series)->setTitleText("Temperature [°C]"); //![4] //![5] diff -Nru qtcharts-opensource-src-5.12.5/examples/charts/zoomlinechart/main.cpp qtcharts-opensource-src-5.9.5/examples/charts/zoomlinechart/main.cpp --- qtcharts-opensource-src-5.12.5/examples/charts/zoomlinechart/main.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/examples/charts/zoomlinechart/main.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -46,7 +45,7 @@ QLineSeries *series = new QLineSeries(); for (int i = 0; i < 500; i++) { QPointF p((qreal) i, qSin(M_PI / 50 * i) * 100); - p.ry() += QRandomGenerator::global()->bounded(20); + p.ry() += qrand() % 20; *series << p; } //![1] diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/abstractbarchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/abstractbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/abstractbarchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/abstractbarchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/abstractbarchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/abstractchartlayout_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/abstractchartlayout_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/abstractchartlayout_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/abstractchartlayout_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/layout/abstractchartlayout_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/abstractdomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/abstractdomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/abstractdomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/abstractdomain_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/domain/abstractdomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/areachartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/areachartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/areachartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/areachartitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/areachart/areachartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/axisanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/axisanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/axisanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/axisanimation_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/animations/axisanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/baranimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/baranimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/baranimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/baranimation_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/animations/baranimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/barchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/barchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/barchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/barchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/vertical/bar/barchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/bar_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/bar_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/bar_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/bar_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/bar_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/boxplotanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/boxplotanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/boxplotanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/boxplotanimation_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/animations/boxplotanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/boxplotchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/boxplotchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/boxplotchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/boxplotchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/boxplotchart/boxplotchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/boxwhiskersanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/boxwhiskersanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/boxwhiskersanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/boxwhiskersanimation_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/animations/boxwhiskersanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/boxwhiskersdata_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/boxwhiskersdata_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/boxwhiskersdata_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/boxwhiskersdata_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/boxplotchart/boxwhiskersdata_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/boxwhiskers_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/boxwhiskers_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/boxwhiskers_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/boxwhiskers_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/boxplotchart/boxwhiskers_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/candlestickanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/candlestickanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/candlestickanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/candlestickanimation_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/animations/candlestickanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/candlestickbodywicksanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/candlestickbodywicksanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/candlestickbodywicksanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/candlestickbodywicksanimation_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/animations/candlestickbodywicksanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/candlestickchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/candlestickchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/candlestickchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/candlestickchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/candlestickchart/candlestickchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/candlestickdata_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/candlestickdata_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/candlestickdata_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/candlestickdata_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/candlestickchart/candlestickdata_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/candlestick_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/candlestick_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/candlestick_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/candlestick_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/candlestickchart/candlestick_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/cartesianchartaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/cartesianchartaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/cartesianchartaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/cartesianchartaxis_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/cartesianchartaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/cartesianchartlayout_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/cartesianchartlayout_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/cartesianchartlayout_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/cartesianchartlayout_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/layout/cartesianchartlayout_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartanimation_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/animations/chartanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartaxiselement_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartaxiselement_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartaxiselement_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartaxiselement_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/chartaxiselement_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartbackground_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartbackground_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartbackground_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartbackground_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/chartbackground_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartbarcategoryaxisx_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartbarcategoryaxisx_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartbarcategoryaxisx_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartbarcategoryaxisx_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartbarcategoryaxisy_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartbarcategoryaxisy_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartbarcategoryaxisy_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartbarcategoryaxisy_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartcategoryaxisx_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartcategoryaxisx_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartcategoryaxisx_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartcategoryaxisx_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/categoryaxis/chartcategoryaxisx_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartcategoryaxisy_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartcategoryaxisy_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartcategoryaxisy_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartcategoryaxisy_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/categoryaxis/chartcategoryaxisy_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartconfig_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartconfig_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartconfig_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartconfig_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/chartconfig_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartdataset_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartdataset_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartdataset_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartdataset_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/chartdataset_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartdatetimeaxisx_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartdatetimeaxisx_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartdatetimeaxisx_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartdatetimeaxisx_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartdatetimeaxisy_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartdatetimeaxisy_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartdatetimeaxisy_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartdatetimeaxisy_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartelement_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartelement_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartelement_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartelement_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/chartelement_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/charthelpers_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/charthelpers_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/charthelpers_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/charthelpers_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/charthelpers_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/chartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartlogvalueaxisx_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartlogvalueaxisx_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartlogvalueaxisx_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartlogvalueaxisx_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartlogvalueaxisy_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartlogvalueaxisy_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartlogvalueaxisy_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartlogvalueaxisy_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartpresenter_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartpresenter_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartpresenter_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartpresenter_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/chartpresenter_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemebluecerulean_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemebluecerulean_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemebluecerulean_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemebluecerulean_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/themes/chartthemebluecerulean_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemeblueicy_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemeblueicy_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemeblueicy_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemeblueicy_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/themes/chartthemeblueicy_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemebluencs_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemebluencs_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemebluencs_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemebluencs_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/themes/chartthemebluencs_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemebrownsand_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemebrownsand_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemebrownsand_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemebrownsand_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/themes/chartthemebrownsand_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemedark_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemedark_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemedark_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemedark_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/themes/chartthemedark_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemehighcontrast_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemehighcontrast_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemehighcontrast_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemehighcontrast_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/themes/chartthemehighcontrast_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemelight_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemelight_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemelight_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemelight_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/themes/chartthemelight_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthememanager_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthememanager_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthememanager_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthememanager_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/chartthememanager_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/charttheme_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/charttheme_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/charttheme_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/charttheme_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/themes/charttheme_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemeqt_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemeqt_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemeqt_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemeqt_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/themes/chartthemeqt_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemesystem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemesystem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartthemesystem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartthemesystem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/themes/chartthemesystem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/charttitle_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/charttitle_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/charttitle_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/charttitle_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/charttitle_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartvalueaxisx_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartvalueaxisx_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartvalueaxisx_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartvalueaxisx_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/valueaxis/chartvalueaxisx_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartvalueaxisy_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartvalueaxisy_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/chartvalueaxisy_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/chartvalueaxisy_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/valueaxis/chartvalueaxisy_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativeabstractrendernode_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativeabstractrendernode_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativeabstractrendernode_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativeabstractrendernode_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativeabstractrendernode_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativeareaseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativeareaseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativeareaseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativeareaseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativeareaseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativeaxes_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativeaxes_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativeaxes_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativeaxes_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativeaxes_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativebarseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativebarseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativebarseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativebarseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativebarseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativeboxplotseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativeboxplotseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativeboxplotseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativeboxplotseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativeboxplotseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativecandlestickseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativecandlestickseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativecandlestickseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativecandlestickseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativecandlestickseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativecategoryaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativecategoryaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativecategoryaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativecategoryaxis_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativecategoryaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativechartglobal_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativechartglobal_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativechartglobal_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativechartglobal_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativechartglobal_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativechartnode_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativechartnode_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativechartnode_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativechartnode_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativechartnode_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativechart_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativechart_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativechart_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativechart_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativechart_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativelineseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativelineseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativelineseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativelineseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativelineseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativemargins_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativemargins_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativemargins_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativemargins_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativemargins_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativeopenglrendernode_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativeopenglrendernode_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativeopenglrendernode_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativeopenglrendernode_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativeopenglrendernode_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativepieseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativepieseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativepieseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativepieseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativepieseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativepolarchart_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativepolarchart_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativepolarchart_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativepolarchart_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativepolarchart_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativescatterseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativescatterseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativescatterseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativescatterseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativescatterseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativesplineseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativesplineseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativesplineseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativesplineseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativesplineseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativexypoint_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativexypoint_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativexypoint_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativexypoint_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativexypoint_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativexyseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativexyseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/declarativexyseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/declarativexyseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/chartsqml2/declarativexyseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/glwidget_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/glwidget_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/glwidget_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/glwidget_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/glwidget_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/glxyseriesdata_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/glxyseriesdata_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/glxyseriesdata_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/glxyseriesdata_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/xychart/glxyseriesdata_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/horizontalaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/horizontalaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/horizontalaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/horizontalaxis_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/horizontalaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/horizontalbarchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/horizontalbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/horizontalbarchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/horizontalbarchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/horizontalpercentbarchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/horizontalpercentbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/horizontalpercentbarchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/horizontalpercentbarchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/horizontalstackedbarchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/horizontalstackedbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/horizontalstackedbarchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/horizontalstackedbarchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/legendlayout_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/legendlayout_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/legendlayout_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/legendlayout_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/legend/legendlayout_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/legendmarkeritem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/legendmarkeritem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/legendmarkeritem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/legendmarkeritem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/legend/legendmarkeritem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/legendscroller_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/legendscroller_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/legendscroller_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/legendscroller_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/legend/legendscroller_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/linearrowitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/linearrowitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/linearrowitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/linearrowitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/linearrowitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/linechartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/linechartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/linechartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/linechartitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/linechart/linechartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/logxlogydomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/logxlogydomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/logxlogydomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/logxlogydomain_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/domain/logxlogydomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/logxlogypolardomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/logxlogypolardomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/logxlogypolardomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/logxlogypolardomain_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/domain/logxlogypolardomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/logxydomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/logxydomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/logxydomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/logxydomain_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/domain/logxydomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/logxypolardomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/logxypolardomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/logxypolardomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/logxypolardomain_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/domain/logxypolardomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/percentbarchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/percentbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/percentbarchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/percentbarchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/vertical/percent/percentbarchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/pieanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/pieanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/pieanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/pieanimation_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/animations/pieanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/piechartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/piechartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/piechartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/piechartitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/piechart/piechartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/piesliceanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/piesliceanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/piesliceanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/piesliceanimation_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/animations/piesliceanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/pieslicedata_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/pieslicedata_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/pieslicedata_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/pieslicedata_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/piechart/pieslicedata_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/piesliceitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/piesliceitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/piesliceitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/piesliceitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/piechart/piesliceitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartaxisangular_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartaxisangular_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartaxisangular_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartaxisangular_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/polarchartaxisangular_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartaxis_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/polarchartaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartaxisradial_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartaxisradial_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartaxisradial_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartaxisradial_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/polarchartaxisradial_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartcategoryaxisangular_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartcategoryaxisangular_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartcategoryaxisangular_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartcategoryaxisangular_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartcategoryaxisradial_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartcategoryaxisradial_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartcategoryaxisradial_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartcategoryaxisradial_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartdatetimeaxisangular_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartdatetimeaxisangular_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartdatetimeaxisangular_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartdatetimeaxisangular_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartdatetimeaxisradial_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartdatetimeaxisradial_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartdatetimeaxisradial_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartdatetimeaxisradial_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartlayout_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartlayout_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartlayout_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartlayout_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/layout/polarchartlayout_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartlogvalueaxisangular_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartlogvalueaxisangular_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartlogvalueaxisangular_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartlogvalueaxisangular_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartlogvalueaxisradial_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartlogvalueaxisradial_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartlogvalueaxisradial_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartlogvalueaxisradial_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartvalueaxisangular_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartvalueaxisangular_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartvalueaxisangular_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartvalueaxisangular_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartvalueaxisradial_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartvalueaxisradial_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polarchartvalueaxisradial_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polarchartvalueaxisradial_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polardomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polardomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/polardomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/polardomain_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/domain/polardomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qabstractaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qabstractaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qabstractaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qabstractaxis_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/qabstractaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qabstractbarseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qabstractbarseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qabstractbarseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qabstractbarseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/qabstractbarseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qabstractseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qabstractseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qabstractseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qabstractseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/qabstractseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qarealegendmarker_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qarealegendmarker_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qarealegendmarker_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qarealegendmarker_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/legend/qarealegendmarker_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qareaseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qareaseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qareaseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qareaseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/areachart/qareaseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qbarcategoryaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qbarcategoryaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qbarcategoryaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qbarcategoryaxis_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qbarlegendmarker_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qbarlegendmarker_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qbarlegendmarker_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qbarlegendmarker_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/legend/qbarlegendmarker_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qbarmodelmapper_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qbarmodelmapper_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qbarmodelmapper_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qbarmodelmapper_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/qbarmodelmapper_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qbarseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qbarseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qbarseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qbarseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/vertical/bar/qbarseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qbarset_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qbarset_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qbarset_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qbarset_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/qbarset_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qboxplotlegendmarker_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qboxplotlegendmarker_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qboxplotlegendmarker_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qboxplotlegendmarker_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/legend/qboxplotlegendmarker_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qboxplotmodelmapper_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qboxplotmodelmapper_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qboxplotmodelmapper_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qboxplotmodelmapper_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/boxplotchart/qboxplotmodelmapper_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qboxplotseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qboxplotseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qboxplotseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qboxplotseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/boxplotchart/qboxplotseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qboxset_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qboxset_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qboxset_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qboxset_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/boxplotchart/qboxset_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qcandlesticklegendmarker_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qcandlesticklegendmarker_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qcandlesticklegendmarker_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qcandlesticklegendmarker_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/legend/qcandlesticklegendmarker_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qcandlestickmodelmapper_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qcandlestickmodelmapper_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qcandlestickmodelmapper_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qcandlestickmodelmapper_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/candlestickchart/qcandlestickmodelmapper_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qcandlestickseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qcandlestickseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qcandlestickseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qcandlestickseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/candlestickchart/qcandlestickseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qcandlestickset_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qcandlestickset_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qcandlestickset_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qcandlestickset_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/candlestickchart/qcandlestickset_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qcategoryaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qcategoryaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qcategoryaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qcategoryaxis_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/categoryaxis/qcategoryaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qchartglobal_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qchartglobal_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qchartglobal_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qchartglobal_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/qchartglobal_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qchart_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qchart_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qchart_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qchart_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/qchart_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qchartview_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qchartview_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qchartview_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qchartview_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/qchartview_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qdatetimeaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qdatetimeaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qdatetimeaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qdatetimeaxis_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/datetimeaxis/qdatetimeaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qhorizontalbarseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qhorizontalbarseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qhorizontalbarseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qhorizontalbarseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qhorizontalpercentbarseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qhorizontalpercentbarseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qhorizontalpercentbarseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qhorizontalpercentbarseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qhorizontalstackedbarseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qhorizontalstackedbarseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qhorizontalstackedbarseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qhorizontalstackedbarseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qlegendmarker_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qlegendmarker_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qlegendmarker_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qlegendmarker_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/legend/qlegendmarker_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qlegend_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qlegend_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qlegend_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qlegend_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/legend/qlegend_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qlineseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qlineseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qlineseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qlineseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/linechart/qlineseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qlogvalueaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qlogvalueaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qlogvalueaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qlogvalueaxis_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/logvalueaxis/qlogvalueaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qpercentbarseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qpercentbarseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qpercentbarseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qpercentbarseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/vertical/percent/qpercentbarseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qpielegendmarker_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qpielegendmarker_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qpielegendmarker_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qpielegendmarker_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/legend/qpielegendmarker_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qpiemodelmapper_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qpiemodelmapper_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qpiemodelmapper_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qpiemodelmapper_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/piechart/qpiemodelmapper_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qpieseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qpieseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qpieseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qpieseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/piechart/qpieseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qpieslice_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qpieslice_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qpieslice_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qpieslice_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/piechart/qpieslice_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qscatterseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qscatterseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qscatterseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qscatterseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/scatterchart/qscatterseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qsplineseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qsplineseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qsplineseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qsplineseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/splinechart/qsplineseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qstackedbarseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qstackedbarseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qstackedbarseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qstackedbarseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/vertical/stacked/qstackedbarseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qvalueaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qvalueaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qvalueaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qvalueaxis_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/valueaxis/qvalueaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qxylegendmarker_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qxylegendmarker_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qxylegendmarker_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qxylegendmarker_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/legend/qxylegendmarker_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qxymodelmapper_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qxymodelmapper_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qxymodelmapper_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qxymodelmapper_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/xychart/qxymodelmapper_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qxyseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qxyseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/qxyseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/qxyseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/xychart/qxyseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/scatteranimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/scatteranimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/scatteranimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/scatteranimation_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/animations/scatteranimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/scatterchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/scatterchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/scatterchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/scatterchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/scatterchart/scatterchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/scroller_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/scroller_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/scroller_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/scroller_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/scroller_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/splineanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/splineanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/splineanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/splineanimation_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/animations/splineanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/splinechartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/splinechartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/splinechartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/splinechartitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/splinechart/splinechartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/stackedbarchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/stackedbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/stackedbarchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/stackedbarchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/verticalaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/verticalaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/verticalaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/verticalaxis_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/axis/verticalaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/xlogydomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/xlogydomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/xlogydomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/xlogydomain_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/domain/xlogydomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/xlogypolardomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/xlogypolardomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/xlogypolardomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/xlogypolardomain_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/domain/xlogypolardomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/xyanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/xyanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/xyanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/xyanimation_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/animations/xyanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/xychart_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/xychart_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/xychart_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/xychart_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/xychart/xychart_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/xydomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/xydomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/xydomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/xydomain_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/domain/xydomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/xypolardomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/xypolardomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.12.5/QtCharts/private/xypolardomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.12.5/QtCharts/private/xypolardomain_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/charts/domain/xypolardomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/abstractbarchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/abstractbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/abstractbarchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/abstractbarchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/abstractbarchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/abstractchartlayout_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/abstractchartlayout_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/abstractchartlayout_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/abstractchartlayout_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/layout/abstractchartlayout_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/abstractdomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/abstractdomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/abstractdomain_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/abstractdomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/domain/abstractdomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/areachartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/areachartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/areachartitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/areachartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/areachart/areachartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/axisanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/axisanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/axisanimation_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/axisanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/animations/axisanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/baranimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/baranimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/baranimation_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/baranimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/animations/baranimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/barchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/barchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/barchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/barchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/vertical/bar/barchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/bar_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/bar_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/bar_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/bar_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/bar_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/boxplotanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/boxplotanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/boxplotanimation_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/boxplotanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/animations/boxplotanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/boxplotchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/boxplotchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/boxplotchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/boxplotchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/boxplotchart/boxplotchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/boxwhiskersanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/boxwhiskersanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/boxwhiskersanimation_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/boxwhiskersanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/animations/boxwhiskersanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/boxwhiskersdata_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/boxwhiskersdata_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/boxwhiskersdata_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/boxwhiskersdata_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/boxplotchart/boxwhiskersdata_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/boxwhiskers_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/boxwhiskers_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/boxwhiskers_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/boxwhiskers_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/boxplotchart/boxwhiskers_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/candlestickanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/candlestickanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/candlestickanimation_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/candlestickanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/animations/candlestickanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/candlestickbodywicksanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/candlestickbodywicksanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/candlestickbodywicksanimation_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/candlestickbodywicksanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/animations/candlestickbodywicksanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/candlestickchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/candlestickchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/candlestickchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/candlestickchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/candlestickchart/candlestickchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/candlestickdata_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/candlestickdata_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/candlestickdata_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/candlestickdata_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/candlestickchart/candlestickdata_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/candlestick_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/candlestick_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/candlestick_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/candlestick_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/candlestickchart/candlestick_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/cartesianchartaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/cartesianchartaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/cartesianchartaxis_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/cartesianchartaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/cartesianchartaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/cartesianchartlayout_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/cartesianchartlayout_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/cartesianchartlayout_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/cartesianchartlayout_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/layout/cartesianchartlayout_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartanimation_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/animations/chartanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartaxiselement_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartaxiselement_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartaxiselement_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartaxiselement_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/chartaxiselement_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartbackground_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartbackground_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartbackground_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartbackground_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/chartbackground_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartbarcategoryaxisx_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartbarcategoryaxisx_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartbarcategoryaxisx_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartbarcategoryaxisx_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartbarcategoryaxisy_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartbarcategoryaxisy_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartbarcategoryaxisy_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartbarcategoryaxisy_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartcategoryaxisx_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartcategoryaxisx_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartcategoryaxisx_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartcategoryaxisx_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/categoryaxis/chartcategoryaxisx_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartcategoryaxisy_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartcategoryaxisy_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartcategoryaxisy_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartcategoryaxisy_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/categoryaxis/chartcategoryaxisy_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartconfig_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartconfig_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartconfig_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartconfig_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/chartconfig_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartdataset_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartdataset_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartdataset_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartdataset_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/chartdataset_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartdatetimeaxisx_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartdatetimeaxisx_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartdatetimeaxisx_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartdatetimeaxisx_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartdatetimeaxisy_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartdatetimeaxisy_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartdatetimeaxisy_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartdatetimeaxisy_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartelement_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartelement_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartelement_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartelement_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/chartelement_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/charthelpers_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/charthelpers_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/charthelpers_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/charthelpers_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/charthelpers_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/chartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartlogvalueaxisx_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartlogvalueaxisx_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartlogvalueaxisx_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartlogvalueaxisx_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartlogvalueaxisy_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartlogvalueaxisy_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartlogvalueaxisy_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartlogvalueaxisy_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartpresenter_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartpresenter_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartpresenter_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartpresenter_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/chartpresenter_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemebluecerulean_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemebluecerulean_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemebluecerulean_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemebluecerulean_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/themes/chartthemebluecerulean_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemeblueicy_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemeblueicy_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemeblueicy_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemeblueicy_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/themes/chartthemeblueicy_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemebluencs_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemebluencs_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemebluencs_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemebluencs_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/themes/chartthemebluencs_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemebrownsand_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemebrownsand_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemebrownsand_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemebrownsand_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/themes/chartthemebrownsand_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemedark_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemedark_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemedark_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemedark_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/themes/chartthemedark_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemehighcontrast_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemehighcontrast_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemehighcontrast_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemehighcontrast_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/themes/chartthemehighcontrast_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemelight_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemelight_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemelight_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemelight_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/themes/chartthemelight_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthememanager_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthememanager_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthememanager_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthememanager_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/chartthememanager_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/charttheme_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/charttheme_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/charttheme_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/charttheme_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/themes/charttheme_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemeqt_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemeqt_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemeqt_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemeqt_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/themes/chartthemeqt_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemesystem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemesystem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartthemesystem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartthemesystem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/themes/chartthemesystem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/charttitle_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/charttitle_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/charttitle_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/charttitle_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/charttitle_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartvalueaxisx_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartvalueaxisx_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartvalueaxisx_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartvalueaxisx_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/valueaxis/chartvalueaxisx_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartvalueaxisy_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartvalueaxisy_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/chartvalueaxisy_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/chartvalueaxisy_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/valueaxis/chartvalueaxisy_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/glwidget_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/glwidget_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/glwidget_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/glwidget_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/glwidget_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/glxyseriesdata_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/glxyseriesdata_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/glxyseriesdata_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/glxyseriesdata_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/xychart/glxyseriesdata_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/horizontalaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/horizontalaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/horizontalaxis_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/horizontalaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/horizontalaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/horizontalbarchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/horizontalbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/horizontalbarchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/horizontalbarchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/horizontalpercentbarchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/horizontalpercentbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/horizontalpercentbarchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/horizontalpercentbarchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/horizontalstackedbarchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/horizontalstackedbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/horizontalstackedbarchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/horizontalstackedbarchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/legendlayout_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/legendlayout_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/legendlayout_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/legendlayout_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/legend/legendlayout_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/legendmarkeritem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/legendmarkeritem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/legendmarkeritem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/legendmarkeritem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/legend/legendmarkeritem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/legendscroller_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/legendscroller_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/legendscroller_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/legendscroller_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/legend/legendscroller_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/linearrowitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/linearrowitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/linearrowitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/linearrowitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/linearrowitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/linechartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/linechartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/linechartitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/linechartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/linechart/linechartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/logxlogydomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/logxlogydomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/logxlogydomain_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/logxlogydomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/domain/logxlogydomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/logxlogypolardomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/logxlogypolardomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/logxlogypolardomain_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/logxlogypolardomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/domain/logxlogypolardomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/logxydomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/logxydomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/logxydomain_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/logxydomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/domain/logxydomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/logxypolardomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/logxypolardomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/logxypolardomain_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/logxypolardomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/domain/logxypolardomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/percentbarchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/percentbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/percentbarchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/percentbarchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/vertical/percent/percentbarchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/pieanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/pieanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/pieanimation_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/pieanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/animations/pieanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/piechartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/piechartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/piechartitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/piechartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/piechart/piechartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/piesliceanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/piesliceanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/piesliceanimation_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/piesliceanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/animations/piesliceanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/pieslicedata_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/pieslicedata_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/pieslicedata_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/pieslicedata_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/piechart/pieslicedata_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/piesliceitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/piesliceitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/piesliceitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/piesliceitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/piechart/piesliceitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartaxisangular_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartaxisangular_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartaxisangular_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartaxisangular_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/polarchartaxisangular_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartaxis_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/polarchartaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartaxisradial_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartaxisradial_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartaxisradial_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartaxisradial_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/polarchartaxisradial_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartcategoryaxisangular_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartcategoryaxisangular_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartcategoryaxisangular_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartcategoryaxisangular_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartcategoryaxisradial_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartcategoryaxisradial_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartcategoryaxisradial_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartcategoryaxisradial_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartdatetimeaxisangular_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartdatetimeaxisangular_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartdatetimeaxisangular_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartdatetimeaxisangular_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartdatetimeaxisradial_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartdatetimeaxisradial_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartdatetimeaxisradial_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartdatetimeaxisradial_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartlayout_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartlayout_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartlayout_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartlayout_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/layout/polarchartlayout_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartlogvalueaxisangular_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartlogvalueaxisangular_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartlogvalueaxisangular_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartlogvalueaxisangular_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartlogvalueaxisradial_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartlogvalueaxisradial_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartlogvalueaxisradial_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartlogvalueaxisradial_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartvalueaxisangular_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartvalueaxisangular_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartvalueaxisangular_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartvalueaxisangular_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartvalueaxisradial_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartvalueaxisradial_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polarchartvalueaxisradial_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polarchartvalueaxisradial_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polardomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polardomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/polardomain_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/polardomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/domain/polardomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qabstractaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qabstractaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qabstractaxis_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qabstractaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/qabstractaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qabstractbarseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qabstractbarseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qabstractbarseries_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qabstractbarseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/qabstractbarseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qabstractseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qabstractseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qabstractseries_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qabstractseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/qabstractseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qarealegendmarker_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qarealegendmarker_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qarealegendmarker_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qarealegendmarker_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/legend/qarealegendmarker_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qareaseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qareaseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qareaseries_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qareaseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/areachart/qareaseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qbarcategoryaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qbarcategoryaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qbarcategoryaxis_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qbarcategoryaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qbarlegendmarker_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qbarlegendmarker_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qbarlegendmarker_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qbarlegendmarker_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/legend/qbarlegendmarker_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qbarmodelmapper_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qbarmodelmapper_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qbarmodelmapper_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qbarmodelmapper_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/qbarmodelmapper_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qbarseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qbarseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qbarseries_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qbarseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/vertical/bar/qbarseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qbarset_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qbarset_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qbarset_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qbarset_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/qbarset_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qboxplotlegendmarker_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qboxplotlegendmarker_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qboxplotlegendmarker_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qboxplotlegendmarker_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/legend/qboxplotlegendmarker_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qboxplotmodelmapper_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qboxplotmodelmapper_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qboxplotmodelmapper_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qboxplotmodelmapper_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/boxplotchart/qboxplotmodelmapper_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qboxplotseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qboxplotseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qboxplotseries_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qboxplotseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/boxplotchart/qboxplotseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qboxset_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qboxset_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qboxset_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qboxset_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/boxplotchart/qboxset_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qcandlesticklegendmarker_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qcandlesticklegendmarker_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qcandlesticklegendmarker_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qcandlesticklegendmarker_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/legend/qcandlesticklegendmarker_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qcandlestickmodelmapper_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qcandlestickmodelmapper_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qcandlestickmodelmapper_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qcandlestickmodelmapper_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/candlestickchart/qcandlestickmodelmapper_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qcandlestickseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qcandlestickseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qcandlestickseries_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qcandlestickseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/candlestickchart/qcandlestickseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qcandlestickset_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qcandlestickset_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qcandlestickset_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qcandlestickset_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/candlestickchart/qcandlestickset_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qcategoryaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qcategoryaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qcategoryaxis_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qcategoryaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/categoryaxis/qcategoryaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qchart_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qchart_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qchart_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qchart_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/qchart_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qchartview_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qchartview_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qchartview_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qchartview_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/qchartview_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qdatetimeaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qdatetimeaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qdatetimeaxis_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qdatetimeaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/datetimeaxis/qdatetimeaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qhorizontalbarseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qhorizontalbarseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qhorizontalbarseries_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qhorizontalbarseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qhorizontalpercentbarseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qhorizontalpercentbarseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qhorizontalpercentbarseries_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qhorizontalpercentbarseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qhorizontalstackedbarseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qhorizontalstackedbarseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qhorizontalstackedbarseries_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qhorizontalstackedbarseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qlegendmarker_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qlegendmarker_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qlegendmarker_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qlegendmarker_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/legend/qlegendmarker_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qlegend_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qlegend_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qlegend_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qlegend_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/legend/qlegend_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qlineseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qlineseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qlineseries_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qlineseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/linechart/qlineseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qlogvalueaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qlogvalueaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qlogvalueaxis_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qlogvalueaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/logvalueaxis/qlogvalueaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qpercentbarseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qpercentbarseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qpercentbarseries_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qpercentbarseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/vertical/percent/qpercentbarseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qpielegendmarker_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qpielegendmarker_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qpielegendmarker_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qpielegendmarker_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/legend/qpielegendmarker_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qpiemodelmapper_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qpiemodelmapper_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qpiemodelmapper_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qpiemodelmapper_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/piechart/qpiemodelmapper_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qpieseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qpieseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qpieseries_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qpieseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/piechart/qpieseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qpieslice_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qpieslice_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qpieslice_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qpieslice_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/piechart/qpieslice_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qscatterseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qscatterseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qscatterseries_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qscatterseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/scatterchart/qscatterseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qsplineseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qsplineseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qsplineseries_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qsplineseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/splinechart/qsplineseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qstackedbarseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qstackedbarseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qstackedbarseries_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qstackedbarseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/vertical/stacked/qstackedbarseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qvalueaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qvalueaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qvalueaxis_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qvalueaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/valueaxis/qvalueaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qxylegendmarker_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qxylegendmarker_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qxylegendmarker_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qxylegendmarker_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/legend/qxylegendmarker_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qxymodelmapper_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qxymodelmapper_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qxymodelmapper_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qxymodelmapper_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/xychart/qxymodelmapper_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qxyseries_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qxyseries_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/qxyseries_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/qxyseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/xychart/qxyseries_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/scatteranimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/scatteranimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/scatteranimation_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/scatteranimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/animations/scatteranimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/scatterchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/scatterchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/scatterchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/scatterchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/scatterchart/scatterchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/scroller_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/scroller_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/scroller_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/scroller_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/scroller_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/splineanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/splineanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/splineanimation_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/splineanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/animations/splineanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/splinechartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/splinechartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/splinechartitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/splinechartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/splinechart/splinechartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/stackedbarchartitem_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/stackedbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/stackedbarchartitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/stackedbarchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/verticalaxis_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/verticalaxis_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/verticalaxis_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/verticalaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/axis/verticalaxis_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/xlogydomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/xlogydomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/xlogydomain_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/xlogydomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/domain/xlogydomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/xlogypolardomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/xlogypolardomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/xlogypolardomain_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/xlogypolardomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/domain/xlogypolardomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/xyanimation_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/xyanimation_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/xyanimation_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/xyanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/animations/xyanimation_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/xychart_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/xychart_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/xychart_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/xychart_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/xychart/xychart_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/xydomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/xydomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/xydomain_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/xydomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/domain/xydomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/xypolardomain_p.h qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/xypolardomain_p.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/5.9.5/QtCharts/private/xypolardomain_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/5.9.5/QtCharts/private/xypolardomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/charts/domain/xypolardomain_p.h" diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/headers.pri qtcharts-opensource-src-5.9.5/include/QtCharts/headers.pri --- qtcharts-opensource-src-5.12.5/include/QtCharts/headers.pri 2019-09-06 12:05:48.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/headers.pri 2018-04-11 07:49:16.000000000 +0000 @@ -1,6 +1,7 @@ -SYNCQT.HEADER_FILES = chartsnamespace.h qabstractseries.h qchart.h qchartglobal.h qchartview.h qpolarchart.h areachart/qareaseries.h axis/qabstractaxis.h barchart/qabstractbarseries.h barchart/qbarmodelmapper.h barchart/qbarset.h barchart/qhbarmodelmapper.h barchart/qvbarmodelmapper.h boxplotchart/qboxplotmodelmapper.h boxplotchart/qboxplotseries.h boxplotchart/qboxset.h boxplotchart/qhboxplotmodelmapper.h boxplotchart/qvboxplotmodelmapper.h candlestickchart/qcandlestickmodelmapper.h candlestickchart/qcandlestickseries.h candlestickchart/qcandlestickset.h candlestickchart/qhcandlestickmodelmapper.h candlestickchart/qvcandlestickmodelmapper.h legend/qarealegendmarker.h legend/qbarlegendmarker.h legend/qboxplotlegendmarker.h legend/qcandlesticklegendmarker.h legend/qlegend.h legend/qlegendmarker.h legend/qpielegendmarker.h legend/qxylegendmarker.h linechart/qlineseries.h piechart/qhpiemodelmapper.h piechart/qpiemodelmapper.h piechart/qpieseries.h piechart/qpieslice.h piechart/qvpiemodelmapper.h scatterchart/qscatterseries.h splinechart/qsplineseries.h xychart/qhxymodelmapper.h xychart/qvxymodelmapper.h xychart/qxymodelmapper.h xychart/qxyseries.h axis/barcategoryaxis/qbarcategoryaxis.h axis/categoryaxis/qcategoryaxis.h axis/datetimeaxis/qdatetimeaxis.h axis/logvalueaxis/qlogvalueaxis.h axis/valueaxis/qvalueaxis.h barchart/horizontal/bar/qhorizontalbarseries.h barchart/horizontal/percent/qhorizontalpercentbarseries.h barchart/horizontal/stacked/qhorizontalstackedbarseries.h barchart/vertical/bar/qbarseries.h barchart/vertical/percent/qpercentbarseries.h barchart/vertical/stacked/qstackedbarseries.h -SYNCQT.GENERATED_HEADER_FILES = QAbstractSeries QChart QChartGlobal QChartView QPolarChart QAreaSeries QAbstractAxis QAbstractBarSeries QBarModelMapper QBarSet QHBarModelMapper QVBarModelMapper QBoxPlotModelMapper QBoxPlotSeries QBoxSet QHBoxPlotModelMapper QVBoxPlotModelMapper QCandlestickModelMapper QCandlestickSeries QCandlestickSet QHCandlestickModelMapper QVCandlestickModelMapper QAreaLegendMarker QBarLegendMarker QBoxPlotLegendMarker QCandlestickLegendMarker QLegend QLegendMarker QPieLegendMarker QXYLegendMarker QLineSeries QHPieModelMapper QPieModelMapper QPieSeries QPieSlice QVPieModelMapper QScatterSeries QSplineSeries QHXYModelMapper QVXYModelMapper QXYModelMapper QXYSeries QBarCategoryAxis QCategoryAxis QDateTimeAxis QLogValueAxis QValueAxis QHorizontalBarSeries QHorizontalPercentBarSeries QHorizontalStackedBarSeries QBarSeries QPercentBarSeries QStackedBarSeries qtchartsversion.h QtChartsVersion QtCharts -SYNCQT.PRIVATE_HEADER_FILES = chartbackground_p.h chartconfig_p.h chartdataset_p.h chartelement_p.h charthelpers_p.h chartitem_p.h chartpresenter_p.h chartthememanager_p.h charttitle_p.h glwidget_p.h qabstractseries_p.h qchart_p.h qchartglobal_p.h qchartview_p.h scroller_p.h animations/axisanimation_p.h animations/baranimation_p.h animations/boxplotanimation_p.h animations/boxwhiskersanimation_p.h animations/candlestickanimation_p.h animations/candlestickbodywicksanimation_p.h animations/chartanimation_p.h animations/pieanimation_p.h animations/piesliceanimation_p.h animations/scatteranimation_p.h animations/splineanimation_p.h animations/xyanimation_p.h areachart/areachartitem_p.h areachart/qareaseries_p.h axis/cartesianchartaxis_p.h axis/chartaxiselement_p.h axis/horizontalaxis_p.h axis/linearrowitem_p.h axis/polarchartaxis_p.h axis/polarchartaxisangular_p.h axis/polarchartaxisradial_p.h axis/qabstractaxis_p.h axis/verticalaxis_p.h barchart/abstractbarchartitem_p.h barchart/bar_p.h barchart/qabstractbarseries_p.h barchart/qbarmodelmapper_p.h barchart/qbarset_p.h boxplotchart/boxplotchartitem_p.h boxplotchart/boxwhiskers_p.h boxplotchart/boxwhiskersdata_p.h boxplotchart/qboxplotmodelmapper_p.h boxplotchart/qboxplotseries_p.h boxplotchart/qboxset_p.h candlestickchart/candlestick_p.h candlestickchart/candlestickchartitem_p.h candlestickchart/candlestickdata_p.h candlestickchart/qcandlestickmodelmapper_p.h candlestickchart/qcandlestickseries_p.h candlestickchart/qcandlestickset_p.h domain/abstractdomain_p.h domain/logxlogydomain_p.h domain/logxlogypolardomain_p.h domain/logxydomain_p.h domain/logxypolardomain_p.h domain/polardomain_p.h domain/xlogydomain_p.h domain/xlogypolardomain_p.h domain/xydomain_p.h domain/xypolardomain_p.h layout/abstractchartlayout_p.h layout/cartesianchartlayout_p.h layout/polarchartlayout_p.h legend/legendlayout_p.h legend/legendmarkeritem_p.h legend/legendscroller_p.h legend/qarealegendmarker_p.h legend/qbarlegendmarker_p.h legend/qboxplotlegendmarker_p.h legend/qcandlesticklegendmarker_p.h legend/qlegend_p.h legend/qlegendmarker_p.h legend/qpielegendmarker_p.h legend/qxylegendmarker_p.h linechart/linechartitem_p.h linechart/qlineseries_p.h piechart/piechartitem_p.h piechart/pieslicedata_p.h piechart/piesliceitem_p.h piechart/qpiemodelmapper_p.h piechart/qpieseries_p.h piechart/qpieslice_p.h scatterchart/qscatterseries_p.h scatterchart/scatterchartitem_p.h splinechart/qsplineseries_p.h splinechart/splinechartitem_p.h themes/charttheme_p.h themes/chartthemebluecerulean_p.h themes/chartthemeblueicy_p.h themes/chartthemebluencs_p.h themes/chartthemebrownsand_p.h themes/chartthemedark_p.h themes/chartthemehighcontrast_p.h themes/chartthemelight_p.h themes/chartthemeqt_p.h themes/chartthemesystem_p.h xychart/glxyseriesdata_p.h xychart/qxymodelmapper_p.h xychart/qxyseries_p.h xychart/xychart_p.h axis/barcategoryaxis/chartbarcategoryaxisx_p.h axis/barcategoryaxis/chartbarcategoryaxisy_p.h axis/barcategoryaxis/qbarcategoryaxis_p.h axis/categoryaxis/chartcategoryaxisx_p.h axis/categoryaxis/chartcategoryaxisy_p.h axis/categoryaxis/polarchartcategoryaxisangular_p.h axis/categoryaxis/polarchartcategoryaxisradial_p.h axis/categoryaxis/qcategoryaxis_p.h axis/datetimeaxis/chartdatetimeaxisx_p.h axis/datetimeaxis/chartdatetimeaxisy_p.h axis/datetimeaxis/polarchartdatetimeaxisangular_p.h axis/datetimeaxis/polarchartdatetimeaxisradial_p.h axis/datetimeaxis/qdatetimeaxis_p.h axis/logvalueaxis/chartlogvalueaxisx_p.h axis/logvalueaxis/chartlogvalueaxisy_p.h axis/logvalueaxis/polarchartlogvalueaxisangular_p.h axis/logvalueaxis/polarchartlogvalueaxisradial_p.h axis/logvalueaxis/qlogvalueaxis_p.h axis/valueaxis/chartvalueaxisx_p.h axis/valueaxis/chartvalueaxisy_p.h axis/valueaxis/polarchartvalueaxisangular_p.h axis/valueaxis/polarchartvalueaxisradial_p.h axis/valueaxis/qvalueaxis_p.h barchart/horizontal/bar/horizontalbarchartitem_p.h barchart/horizontal/bar/qhorizontalbarseries_p.h barchart/horizontal/percent/horizontalpercentbarchartitem_p.h barchart/horizontal/percent/qhorizontalpercentbarseries_p.h barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h barchart/vertical/bar/barchartitem_p.h barchart/vertical/bar/qbarseries_p.h barchart/vertical/percent/percentbarchartitem_p.h barchart/vertical/percent/qpercentbarseries_p.h barchart/vertical/stacked/qstackedbarseries_p.h barchart/vertical/stacked/stackedbarchartitem_p.h ../chartsqml2/declarativeabstractrendernode_p.h ../chartsqml2/declarativeareaseries_p.h ../chartsqml2/declarativeaxes_p.h ../chartsqml2/declarativebarseries_p.h ../chartsqml2/declarativeboxplotseries_p.h ../chartsqml2/declarativecandlestickseries_p.h ../chartsqml2/declarativecategoryaxis_p.h ../chartsqml2/declarativechart_p.h ../chartsqml2/declarativechartglobal_p.h ../chartsqml2/declarativechartnode_p.h ../chartsqml2/declarativelineseries_p.h ../chartsqml2/declarativemargins_p.h ../chartsqml2/declarativeopenglrendernode_p.h ../chartsqml2/declarativepieseries_p.h ../chartsqml2/declarativepolarchart_p.h ../chartsqml2/declarativescatterseries_p.h ../chartsqml2/declarativesplineseries_p.h ../chartsqml2/declarativexypoint_p.h ../chartsqml2/declarativexyseries_p.h +SYNCQT.HEADER_FILES = chartsnamespace.h qabstractseries.h qchart.h qchartglobal.h qchartview.h qpolarchart.h areachart/qareaseries.h axis/qabstractaxis.h barchart/qabstractbarseries.h barchart/qbarmodelmapper.h barchart/qbarset.h barchart/qhbarmodelmapper.h barchart/qvbarmodelmapper.h boxplotchart/qboxplotmodelmapper.h boxplotchart/qboxplotseries.h boxplotchart/qboxset.h boxplotchart/qhboxplotmodelmapper.h boxplotchart/qvboxplotmodelmapper.h candlestickchart/qcandlestickmodelmapper.h candlestickchart/qcandlestickseries.h candlestickchart/qcandlestickset.h candlestickchart/qhcandlestickmodelmapper.h candlestickchart/qvcandlestickmodelmapper.h legend/qarealegendmarker.h legend/qbarlegendmarker.h legend/qboxplotlegendmarker.h legend/qcandlesticklegendmarker.h legend/qlegend.h legend/qlegendmarker.h legend/qpielegendmarker.h legend/qxylegendmarker.h linechart/qlineseries.h piechart/qhpiemodelmapper.h piechart/qpiemodelmapper.h piechart/qpieseries.h piechart/qpieslice.h piechart/qvpiemodelmapper.h scatterchart/qscatterseries.h splinechart/qsplineseries.h xychart/qhxymodelmapper.h xychart/qvxymodelmapper.h xychart/qxymodelmapper.h xychart/qxyseries.h axis/barcategoryaxis/qbarcategoryaxis.h axis/categoryaxis/qcategoryaxis.h axis/datetimeaxis/qdatetimeaxis.h axis/logvalueaxis/qlogvalueaxis.h axis/valueaxis/qvalueaxis.h barchart/horizontal/bar/qhorizontalbarseries.h barchart/horizontal/percent/qhorizontalpercentbarseries.h barchart/horizontal/stacked/qhorizontalstackedbarseries.h barchart/vertical/bar/qbarseries.h barchart/vertical/percent/qpercentbarseries.h barchart/vertical/stacked/qstackedbarseries.h ../../include/QtCharts/qtchartsversion.h ../../include/QtCharts/QtCharts +SYNCQT.HEADER_CLASSES = ../../include/QtCharts/QAbstractSeries ../../include/QtCharts/QChart ../../include/QtCharts/QChartGlobal ../../include/QtCharts/QChartView ../../include/QtCharts/QPolarChart ../../include/QtCharts/QAreaSeries ../../include/QtCharts/QAbstractAxis ../../include/QtCharts/QAbstractBarSeries ../../include/QtCharts/QBarModelMapper ../../include/QtCharts/QBarSet ../../include/QtCharts/QHBarModelMapper ../../include/QtCharts/QVBarModelMapper ../../include/QtCharts/QBoxPlotModelMapper ../../include/QtCharts/QBoxPlotSeries ../../include/QtCharts/QBoxSet ../../include/QtCharts/QHBoxPlotModelMapper ../../include/QtCharts/QVBoxPlotModelMapper ../../include/QtCharts/QCandlestickModelMapper ../../include/QtCharts/QCandlestickSeries ../../include/QtCharts/QCandlestickSet ../../include/QtCharts/QHCandlestickModelMapper ../../include/QtCharts/QVCandlestickModelMapper ../../include/QtCharts/QAreaLegendMarker ../../include/QtCharts/QBarLegendMarker ../../include/QtCharts/QBoxPlotLegendMarker ../../include/QtCharts/QCandlestickLegendMarker ../../include/QtCharts/QLegend ../../include/QtCharts/QLegendMarker ../../include/QtCharts/QPieLegendMarker ../../include/QtCharts/QXYLegendMarker ../../include/QtCharts/QLineSeries ../../include/QtCharts/QHPieModelMapper ../../include/QtCharts/QPieModelMapper ../../include/QtCharts/QPieSeries ../../include/QtCharts/QPieSlice ../../include/QtCharts/QVPieModelMapper ../../include/QtCharts/QScatterSeries ../../include/QtCharts/QSplineSeries ../../include/QtCharts/QHXYModelMapper ../../include/QtCharts/QVXYModelMapper ../../include/QtCharts/QXYModelMapper ../../include/QtCharts/QXYSeries ../../include/QtCharts/QBarCategoryAxis ../../include/QtCharts/QCategoryAxis ../../include/QtCharts/QDateTimeAxis ../../include/QtCharts/QLogValueAxis ../../include/QtCharts/QValueAxis ../../include/QtCharts/QHorizontalBarSeries ../../include/QtCharts/QHorizontalPercentBarSeries ../../include/QtCharts/QHorizontalStackedBarSeries ../../include/QtCharts/QBarSeries ../../include/QtCharts/QPercentBarSeries ../../include/QtCharts/QStackedBarSeries ../../include/QtCharts/QtChartsVersion +SYNCQT.PRIVATE_HEADER_FILES = chartbackground_p.h chartconfig_p.h chartdataset_p.h chartelement_p.h charthelpers_p.h chartitem_p.h chartpresenter_p.h chartthememanager_p.h charttitle_p.h glwidget_p.h qabstractseries_p.h qchart_p.h qchartview_p.h scroller_p.h animations/axisanimation_p.h animations/baranimation_p.h animations/boxplotanimation_p.h animations/boxwhiskersanimation_p.h animations/candlestickanimation_p.h animations/candlestickbodywicksanimation_p.h animations/chartanimation_p.h animations/pieanimation_p.h animations/piesliceanimation_p.h animations/scatteranimation_p.h animations/splineanimation_p.h animations/xyanimation_p.h areachart/areachartitem_p.h areachart/qareaseries_p.h axis/cartesianchartaxis_p.h axis/chartaxiselement_p.h axis/horizontalaxis_p.h axis/linearrowitem_p.h axis/polarchartaxis_p.h axis/polarchartaxisangular_p.h axis/polarchartaxisradial_p.h axis/qabstractaxis_p.h axis/verticalaxis_p.h barchart/abstractbarchartitem_p.h barchart/bar_p.h barchart/qabstractbarseries_p.h barchart/qbarmodelmapper_p.h barchart/qbarset_p.h boxplotchart/boxplotchartitem_p.h boxplotchart/boxwhiskers_p.h boxplotchart/boxwhiskersdata_p.h boxplotchart/qboxplotmodelmapper_p.h boxplotchart/qboxplotseries_p.h boxplotchart/qboxset_p.h candlestickchart/candlestick_p.h candlestickchart/candlestickchartitem_p.h candlestickchart/candlestickdata_p.h candlestickchart/qcandlestickmodelmapper_p.h candlestickchart/qcandlestickseries_p.h candlestickchart/qcandlestickset_p.h domain/abstractdomain_p.h domain/logxlogydomain_p.h domain/logxlogypolardomain_p.h domain/logxydomain_p.h domain/logxypolardomain_p.h domain/polardomain_p.h domain/xlogydomain_p.h domain/xlogypolardomain_p.h domain/xydomain_p.h domain/xypolardomain_p.h layout/abstractchartlayout_p.h layout/cartesianchartlayout_p.h layout/polarchartlayout_p.h legend/legendlayout_p.h legend/legendmarkeritem_p.h legend/legendscroller_p.h legend/qarealegendmarker_p.h legend/qbarlegendmarker_p.h legend/qboxplotlegendmarker_p.h legend/qcandlesticklegendmarker_p.h legend/qlegend_p.h legend/qlegendmarker_p.h legend/qpielegendmarker_p.h legend/qxylegendmarker_p.h linechart/linechartitem_p.h linechart/qlineseries_p.h piechart/piechartitem_p.h piechart/pieslicedata_p.h piechart/piesliceitem_p.h piechart/qpiemodelmapper_p.h piechart/qpieseries_p.h piechart/qpieslice_p.h scatterchart/qscatterseries_p.h scatterchart/scatterchartitem_p.h splinechart/qsplineseries_p.h splinechart/splinechartitem_p.h themes/charttheme_p.h themes/chartthemebluecerulean_p.h themes/chartthemeblueicy_p.h themes/chartthemebluencs_p.h themes/chartthemebrownsand_p.h themes/chartthemedark_p.h themes/chartthemehighcontrast_p.h themes/chartthemelight_p.h themes/chartthemeqt_p.h themes/chartthemesystem_p.h xychart/glxyseriesdata_p.h xychart/qxymodelmapper_p.h xychart/qxyseries_p.h xychart/xychart_p.h axis/barcategoryaxis/chartbarcategoryaxisx_p.h axis/barcategoryaxis/chartbarcategoryaxisy_p.h axis/barcategoryaxis/qbarcategoryaxis_p.h axis/categoryaxis/chartcategoryaxisx_p.h axis/categoryaxis/chartcategoryaxisy_p.h axis/categoryaxis/polarchartcategoryaxisangular_p.h axis/categoryaxis/polarchartcategoryaxisradial_p.h axis/categoryaxis/qcategoryaxis_p.h axis/datetimeaxis/chartdatetimeaxisx_p.h axis/datetimeaxis/chartdatetimeaxisy_p.h axis/datetimeaxis/polarchartdatetimeaxisangular_p.h axis/datetimeaxis/polarchartdatetimeaxisradial_p.h axis/datetimeaxis/qdatetimeaxis_p.h axis/logvalueaxis/chartlogvalueaxisx_p.h axis/logvalueaxis/chartlogvalueaxisy_p.h axis/logvalueaxis/polarchartlogvalueaxisangular_p.h axis/logvalueaxis/polarchartlogvalueaxisradial_p.h axis/logvalueaxis/qlogvalueaxis_p.h axis/valueaxis/chartvalueaxisx_p.h axis/valueaxis/chartvalueaxisy_p.h axis/valueaxis/polarchartvalueaxisangular_p.h axis/valueaxis/polarchartvalueaxisradial_p.h axis/valueaxis/qvalueaxis_p.h barchart/horizontal/bar/horizontalbarchartitem_p.h barchart/horizontal/bar/qhorizontalbarseries_p.h barchart/horizontal/percent/horizontalpercentbarchartitem_p.h barchart/horizontal/percent/qhorizontalpercentbarseries_p.h barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h barchart/vertical/bar/barchartitem_p.h barchart/vertical/bar/qbarseries_p.h barchart/vertical/percent/percentbarchartitem_p.h barchart/vertical/percent/qpercentbarseries_p.h barchart/vertical/stacked/qstackedbarseries_p.h barchart/vertical/stacked/stackedbarchartitem_p.h +SYNCQT.INJECTED_PRIVATE_HEADER_FILES = SYNCQT.QPA_HEADER_FILES = SYNCQT.CLEAN_HEADER_FILES = chartsnamespace.h qabstractseries.h qchart.h qchartglobal.h qchartview.h qpolarchart.h areachart/qareaseries.h axis/qabstractaxis.h barchart/qabstractbarseries.h barchart/qbarmodelmapper.h barchart/qbarset.h barchart/qhbarmodelmapper.h barchart/qvbarmodelmapper.h boxplotchart/qboxplotmodelmapper.h boxplotchart/qboxplotseries.h boxplotchart/qboxset.h boxplotchart/qhboxplotmodelmapper.h boxplotchart/qvboxplotmodelmapper.h candlestickchart/qcandlestickmodelmapper.h candlestickchart/qcandlestickseries.h candlestickchart/qcandlestickset.h candlestickchart/qhcandlestickmodelmapper.h candlestickchart/qvcandlestickmodelmapper.h legend/qarealegendmarker.h legend/qbarlegendmarker.h legend/qboxplotlegendmarker.h legend/qcandlesticklegendmarker.h legend/qlegend.h legend/qlegendmarker.h legend/qpielegendmarker.h legend/qxylegendmarker.h linechart/qlineseries.h piechart/qhpiemodelmapper.h piechart/qpiemodelmapper.h piechart/qpieseries.h piechart/qpieslice.h piechart/qvpiemodelmapper.h scatterchart/qscatterseries.h splinechart/qsplineseries.h xychart/qhxymodelmapper.h xychart/qvxymodelmapper.h xychart/qxymodelmapper.h xychart/qxyseries.h axis/barcategoryaxis/qbarcategoryaxis.h axis/categoryaxis/qcategoryaxis.h axis/datetimeaxis/qdatetimeaxis.h axis/logvalueaxis/qlogvalueaxis.h axis/valueaxis/qvalueaxis.h barchart/horizontal/bar/qhorizontalbarseries.h barchart/horizontal/percent/qhorizontalpercentbarseries.h barchart/horizontal/stacked/qhorizontalstackedbarseries.h barchart/vertical/bar/qbarseries.h barchart/vertical/percent/qpercentbarseries.h barchart/vertical/stacked/qstackedbarseries.h SYNCQT.INJECTIONS = diff -Nru qtcharts-opensource-src-5.12.5/include/QtCharts/qtchartsversion.h qtcharts-opensource-src-5.9.5/include/QtCharts/qtchartsversion.h --- qtcharts-opensource-src-5.12.5/include/QtCharts/qtchartsversion.h 2019-09-06 12:05:48.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/include/QtCharts/qtchartsversion.h 2018-04-11 07:49:16.000000000 +0000 @@ -2,8 +2,8 @@ #ifndef QT_QTCHARTS_VERSION_H #define QT_QTCHARTS_VERSION_H -#define QTCHARTS_VERSION_STR "5.12.5" +#define QTCHARTS_VERSION_STR "5.9.5" -#define QTCHARTS_VERSION 0x050C05 +#define QTCHARTS_VERSION 0x050905 #endif // QT_QTCHARTS_VERSION_H diff -Nru qtcharts-opensource-src-5.12.5/.qmake.conf qtcharts-opensource-src-5.9.5/.qmake.conf --- qtcharts-opensource-src-5.12.5/.qmake.conf 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/.qmake.conf 2018-03-19 05:05:55.000000000 +0000 @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.12.5 +MODULE_VERSION = 5.9.5 diff -Nru qtcharts-opensource-src-5.12.5/.QT-ENTERPRISE-LICENSE-AGREEMENT qtcharts-opensource-src-5.9.5/.QT-ENTERPRISE-LICENSE-AGREEMENT --- qtcharts-opensource-src-5.12.5/.QT-ENTERPRISE-LICENSE-AGREEMENT 2019-09-06 12:05:48.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/.QT-ENTERPRISE-LICENSE-AGREEMENT 1970-01-01 00:00:00.000000000 +0000 @@ -1,1089 +0,0 @@ -QT LICENSE AGREEMENT -Agreement version 4.1 -This License Agreement (“Agreement”) is a legal agreement between The Qt Company -(as defined below) and the Licensee (as defined below) for the license of -Licensed Software (as defined below). Capitalized terms used herein are defined -in Section 1. -WHEREAS: - -(A) Licensee wishes to use the Licensed Software for the purpose of developing - and distributing Applications and/or Devices; and -(B) The Qt Company is willing to grant the Licensee a right to use Licensed - Software for such purpose pursuant to term and conditions of this Agreement. - -NOW, THEREFORE, THE PARTIES HEREBY AGREE AS FOLLOWS: - -1. DEFINITIONS -“Affiliate” of a Party shall mean an entity (i) which is directly or indirectly -controlling such Party; (ii) which is under the same direct or indirect -ownership or control as such Party; or (iii) which is directly or indirectly -owned or controlled by such Party. For these purposes, an entity shall be -treated as being controlled by another if that other entity has fifty percent -(50 %) or more of the votes in such entity, is able to direct its affairs and/or -to control the composition of its board of directors or equivalent body. - -“Add-on Products” shall mean The Qt Company’s specific add-on software products -(for example Qt Safe Renderer, Qt for Automation, Qt Application Manager), which -are not licensed as part of The Qt Company’s standard offering, but shall be -included into the scope of Licensed Software only if so specifically agreed -between the Parties. - -“Applications” shall mean Licensee's software products created using the -Licensed Software, which may include the Redistributables, or part thereof. - -“Contractor(s)” shall mean third party consultants, distributors and contractors -performing services to a Party under applicable contractual arrangement. - -“Customer(s)” shall mean Licensee’s end users to whom Licensee, directly or -indirectly, distributes copies of the Redistributables. - -“Deployment Platforms” shall mean operating systems specified in the License -Certificate, in which the Redistributables can be distributed pursuant to the -terms and conditions of this Agreement. - -“Designated User(s)” shall mean the employee(s) of Licensee or Licensee’s -Affiliates acting within the scope of their employment or Licensee's Contractors -acting within the scope of their services for Licensee and on behalf of -Licensee. Designated Users shall be named in the License Certificate. - -“Development License” shall mean the license needed by the Licensee for each -Designated User to use the Licensed Software under the license grant described -in Section 3.1 of this Agreement. Development Licenses are available separately -for Qt for Application Development (desktop) and Qt for Device Creation -(embedded) products, each product having its designated scope and purpose of -use. Distribution Licenses are always connected to Qt for Device Creation -product only. - -“Development Platforms” shall mean those operating systems specified in the -License Certificate, in which the Licensed Software can be used under the -Development License, but not distributed in any form or used for any other -purpose. - -“Devices” shall mean hardware devices or products that 1) are manufactured -and/or distributed by the Licensee or its Affiliates or Contractors, and 2) -(i) incorporate or integrate the Redistributables or parts thereof; or (ii) do -not incorporate or integrate the Redistributables at the time of distribution, -but where, when used by a Customer, the main user interface or substantial -functionality of such device is provided by Application(s) or otherwise depends -on the Licensed Software. Devices shall be specified in Appendix 2 or in a -quote. - -“Distribution License(s)” shall mean the license required for distribution of -Redistributables in connection with Devices pursuant to license grant described -in Section 3.3 of this Agreement. - -“Distribution License Packs” shall mean set of prepaid Distribution Licenses for -distribution of Redistributables, as defined in The Qt Company’s standard price -list, quote, Purchase Order confirmation or in an appendix hereto, as the case -may be. - -“Intellectual Property Rights” shall mean patents (including utility models), -design patents, and designs (whether or not capable of registration), chip -topography rights and other like protection, copyrights, trademarks, service -marks, trade names, logos or other words or symbols and any other form of -statutory protection of any kind and applications for any of the foregoing as -well as any trade secrets. - -“License Certificate” shall mean a certificate generated by The Qt Company for -each Designated User respectively upon them downloading the Licensed Software. -License Certificate will be available under respective Designated User’s Qt -Account at account.qt.io and it will specify the Designated User, the -Development Platforms, Deployment Platforms and the License Term. The terms of -the License Certificate are considered part of this Agreement and shall be -updated from time to time to reflect any agreed changes to the foregoing terms -relating to Designated User’s rights to the Licensed Software. - -“License Fee” shall mean the fee charged to the Licensee for rights granted -under the terms of this Agreement. - -“License Term” shall mean the agreed validity period of the Development License -of the respective Designated User, during which time the Designated User is -entitled to use the Licensed Software, as set forth in the respective License -Certificate. - -“Licensed Software” shall mean either -(i) Qt for Application Development or -(ii) Qt for Device Creation, and/or -(iii) Qt 3D Studio, and/or -(iv) Qt Design Studio, and/or -(v) selected Add-on Products, if any, depending on which product(s) the - Licensee has purchased under this Agreement, - -as well as corresponding online or electronic documentation, associated media -and printed materials, including the source code, example programs and the -documentation, licensed to the Licensee under this Agreement. Licensed Software -does not include Third Party Software (as defined in Section 4) or Open Source -Qt. The Qt Company may, in the course of its development activities, at its free -and absolute discretion and without any obligation to send or publish any -notifications to the Licensee or in general, make changes, additions or -deletions in the components and functionalities of the Licensed Software, -provided that no such changes, additions or deletions will affect the already -released version of the Licensed Software, but only upcoming version(s). - -“Licensee” shall mean the individual or legal entity that is party to this -Agreement, as identified on the signature page hereof. - -“Licensee’s Records” shall mean books and records that are likely to contain -information bearing on Licensee’s compliance with this Agreement or the payments -due to The Qt Company under this Agreement, including, but not limited to: -assembly logs, sales records and distribution records. - -“Modified Software” shall have the meaning as set forth in Section 2.3. - -“Online Services” shall mean any services or access to systems made available by -The Qt Company to the Licensee over the Internet relating to the Licensed -Software or for the purpose of use by the Licensee of the Licensed Software or -Support. Use of any such Online Services is discretionary for the Licensee and -some of them may be subject to additional fees. - -“Open Source Qt” shall mean the non-commercial Qt computer software products, -licensed under the terms of the GNU Lesser General Public License, version 2.1 -or later (“LGPL”) or the GNU General Public License, version 2.0 or later -(“GPL”). For clarity, Open Source Qt shall not be provided nor governed under -this Agreement. - -”Party” or “Parties” shall mean Licensee and/or The Qt Company. - -“Qt 3D Studio” shall mean all versions of The Qt Company’s Qt 3D Studio, a 3D -user interface design and development environment for rapid designing and -prototyping of animated user interfaces. - -“Qt Design Studio” shall mean all versions of The Qt Company’s Qt Design Studio -tool, a 2D user interface design and development environment for rapid designing -and prototyping of animated user interfaces. - -“Qt for Application Development” shall mean The Qt Company’s productized -offering, which consist of all versions of -(i) Qt Toolkit, and -(ii) Qt Tools/Applications. - -“Qt for Device Creation” shall mean The Qt Company’s productized offering, -which consist of all versions of -(i) Qt for Application Development, and -(ii) Software components specific to embedded software development as set forth - in Appendix 1, Sections 1b and 1d. - -“Qt Toolkit” shall mean the modules defined in Appendix 1, Section 1a. - -“Qt Tools/Applications” shall mean the tools defined in Appendix 1, Section 1c. - -"Redistributables" shall mean the portions of the Licensed Software set forth in -Appendix 1, Section 2 that may be distributed pursuant to the terms of this -Agreement in object code form only, including any relevant documentation. Where -relevant, any reference to Licensed Software in this Agreement shall include and -refer also to Redistributables. - -“Renewal Term” shall mean an extension of previous License Term as agreed -between the Parties. - -“Submitted Modified Software” shall have the meaning as set forth in -Section 2.3. - -“Support” shall mean standard developer support that is provided by The Qt -Company to assist Designated Users in using the Licensed Software in accordance -with The Qt Company’s standard support terms and as further defined in -Section 8 hereunder. - -“Taxes” shall have the meaning set forth in Section 10.5. - -“Term” shall have the meaning set forth in Section 12. - -“The Qt Company” shall mean: -(i) in the event Licensee is an individual residing in the United States or a - legal entity incorporated in the United States or having its headquarters - in the United States, The Qt Company Inc., a Delaware corporation with its - office at 2350 Mission College Blvd., Suite 1020, Santa Clara, CA 95054, - USA.; or -(ii) in the event the Licensee is an individual residing outside of the United - States or a legal entity incorporated outside of the United States or - having its registered office outside of the United States, The Qt Company - Ltd., a Finnish company with its registered office at Bertel Jungin aukio - D3A, 02600 Espoo, Finland. - -"Third Party Software " shall have the meaning set forth in Section 4. - -“Updates” shall mean a release or version of the Licensed Software containing -bug fixes, error corrections and other changes that are generally made available -to users of the Licensed Software that have contracted for Support. Updates are -generally depicted as a change to the digits following the decimal in the -Licensed Software version number. The Qt Company shall make Updates available to -the Licensee under the Support. Updates shall be considered as part of the -Licensed Software hereunder. - -“Upgrades” shall mean a release or version of the Licensed Software containing -enhancements and new features and are generally depicted as a change to the -first digit of the Licensed Software version number. In the event Upgrades are -provided to the Licensee under this Agreement, they shall be considered as part -of the Licensed Software hereunder. - -2. OWNERSHIP -2.1 Ownership of The Qt Company -The Licensed Software is protected by copyright laws and international copyright -treaties, as well as other intellectual property laws and treaties. The Licensed -Software is licensed, not sold. All The Qt Company's Intellectual Property -Rights are and shall remain the exclusive property of The Qt Company or its -licensors respectively. - -2.2 Ownership of Licensee -All the Licensee's Intellectual Property Rights are and shall remain the -exclusive property of the Licensee or its licensors respectively. All -Intellectual Property Rights to the Modified Software, Applications and Devices -shall remain with the Licensee and no rights thereto shall be granted by the -Licensee to The Qt Company under this Agreement (except as set forth in Section -2.3 below). - -2.3 Modified Software -Licensee may create bug-fixes, error corrections, patches or modifications to -the Licensed Software (“Modified Software”). Such Modified Software may break -the source or binary compatibility with the Licensed Software (including without -limitation through changing the application programming interfaces ("API") or by -adding, changing or deleting any variable, method, or class signature in the -Licensed Software and/or any inter-process protocols, services or standards in -the Licensed Software libraries). To the extent that Licensee’s Modified -Software so breaks source or binary compatibility with the Licensed Software, -Licensee acknowledges that The Qt Company's ability to provide Support may be -prevented or limited and Licensee's ability to make use of Updates may be -restricted. Licensee may, at its sole and absolute discretion, choose to submit -Modified Software to The Qt Company (“Submitted Modified Software”) in -connection with Licensee’s Support request, service request or otherwise. In the -event Licensee does so, then, Licensee hereby grants The Qt Company a -sublicensable, assignable, irrevocable, perpetual, worldwide, non-exclusive, -royalty-free and fully paid-up license, under all of Licensee’s Intellectual -Property Rights, to reproduce, adapt, translate, modify, and prepare derivative -works of, publicly display, publicly perform, sublicense, make available and -distribute such Submitted Modified Software as The Qt Company sees fit at its -free and absolute discretion. - -3. LICENSES GRANTED -3.1 Development with Licensed Software -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable license, valid for the -License Term, to use, modify and copy the Licensed Software by Designated Users -on the Development Platforms for the sole purposes of designing, developing, -demonstrating and testing Application(s) and/or Devices, and to provide thereto -related support and other related services to end-user Customers. Licensee may -install copies of the Licensed Software on an unlimited number of computers -provided that (i) only the Designated Users may use the Licensed Software, and -(ii) all Designated Users must have a valid Development License to use Licensed -Software. Licensee may at any time designate another Designated User to replace -a then-current Designated User by notifying The Qt Company in writing, provided -that any Designated User may be replaced only once during any six-month period. -Upon expiry of the initially agreed License Term, the respective License Terms -shall be automatically extended to one or more Renewal Term(s), unless and until -either Party notifies the other Party in writing that it does not wish to -continue the License Term, such notification to be provided to the other Party -no less than ninety (90) days before expiry of the respective License Term. -Unless otherwise agreed between the Parties, Renewal Term shall be of equal -length with the initial Term. Any such Renewal Term shall be subject to License -Fees agreed between the Parties or, if no advance agreement exists, subject to -The Qt Company’s standard pricing applicable at the commencement date of any -such Renewal Term. - -3.2 Distribution of Applications -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable, revocable (for cause -pursuant to this Agreement) right and license, valid for the Term, to (i) -distribute, by itself or through its Contractors, Redistributables as installed, -incorporated or integrated into Applications for execution on the Deployment -Platforms, and (ii) grant sublicenses to Redistributables, as distributed -hereunder, for Customers solely for Customer’s internal use and to the extent -necessary in order for the Customers to use the Applications for their -respective intended purposes. -Right to distribute the Redistributables as part of an Application as provided -herein is not royalty-bearing but is conditional upon the Licensee having paid -the agreed Development Licenses from The Qt Company before distributing any -Redistributables to Customers. - -3.3 Distribution of Devices -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable, revocable (for cause -pursuant to this Agreement) right and license, valid for the Term, to (i) -distribute, by itself or through one or more tiers of Contractors, -Redistributables as installed, incorporated or integrated, or intended to be -installed, incorporated or integrated into Devices for execution on the -Deployment Platforms, and (ii) grant sublicenses to Redistributables, as -distributed hereunder, for Customers solely for Customer’s internal use and to -the extent necessary in order for the Customers to use the Devices for their -respective intended purposes. -Right to distribute the Redistributables with Devices as provided herein is -conditional upon the Licensee having purchased and paid the appropriate amount -of Development Licenses for Qt for Device Creation product and Distribution -Licenses from The Qt Company before distributing any Redistributables to -Customers. - -3.4 Further Requirements -The licenses granted above in this Section 3 by The Qt Company to Licensee are -conditional and subject to Licensee's compliance with the following terms: -(i) Licensee shall not remove or alter any copyright, trademark or other - proprietary rights notice contained in any portion of the Licensed - Software; -(ii) Applications must add primary and substantial functionality to the - Licensed Software; -(iii) Applications may not pass on functionality which in any way makes it - possible for others to create software with the Licensed Software; - provided however that Licensee may use the Licensed Software's scripting - and QML ("Qt Quick") functionality solely in order to enable scripting, - themes and styles that augment the functionality and appearance of the - Application(s) without adding primary and substantial functionality to - the Application(s); -(iv) Applications must not compete with the Licensed Software; -(v) Licensee shall not use The Qt Company's or any of its suppliers' names, - logos, or trademarks to market Applications, except that Licensee may use - “Built with Qt” logo to indicate that Application(s) was developed using - the Licensed Software; -(vi) Licensee shall not distribute, sublicense or disclose source code of - Licensed Software to any third party (provided however that Licensee may - appoint employee(s) of Contractors as Designated Users to use Licensed - Software pursuant to this Agreement). Such right may be available for the - Licensee subject to a separate software development kit (“SDK”) license - agreement to be concluded with The Qt Company; -(vii) Licensee shall not grant the Customers a right to (i) make copies of the - Redistributables except when and to the extent required to use the - Applications and/or Devices for their intended purpose, (ii) modify the - Redistributables or create derivative works thereof, (iii) decompile, - disassemble or otherwise reverse engineer Redistributables, or (iv) - redistribute any copy or portion of the Redistributables to any third - party, except as part of the onward sale of the Device on which the - Redistributables are installed; -(viii) Licensee shall not and shall cause that its Affiliates or Contractors - shall not a) in any way combine, incorporate or integrate Licensed - Software with, or use Licensed Software for creation of, any software - created with or incorporating Open Source Qt, or b) incorporate or - integrate Applications into a hardware device or product other than a - Device, unless Licensee has received an advance written permission from - The Qt Company to do so. Absent such written permission, any and all - distribution by the Licensee during the Term of a hardware device or - product a) which incorporate or integrate any part of Licensed Software - or Open Source Qt; or b) where the main user interface or substantial - functionality is provided by software built with Licensed Software or - Open Source Qt or otherwise depends on the Licensed Software or Open - Source Qt, shall be considered as a Device distribution under this - Agreement and dependent on compliance thereof (including but not limited - to obligation to pay applicable License Fees for such distribution). - Notwithstanding what is provided above in this sub-section (viii), - Licensee is entitled to use and combine Qt 3D Studio and/or Qt Design - Studio with Open Source Qt (“Combination”) for its internal evaluation - purposes, provided that Licensee shall in no way transfer, publish, - disclose, display or otherwise make available any software or work - resulting from such Combination; -(ix) Licensee shall cause all of its Affiliates and Contractors entitled to - make use of the licenses granted under this Agreement, to be - contractually bound to comply with the relevant terms of this Agreement - and not to use the Licensed Software beyond the terms hereof and for any - purposes other than operating within the scope of their services for - Licensee. Licensee shall be responsible for any and all actions and - omissions of its Affiliates and Contractors relating to the Licensed - Software and use thereof (including but not limited to payment of all - applicable License Fees); -(x) Except when and to the extent explicitly provided in this Section 3, - Licensee shall not transfer, publish, disclose, display or otherwise - make available the Licensed Software; -; and -(xi) Licensee shall not attempt or enlist a third party to conduct or attempt - to conduct any of the above. - -Above terms shall not be applicable if and to the extent they conflict with any -mandatory provisions of any applicable laws. Any use of Licensed Software beyond -the provisions of this Agreement is strictly prohibited and requires an -additional license from The Qt Company. - -4. THIRD PARTY SOFTWARE -The Licensed Software may provide links to third party libraries or code -(collectively "Third Party Software") to implement various functions. Third -Party Software does not comprise part of the Licensed Software. In some cases, -access to Third Party Software may be included in the Licensed Software. Such -Third Party Software will be listed in the ".../src/3rdparty" source tree -delivered with the Licensed Software or documented in the Licensed Software, as -such may be amended from time to time. Licensee acknowledges that use or -distribution of Third Party Software is in all respects subject to applicable -license terms of applicable third party right holders. - -5. PRE-RELEASE CODE -The Licensed Software may contain pre-release code and functionality marked or -otherwise stated as “Technology Preview”, “Alpha”, “Beta” or similar -designation. Such pre-release code may be present in order to provide -experimental support for new platforms or preliminary versions of one or more -new functionalities. The pre-release code may not be at the level of performance -and compatibility of a final, generally available, product offering of the -Licensed Software. The pre-release parts of the Licensed Software may not -operate correctly, may contain errors and may be substantially modified by The -Qt Company prior to the first commercial product release, if any. The Qt Company -is under no obligation to make pre-release code commercially available, or -provide any Support or Updates relating thereto. The Qt Company assumes no -liability whatsoever regarding any pre-release code, but any use thereof is -exclusively at Licensee’s own risk and expense. For clarity, Licensee is -entitled to use such pre-release code pursuant to Section 3, just like other -Licensed Software, provided however that in the event Add-on Products are -included and available as such pre-release code, Licensee’s right to use such -Add-on Products is nevertheless subject to and conditional upon conclusion of -separate agreement with The Qt Company. - -6. LIMITED WARRANTY AND WARRANTY DISCLAIMER -The Qt Company hereby represents and warrants that it has the power and -authority to grant the rights and licenses granted to Licensee under this -Agreement. Except as set forth above, the Licensed Software is licensed to -Licensee "as is" and Licensee’s exclusive remedy and The Qt Company’s entire -liability for errors in the Licensed Software shall be limited, at The Qt -Company’s option, to correction of the error, replacement of the Licensed -Software or return of the applicable fees paid for the defective Licensed -Software for the time period during which the License is not able to utilize the -Licensed Software under the terms of this Agreement. - -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF -ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER -WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND -NON-INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES NOT -WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE’S REQUIREMENTS OR THAT -IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE -UNINTERRUPTED. ALL USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE -RISK OF AND RESPONSIBILITY OF LICENSEE. - -7. INDEMNIFICATION AND LIMITATION OF LIABILITY -7.1 Limitation of Liability -EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II) -BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO -EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY FOR ANY LOSS OF PROFIT, -LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, SPECIAL, -CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY KIND, -HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT. PARTIES -SPECIFICALLY AGREE THAT LICENSEE’S OBLIGATION TO PAY LICENSE AND OTHER FEES -CORRESPONDING TO ACTUAL USAGE OF LICENSED SOFTWARE HEREUNDER SHALL BE CONSIDERED -AS A DIRECT DAMAGE. EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL -MISCONDUCT, AND (II) BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY -APPLICABLE LAW, IN NO EVENT SHALL EITHER PARTY’S TOTAL AGGREGATE LIABILITY UNDER -THIS AGREEMENT EXCEED THE AGGREGATE LICENSE FEES PAID OR PAYABLE TO THE QT -COMPANY FROM LICENSEE DURING THE PERIOD OF TWELVE (12) MONTHS IMMEDIATELY -PRECEDING THE EVENT RESULTING IN SUCH LIABILITY. THE PROVISIONS OF THIS SECTION -7 ALLOCATE THE RISKS UNDER THIS AGREEMENT BETWEEN THE QT COMPANY AND LICENSEE -AND THE PARTIES HAVE RELIED UPON THE LIMITATIONS SET FORTH HEREIN IN DETERMINING -WHETHER TO ENTER INTO THIS AGREEMENT. - -7.2 Licensee´s Indemnification -Licensee shall indemnify and hold harmless The Qt Company from and against any -claim, injury, judgment, settlement, loss or expense, including attorneys' fees -related to: (a) Licensee’s misrepresentation in connection with The Qt Company -or the Licensed Software or breach of this Agreement, (b) the Application or -Device (except where such cause of liability is solely attributable to the -Licensed Software). - -8. SUPPORT, UPDATES AND ONLINE SERVICES -Upon due payment of the agreed License Fees the Licensee will be eligible to -receive Support and Updates and to use the Online Services during the License -Term, provided, however, that in the event the License Term is longer than 36 -months, Support is provided only for the first 12 months, unless the Parties -specifically otherwise agree. Unless otherwise decided by The Company at its -free and absolute discretion, Upgrades will not be included in the Support but -may be available subject to additional fees. From time to time The Qt Company -may change the Support terms, provided that during the respective ongoing -License Term the level of Support provided by The Qt Company may not be reduced -without the consent of the Licensee. Unless otherwise agreed, The Qt Company -shall not be responsible for providing any service or support to Customers. - -9. CONFIDENTIALITY -Each Party acknowledges that during the Term of this Agreement each Party may -receive information about the other Party's business, business methods, business -plans, customers, business relations, technology, and other information, -including the terms of this Agreement, that is confidential and of great value -to the other Party, and the value of which would be significantly reduced if -disclosed to third parties (“Confidential Information”). Accordingly, when a -Party (the “Receiving Party”) receives Confidential Information from the other -Party (the “Disclosing Party”), the Receiving Party shall only disclose such -information to employees and Contractors on a need to know basis, and shall -cause its employees and employees of its Affiliates to: (i) maintain any and all -Confidential Information in confidence; (ii) not disclose the Confidential -Information to a third party without the Disclosing Party's prior written -approval; and (iii) not, directly or indirectly, use the Confidential -Information for any purpose other than for exercising its rights and fulfilling -its responsibilities pursuant to this Agreement. Each Party shall take -reasonable measures to protect the Confidential Information of the other Party, -which measures shall not be less than the measures taken by such Party to -protect its own confidential and proprietary information. Obligation of -confidentiality shall not apply to information that (i) is or becomes generally -known to the public through no act or omission of the Receiving Party; (ii) was -in the Receiving Party's lawful possession prior to the disclosure hereunder and -was not subject to limitations on disclosure or use; (iii) is developed -independently by employees or Contractors of the Receiving Party or other -persons working for the Receiving Party who have not had access to the -Confidential Information of the Disclosing Party, as proven by the written -records of the Receiving Party; (iv) is lawfully disclosed to the Receiving -Party without restrictions, by a third party not under an obligation of -confidentiality; or (v) the Receiving Party is legally compelled to disclose, in -which case the Receiving Party shall notify the Disclosing Party of such -compelled disclosure and assert the privileged and confidential nature of the -information and cooperate fully with the Disclosing Party to limit the scope of -disclosure and the dissemination of disclosed Confidential Information to the -minimum extent necessary. The obligations under this Section 9 shall continue to -remain in force for a period of five (5) years after the last disclosure, and, -with respect to trade secrets, for so long as such trade secrets are protected -under applicable trade secret laws. - -10. FEES, DELIVERY AND PAYMENT -10.1 License Fees -License Fees are described in The Qt Company’s standard price list, quote or -Purchase Order confirmation or in an appendix hereto, as the case may be. The -License Fees shall not be refunded or claimed as a credit in any event or for -any reason whatsoever. - -10.2 Ordering Licenses -Licensee may purchase Development Licenses and Distribution Licenses pursuant to -agreed pricing terms or, if no specific pricing terms have been agreed upon, at -The Qt Company's standard pricing terms applicable at the time of purchase. -Licensee shall submit all purchase orders for Development Licenses and -Distribution Licenses to The Qt Company by email or any other method acceptable -to The Qt Company (each such order is referred to herein as a “Purchase Order”) -for confirmation, whereupon the Purchase Order shall become binding between the -Parties. - -10.3 Distribution License Packs -Unless otherwise agreed, Distribution Licenses shall be purchased by way of -Distribution License Packs. Upon due payment of the ordered Distribution License -Pack(s), the Licensee will have an account of Distribution Licenses available -for installing, bundling or integrating (all jointly “installing”) the -Redistributables with the Devices or for otherwise distributing the -Redistributables in accordance with this Agreement. Each time Licensee -“installs” or distributes a copy of Redistributables, then one Distribution -License is used, and Licensee’s account of available Distribution Licenses is -decreased accordingly. Licensee may “install” copies of the Redistributables so -long as Licensee has Distribution Licenses remaining on its account. -Redistributables will be deemed to have been “installed” into a Device when one -of the following circumstances shall have occurred: a) the Redistributables have -been loaded onto the Device and used outside of the Licensee’s premises or b) -the Device has been fully tested and placed into Licensee's inventory (or sold) -for the first time (i.e., Licensee will not be required to use (or pay for) more -than one Distribution License for each individual Device, e.g. in a situation -where a Device is returned to Licensee's inventory after delivery to a -distributor or sale to a Customer). In addition, if Licensee includes a back-up -copy of the Redistributables on a CD-ROM or other storage medium along with the -product, that backup copy of the Redistributables will not be deemed to have -been “installed” and will not require an additional Distribution License. - -10.4 Payment Terms -License Fees and any other charges under this Agreement shall be paid by -Licensee no later than thirty (30) days from the date of the applicable invoice -from The Qt Company. The Qt Company will submit an invoice to Licensee after the -date of this Agreement and/or after The Qt Company receives a Purchase Order -from Licensee. A late payment charge of the lower of (a) one percent per month; -or (b) the interest rate stipulated by applicable law, shall be charged on any -unpaid balances that remain past due. The Qt Company shall have the right to -suspend, terminate or withhold grants of all rights to the Licensed Software -hereunder, including but not limited to the Developer License, Distribution -License, and Support, should Licensee fail to make payment in timely fashion. - -10.5 Taxes -All License Fees and other charges payable hereunder are gross amounts but -exclusive of any value added tax, use tax, sales tax and other taxes, duties or -tariffs (“Taxes”). Such applicable Taxes shall be paid by Licensee, or, where -applicable, in lieu of payment of such Taxes, Licensee shall provide an -exemption certificate to The Qt Company and any applicable authority. - -11 RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS -11.1 Licensee’s Record-keeping -Licensee shall at all times maintain accurate and up-to-date written records of -Licensee’s activities related to the use of Licensed Software and distribution -of Redistributables. The records shall be adequate to determine Licensee’s -compliance with the provisions of this Agreement and to demonstrate the number -of Designated Users and Redistributables distributed by Licensee. The records -shall conform to good accounting practices reasonably acceptable to The Qt -Company. Licensee shall, within thirty (30) days from receiving The Qt Company’s -request to that effect, deliver to The Qt Company a report on Licensee’s usage -of Licensed Software, such report to contain information, in sufficient detail, -on (i) amount of users working with Licensed Software, (ii) copies of -Redistributables distributed by Licensee during that calendar quarter, (iii) -number of undistributed copies of Redistributables and corresponding number of -unused Distribution Licenses remaining on Licensee’s account, and (iv) any other -information as The Qt Company may reasonably require from time to time. - -11.2. The Qt Company’s Audit Rights -The Qt Company or an independent auditor acting on behalf of The Qt Company’s, -may, upon at least five (5) business days’ prior written notice and at its -expense, audit Licensee with respect to the use of the Redistributables, but not -more frequently than once during each 6-month period. Such audit may be -conducted by mail, electronic means or through an in-person visit to Licensee’s -place of business. Any such in-person audit shall be conducted during regular -business hours at Licensee's facilities and shall not unreasonably interfere -with Licensee's business activities. The Qt Company or the independent auditor -acting on behalf of The Qt Company shall be entitled to inspect Licensee’s -Records. All such Licensee’s Records and use thereof shall be subject to an -obligation of confidentiality under this Agreement. If an audit reveals that -Licensee is using the Licensed Software beyond scope of the licenses Licensee -has paid for, Licensee agrees to immediately pay The Qt Company any amounts owed -for such unauthorized use. -In addition, in the event the audit reveals a material violation of the terms of -this Agreement (underpayment of more than 5% of License Fees shall always be -deemed a material violation for purposes of this section), then the Licensee -shall pay The Qt Company's reasonable cost of conducting such audit. - -12 TERM AND TERMINATION -12.1 Term -This Agreement shall enter into force upon due acceptance by both Parties and -remain in force for as long as there is any Development License(s) in force -(“Term”), unless and until terminated pursuant to the terms of this Section 12. - -12.2 Termination by The Qt Company -The Qt Company shall have the right to terminate this Agreement upon thirty (30) -days prior written notice if the Licensee is in material breach of any -obligation of this Agreement and fails to remedy such breach within such notice -period. - -12.3 Mutual Right to Terminate -Either Party shall have the right to terminate this Agreement immediately upon -written notice in the event that the other Party becomes insolvent, files for -any form of bankruptcy, makes any assignment for the benefit of creditors, has a -receiver, administrative receiver or officer appointed over the whole or a -substantial part of its assets, ceases to conduct business, or an act equivalent -to any of the above occurs under the laws of the jurisdiction of the other -Party. - -12.4 Parties´ Rights and Duties upon Termination -Upon expiry or termination of the Agreement Licensee shall cease and shall cause -all Designated Users (including those of its Affiliates’ and Contractors’) to -cease using the Licensed Software and distribution of the Redistributables under -this Agreement. -Notwithstanding the above, in the event the Agreement expires or is terminated: -(i) as a result of The Qt Company choosing not to renew the Development - License(s) as set forth in Section 3.1, then all valid licenses possessed - by the Licensee at such date shall be extended to be valid in perpetuity - under the terms of this Agreement and Licensee is entitled to purchase - additional licenses as set forth in Section 10.2; or -(ii) for reason other than by The Qt Company pursuant to item (i) above or - pursuant to Section 12.2, then the Licensee is entitled, for a period of - six (6) months after the effective date of termination, to continue - distribution of Devices under the Distribution Licenses paid but unused at - such effective date of termination. Upon any such termination the Licensee - shall destroy or return to The Qt Company all copies of the Licensed - Software and all related materials and will certify the same to The Qt - Company upon its request, provided however that Licensee may retain and - exploit such copies of the Licensed Software as it may reasonably require - in providing continued support to Customers. -Expiry or termination of this Agreement for any reason whatsoever shall not -relieve Licensee of its obligation to pay any License Fees accrued or payable to -The Qt Company prior to the effective date of termination, and Licensee shall -immediately pay to The Qt Company all such fees upon the effective date of -termination. Termination of this Agreement shall not affect any rights of -Customers to continue use of Applications and Devices (and therein incorporated -Redistributables). - -12.5 Extension in case of bankruptcy -In the event The Qt Company is declared bankrupt under a final, non-cancellable -decision by relevant court of law, and this Agreement is not, at the date of -expiry of the Development License(s) pursuant to Section 3.1, assigned to party, -who has assumed The Qt Company’s position as a legitimate licensor of Licensed -Software under this Agreement, then all valid licenses possessed by the Licensee -at such date of expiry, and which the Licensee has not notified for expiry, -shall be extended to be valid in perpetuity under the terms of this Agreement. - -13. GOVERNING LAW AND LEGAL VENUE -In the event this Agreement is in the name of The Qt Company Inc., a Delaware -Corporation, then: -(i) this Agreement shall be construed and interpreted in accordance with the - laws of the State of California, USA, excluding its choice of law - provisions; -(ii) the United Nations Convention on Contracts for the International Sale of - Goods will not apply to this Agreement; and -(iii) any dispute, claim or controversy arising out of or relating to this - Agreement or the breach, termination, enforcement, interpretation or - validity thereof, including the determination of the scope or - applicability of this Agreement to arbitrate, shall be determined by - arbitration in San Francisco, USA, before one arbitrator. The arbitration - shall be administered by JAMS pursuant to JAMS' Streamlined Arbitration - Rules and Procedures. Judgment on the Award may be entered in any court - having jurisdiction. This Section shall not preclude parties from seeking - provisional remedies in aid of arbitration from a court of appropriate - jurisdiction. -In the event this Agreement is in the name of The Qt Company Ltd., a Finnish -Company, then: -(i) this Agreement shall be construed and interpreted in accordance with the - laws of Finland, excluding its choice of law provisions; -(ii) the United Nations Convention on Contracts for the International Sale of - Goods will not apply to this Agreement; and -(iii) any disputes, controversy or claim arising out of or relating to this - Agreement, or the breach, termination or validity thereof shall be shall - be finally settled by arbitration in accordance with the Arbitration Rules - of Finland Chamber of Commerce. The arbitration tribunal shall consist of - one (1), or if either Party so requires, of three (3), arbitrators. The - award shall be final and binding and enforceable in any court of competent - jurisdiction. The arbitration shall be held in Helsinki, Finland and the - process shall be conducted in the English language. This Section shall not - preclude parties from seeking provisional remedies in aid of arbitration - from a court of appropriate jurisdiction. - -14. GENERAL PROVISIONS -14.1 No Assignment -Except in the case of a merger or sale of substantially all of its corporate -assets, Licensee shall not be entitled to assign or transfer all or any of its -rights, benefits and obligations under this Agreement without the prior written -consent of The Qt Company, which shall not be unreasonably withheld or delayed. -The Qt Company shall be entitled to freely assign or transfer any of its rights, -benefits or obligations under this Agreement. - -14.2 No Third Party Representations -Licensee shall make no representations or warranties concerning the Licensed -Software on behalf of The Qt Company. Any representation or warranty Licensee -makes or purports to make on The Qt Company’s behalf shall be void as to The Qt -Company. - -14.3 Surviving Sections -Any terms and conditions that by their nature or otherwise reasonably should -survive termination of this Agreement shall so be deemed to survive. - -14.4 Entire Agreement -This Agreement, the exhibits hereto, the License Certificate and any applicable -Purchase Order constitute the complete agreement between the Parties and -supersedes all prior or contemporaneous discussions, representations, and -proposals, written or oral, with respect to the subject matters discussed -herein. -In the event of any conflict or inconsistency between this Agreement and any -Purchase Order, the terms of this Agreement will prevail over the terms of the -Purchase Order with respect to such conflict or inconsistency. -Parties specifically acknowledge and agree that this Agreement prevails over any -click-to-accept or similar agreements the Designated Users may need to accept -online upon download of the Licensed Software, as may be required by The Qt -Company’s applicable processes relating to Licensed Software. - -14.5 Modifications -No modification of this Agreement shall be effective unless contained in a -writing executed by an authorized representative of each Party. No term or -condition contained in Licensee's Purchase Order shall apply unless expressly -accepted by The Qt Company in writing. - -14.6 Force Majeure -Except for the payment obligations hereunder, neither Party shall be liable to -the other for any delay or non-performance of its obligations hereunder in the -event and to the extent that such delay or non-performance is due to an event of -act of God, terrorist attack or other similar unforeseeable catastrophic event -that prevents either Party for fulfilling its obligations under this Agreement -and which such Party cannot avoid or circumvent (“Force Majeure Event”). If the -Force Majeure Event results in a delay or non-performance of a Party for a -period of three (3) months or longer, then either Party shall have the right to -terminate this Agreement with immediate effect without any liability (except for -the obligations of payment arising prior to the event of Force Majeure) towards -the other Party. - -14.7 Notices -Any notice given by one Party to the other shall be deemed properly given and -deemed received if specifically acknowledged by the receiving Party in writing -or when successfully delivered to the recipient by hand, fax, or special courier -during normal business hours on a business day to the addresses specified for -each Party on the signature page. Each communication and document made or -delivered by one Party to the other Party pursuant to this Agreement shall be in -the English language. - -14.8 Export Control -Licensee acknowledges that the Redistributables may be subject to export control -restrictions under the applicable laws of respective countries. Licensee shall -fully comply with all applicable export license restrictions and requirements as -well as with all laws and regulations relating to the Redistributables and -exercise of licenses hereunder and shall procure all necessary governmental -authorizations, including without limitation, all necessary licenses, approvals, -permissions or consents, where necessary for the re-exportation of the -Redistributables, Applications and/or Devices. - -14.9 No Implied License -There are no implied licenses or other implied rights granted under this -Agreement, and all rights, save for those expressly granted hereunder, shall -remain with The Qt Company and its licensors. In addition, no licenses or -immunities are granted to the combination of the Licensed Software with any -other software or hardware not delivered by The Qt Company under this Agreement. - -14.10 Attorney Fees -The prevailing Party in any action to enforce this Agreement shall be entitled -to recover its attorney’s fees and costs in connection with such action. - -14.11 Severability -If any provision of this Agreement shall be adjudged by any court of competent -jurisdiction to be unenforceable or invalid, that provision shall be limited or -eliminated to the minimum extent necessary so that this Agreement shall -otherwise remain in full force and effect and enforceable. - - - -APPENDICES -The Agreement includes Appendix 1 as shown below. In addition, the Agreement may -include one or more of the Appendices 3-5 listed below depending on the -product(s) purchased by the Licensee, what is stated in the quote or invoice, -and/or what is stated on the License Certificate. - -  -APPENDIX 1: LICENSED SOFTWARE -1a. Licensed Software - Qt Toolkit -Module Description -Qt Core Core non-graphical classes used by other modules. -Qt GUI Base classes for graphical user interface (GUI) - components. -Qt Multimedia Classes for audio, video and camera functionality. -Qt Multimedia Widgets Widget-based classes for implementing multimedia - functionality. -Qt Network Classes to make network programming easier and more - portable. -Qt QML Classes for QML and JavaScript languages. -Qt Quick A declarative framework for building highly dynamic - applications with custom user interfaces. -Qt Quick Controls 2 Provides lightweight QML types for creating - performant user interfaces for desktop, embedded, and - mobile devices. -Qt Quick Dialogs Types for creating and interacting with system - dialogs from a Qt Quick application. -Qt Quick Layouts Layouts are items that are used to arrange Qt Quick 2 - based items in the user interface. -Qt Quick Test A unit test framework for QML applications. -Qt SQL Classes for database integration using SQL. -Qt Test Classes for unit testing Qt applications and - libraries. -Qt Widgets Classes to extend Qt GUI with C++ widgets. -Active Qt Classes for applications which use ActiveX and COM -Qt 3D Functionality for near-realtime simulation systems - with support for 2D and 3D rendering. -Qt Android Extras Provides platform-specific APIs for Android. -Qt Bluetooth Provides access to Bluetooth hardware. -Qt Canvas 3D Enables OpenGL-like 3D drawing calls from Qt Quick - applications using JavaScript. -Qt Concurrent Classes for writing multi-threaded programs without - using low-level threading primitives. -Qt D-Bus Classes for inter-process communication over the - D-Bus protocol. -Qt Gamepad Enables Qt applications to support the use of gamepad - hardware. -Qt Graphical Effects Graphical effects for use with Qt Quick 2. -Qt Help Classes for integrating documentation into - applications, similar to Qt Assistant. -Qt Image Formats Plugins for additional image formats: TIFF, MNG, TGA, - WBMP. -Qt Location Displays map, navigation, and place content in a QML - application. -Qt Mac Extras Provides platform-specific APIs for macOS. -Qt Network Authorization Provides support for OAuth-based authorization to - online services. -Qt NFC Provides access to Near-Field communication (NFC) - hardware. -Qt Platform Headers Provides classes that encapsulate platform-specific - information. -Qt Positioning Provides access to position, satellite and area - monitoring classes. -Qt Print Support Classes to make printing easier and more portable. -Qt Purchasing Enables in-app purchase of products in Qt - applications. -Qt for Python Python bindings for Qt. -Qt Quick Controls Reusable Qt Quick based UI controls to create classic - desktop-style user interfaces. -Qt Quick Extras Provides a specialized set of controls that can be - used to build interfaces in Qt Quick. -Qt Quick Widgets Provides a C++ widget class for displaying a Qt - Quick user interface. -Qt SCXML Provides classes and tools for creating state - machines from SCXML files. -Qt Sensors Provides access to sensor hardware and motion gesture - recognition. -Qt Serial Bus Provides access to serial industrial bus interface. -Qt Serial Port Provides access to hardware and virtual serial ports. -Qt Speech Provides support for accessibility features such as - text-to-speech. -Qt SVG Classes for displaying the contents of SVG files. -Qt UI Tools Classes for loading QWidget based forms created in Qt - Designer dynamically, at runtime. -Qt WebChannel Provides access to QObject or QML objects from HTML - clients for seamless integration of Qt applications - with HTML/JavaScript clients. -Qt WebEngine Classes and functions for embedding web content in - applications using the Chromium browser project. -Qt WebSockets Provides WebSocket communication. -Qt WebView Displays web content in a QML application by using - APIs native to the platform. -Qt Windows Extras Provides platform-specific APIs for Windows. -Qt X11 Extras Provides platform-specific APIs for X11. -Qt XML C++ implementations of SAX and DOM. -Qt XML Patterns Support for XPath, XQuery, XSLT and XML schema - validation. -Qt Wayland Compositor Provides a framework to develop a Wayland compositor. -Qt Charts UI Components for displaying charts. -Qt Data Visualization UI Components for creating 3D data visualizations. -Qt Virtual Keyboard A framework for implementing different input methods - as well as a QML virtual keyboard. - -1b. Licensed software – Embedded software development libraries -Module Description -Boot 2 Qt stack Yocto based Embedded Linux stack for selected - target hardware -Qt OTA Client-side capability for device image - updates Over The Air. -Device Utilities Collection of API’s to manage the device; - E.g. display, WiFi and Bluetooth settings. -Qt Debugging Bridge (QDB) Daemon Enables host-target deployment, debugging, - profiling and other features over USB. Up to - developer to decide if this is left in the - final solution. - -1c. Licensed Software - Qt Tools/Applications -Tool Description -Qt Creator The integrated development environment for Qt. -Qt Designer Qt tool for designing and building graphical user interfaces. -Qt Linguist Tool used to add translations to Qt applications. -Qt Assistant Tool for viewing online documentation in Qt help-file format. -Qmake Utility tool used to automate the generation of make files. -uic User interface compiler for the Qt GUI toolkit. -rcc Resource compiler used for embedding resources into Qt - applications. -lupdate Tool that finds the translatable strings in the specified source, - header and Qt Designer interface files, and produces or updates - translation files. -lrelease Tool that produces translation files in the compact binary format - used by localized Qt applications. -qlalr Qt parser generator tool. -qdoc Configurable documentation generation tool. -qmlscene QML launcher tool -qmlviewer QML launcher tool - -1d. Licensed software –Qt Tools/Applications specific to embedded software -development -Tool Description -Target toolchains Cross compilation toolchains for - supported target devices and operating - systems -Qt Debugging Bridge (QDB) Host Tools Enables deployment, debugging, - profiling and other features over USB - from development host PC to target - device. -qtconfig-gui Qt Lite Configurator tool graphical - interface -Qt Emulator Qt emulator - -2. Parts of the Licensed Software that are permitted for distribution in -object-code form only (“Redistributables”) under this Agreement: - -2a. Qt for Application Development -(i) The Licensed Software's Qt Toolkit libraries defined in 1a -(ii) The Licensed Software's installer framework - -2b. Qt for Device Creation -(i) Qt for Application Development Redistributables defined in 2a -(ii) The Licensed Software’s Embedded software development libraries defined in - 1b - -2c. Qt 3D Studio -The Licensed Software’s Qt 3D Studio Runtime (“Qt53DStudioRuntime2”) - - -APPENDIX 3: ADDITIONS TO LICENSED SOFTWARE -In addition to what is provided under the definition of the Licensed Software, -Parties agree that Licensed Software shall also include the following additional -software products of The Qt Company if included in the quote / invoice: -Qt for Automation - - MQTT software protocol libraries - - KNX software protocol libraries - - OPCUA (open source backend) - - OPCUA (Unified Automation backend) -Qt Safe Renderer - - Qt Safe Renderer library -Qt Application Manager - - Qt Application Manager library with Qt Creator integration - -All the above is considered as Redistributables and subject to applicable -provisions and limitations including but not limited to what is defined in -Section 3. - - -APPENDIX 4: SMALL BUSINESS AND START-UP APPENDIX -The provisions of this Appendix 4 are applicable for Start-up Companies and for -the Evaluation Term. -For the purpose of this Appendix 4, the following additional definitions shall -be applicable: - “Trial Term” shall mean a period of twelve (12) months. - “Start-up Company” means a company with a maximum annual revenue, including - funding, equivalent to 100,000 USD (in applicable currency) during a respective - calendar year, as evidenced by duly audited records of the Licensee and - approved by The Qt Company. - -During the Trial Term, Section 3 shall apply with following modifications -(“Trial Term Modifications”): - - Licenses granted under Sections 3.1 and 3.2 shall be free of any charge. For - clarity, License for distribution of Devices pursuant to Section 3.3 is - subject to applicable License Fee for necessary Distribution Licenses; - - Development License under Section 3.1 is limited to a maximum of three (3) - Designated Users; and - - Support is available subject to availability, as judged by The Qt Company at - its free and absolute discretion. - -Upon expiry of the Trial Term: - a) This Appendix 4 is terminated, Trial Term Modifications cease to remain in - force, Licensee’s Development Licenses shall be automatically converted into - licenses subject to a License Fee (in the amount specified in the quote or - in Appendix 2 and payable with a 30-day payment term) and Licensee’s rights - and obligations under this Agreement shall continue to remain in force under - the standard provisions of the Agreement, unless the Licensee notifies The - Qt Company in writing no less than ninety (90) days before such expiry date - that Licensee does not agree to such continuance, in which event the - Agreement, and all rights of the Licensee thereunder, shall expire; provided - however that - b) in the event the Licensee still qualifies as a Start-up Company, the - Licensee has an option (“Option”), instead of what is stated in item a) - above, to extend the Trial Term renewal is limited to one time and total - duration of Trial Terms thus to 24 months after the effective date. Licensee - shall notify The Qt Company in writing no less than ninety (90) days before - the expiry date, if Licensee wish to exercise the Option. - - -APPENDIX 5: NON-COMMERCIAL USE APPENDIX -The provisions of this Appendix 5 are applicable for non-commercial use of the -Licensed Software by the Licensee. -For the purpose of this Appendix 5, the following additional definitions -(replacing the relevant definition of the Agreement, where applicable) shall be -applicable: - “Demo Units” shall mean (i) hardware development platform, which incorporates - the Licensed Software along with Licensee’s software and/or hardware, and - (ii) prototype versions of Applications or Devices. - “Designated User(s)” shall mean the employees and students of the Licensee. - “Licensee Products” shall mean Applications and/or Devices. - “Permitted Purpose” shall mean (i) Licensee’s internal evaluation and testing - of Licensed Software, (ii) building Demo Units as well as (iii) educational - use. - “Term” shall mean a period of twelve (12) months or any such other period as - may be agreed between the Parties. - -For the purpose of this Appendix 5, the following changes shall be agreed with -respect to relevant Sections of the Agreement: - I. Recital (A) shall be replaced in its entirety to read as follows: “(A) - Licensee wishes to use the Licensed Software for the Permitted Purpose.” - II. Section 3.1 shall be replaced in its entirety to read as follows: - “The Qt Company grants to Licensee a personal, non-exclusive, - non-transferable, revocable, royalty-free license, valid for the Term, to - use, modify and copy the Licensed Software solely for the Permitted - Purpose. Licensee may install copies of the Licensed Software on an - unlimited number of computers provided that only Designated Users may use - the Licensed Software. Licensee may demonstrate the Demo Units, provided - that such demonstrations must be conducted by Licensee, and the Demo Units - must remain in Licensee’s possession and under Licensee’s control at all - times. For clarity, this Agreement does not (i) entitle Licensee to use - Licensed Software to create Applications or Devices (other than prototypes - thereof) or (ii) carry any distribution rights to Licensee, but such - rights are subject to and conditional upon conclusion of a separate - license agreement with The Qt Company.” - III. Sections 3.2, 3.3, 8 and 10 shall be deleted. - IV. Section 3.4 shall be replaced in its entirety to read as follows: - “Licensee shall not: - - remove or alter any copyright, trademark or other proprietary rights - notice contained in any portion of the Licensed Software; - - transfer, publish, sublicense, disclose, display or otherwise make - the Licensed Software available to any third party (except that - Licensee may demonstrate the Demo Units pursuant to Section 3.1); - - in any way combine, incorporate or integrate Licensed Software with, or - use Licensed Software for creation of, any software created with or - incorporating Open Source Qt; - Licensee shall cause all Designated Users who make use of the licenses - granted under this Agreement, to be contractually bound to comply with - the relevant terms of this Agreement and not to use the Licensed - Software beyond the terms hereof. Licensee shall be responsible for any - and all actions and omissions of its Designated Users relating to the - Licensed Software and use thereof. Any use of Licensed Software beyond - the provisions of this Agreement is strictly prohibited and requires an - additional license from The Qt Company.” - V. Section 12 shall be replaced in its entirety to read as follows: - “This Agreement shall enter into force upon due acceptance by both Parties - and remain in force for the Term, unless and until terminated pursuant to - the terms of Section 12. Upon termination of the Agreement, Licensee shall - cease using the Licensed Software. All other copies of Licensed Software - in the possession or control of Licensee must be erased or destroyed. An - officer of Licensee must, upon request, promptly deliver to The Qt Company - a written confirmation that this has occurred.” - -Except for the modifications specified above, this Appendix carries no change to -the terms of the Agreement which shall remain in full force. diff -Nru qtcharts-opensource-src-5.12.5/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT qtcharts-opensource-src-5.9.5/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT --- qtcharts-opensource-src-5.12.5/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT 2019-09-06 12:05:48.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT 1970-01-01 00:00:00.000000000 +0000 @@ -1,1089 +0,0 @@ -QT LICENSE AGREEMENT -Agreement version 4.1 -This License Agreement (“Agreement”) is a legal agreement between The Qt Company -(as defined below) and the Licensee (as defined below) for the license of -Licensed Software (as defined below). Capitalized terms used herein are defined -in Section 1. -WHEREAS: - -(A) Licensee wishes to use the Licensed Software for the purpose of developing - and distributing Applications and/or Devices; and -(B) The Qt Company is willing to grant the Licensee a right to use Licensed - Software for such purpose pursuant to term and conditions of this Agreement. - -NOW, THEREFORE, THE PARTIES HEREBY AGREE AS FOLLOWS: - -1. DEFINITIONS -“Affiliate” of a Party shall mean an entity (i) which is directly or indirectly -controlling such Party; (ii) which is under the same direct or indirect -ownership or control as such Party; or (iii) which is directly or indirectly -owned or controlled by such Party. For these purposes, an entity shall be -treated as being controlled by another if that other entity has fifty percent -(50 %) or more of the votes in such entity, is able to direct its affairs and/or -to control the composition of its board of directors or equivalent body. - -“Add-on Products” shall mean The Qt Company’s specific add-on software products -(for example Qt Safe Renderer, Qt for Automation, Qt Application Manager), which -are not licensed as part of The Qt Company’s standard offering, but shall be -included into the scope of Licensed Software only if so specifically agreed -between the Parties. - -“Applications” shall mean Licensee's software products created using the -Licensed Software, which may include the Redistributables, or part thereof. - -“Contractor(s)” shall mean third party consultants, distributors and contractors -performing services to a Party under applicable contractual arrangement. - -“Customer(s)” shall mean Licensee’s end users to whom Licensee, directly or -indirectly, distributes copies of the Redistributables. - -“Deployment Platforms” shall mean operating systems specified in the License -Certificate, in which the Redistributables can be distributed pursuant to the -terms and conditions of this Agreement. - -“Designated User(s)” shall mean the employee(s) of Licensee or Licensee’s -Affiliates acting within the scope of their employment or Licensee's Contractors -acting within the scope of their services for Licensee and on behalf of -Licensee. Designated Users shall be named in the License Certificate. - -“Development License” shall mean the license needed by the Licensee for each -Designated User to use the Licensed Software under the license grant described -in Section 3.1 of this Agreement. Development Licenses are available separately -for Qt for Application Development (desktop) and Qt for Device Creation -(embedded) products, each product having its designated scope and purpose of -use. Distribution Licenses are always connected to Qt for Device Creation -product only. - -“Development Platforms” shall mean those operating systems specified in the -License Certificate, in which the Licensed Software can be used under the -Development License, but not distributed in any form or used for any other -purpose. - -“Devices” shall mean hardware devices or products that 1) are manufactured -and/or distributed by the Licensee or its Affiliates or Contractors, and 2) -(i) incorporate or integrate the Redistributables or parts thereof; or (ii) do -not incorporate or integrate the Redistributables at the time of distribution, -but where, when used by a Customer, the main user interface or substantial -functionality of such device is provided by Application(s) or otherwise depends -on the Licensed Software. Devices shall be specified in Appendix 2 or in a -quote. - -“Distribution License(s)” shall mean the license required for distribution of -Redistributables in connection with Devices pursuant to license grant described -in Section 3.3 of this Agreement. - -“Distribution License Packs” shall mean set of prepaid Distribution Licenses for -distribution of Redistributables, as defined in The Qt Company’s standard price -list, quote, Purchase Order confirmation or in an appendix hereto, as the case -may be. - -“Intellectual Property Rights” shall mean patents (including utility models), -design patents, and designs (whether or not capable of registration), chip -topography rights and other like protection, copyrights, trademarks, service -marks, trade names, logos or other words or symbols and any other form of -statutory protection of any kind and applications for any of the foregoing as -well as any trade secrets. - -“License Certificate” shall mean a certificate generated by The Qt Company for -each Designated User respectively upon them downloading the Licensed Software. -License Certificate will be available under respective Designated User’s Qt -Account at account.qt.io and it will specify the Designated User, the -Development Platforms, Deployment Platforms and the License Term. The terms of -the License Certificate are considered part of this Agreement and shall be -updated from time to time to reflect any agreed changes to the foregoing terms -relating to Designated User’s rights to the Licensed Software. - -“License Fee” shall mean the fee charged to the Licensee for rights granted -under the terms of this Agreement. - -“License Term” shall mean the agreed validity period of the Development License -of the respective Designated User, during which time the Designated User is -entitled to use the Licensed Software, as set forth in the respective License -Certificate. - -“Licensed Software” shall mean either -(i) Qt for Application Development or -(ii) Qt for Device Creation, and/or -(iii) Qt 3D Studio, and/or -(iv) Qt Design Studio, and/or -(v) selected Add-on Products, if any, depending on which product(s) the - Licensee has purchased under this Agreement, - -as well as corresponding online or electronic documentation, associated media -and printed materials, including the source code, example programs and the -documentation, licensed to the Licensee under this Agreement. Licensed Software -does not include Third Party Software (as defined in Section 4) or Open Source -Qt. The Qt Company may, in the course of its development activities, at its free -and absolute discretion and without any obligation to send or publish any -notifications to the Licensee or in general, make changes, additions or -deletions in the components and functionalities of the Licensed Software, -provided that no such changes, additions or deletions will affect the already -released version of the Licensed Software, but only upcoming version(s). - -“Licensee” shall mean the individual or legal entity that is party to this -Agreement, as identified on the signature page hereof. - -“Licensee’s Records” shall mean books and records that are likely to contain -information bearing on Licensee’s compliance with this Agreement or the payments -due to The Qt Company under this Agreement, including, but not limited to: -assembly logs, sales records and distribution records. - -“Modified Software” shall have the meaning as set forth in Section 2.3. - -“Online Services” shall mean any services or access to systems made available by -The Qt Company to the Licensee over the Internet relating to the Licensed -Software or for the purpose of use by the Licensee of the Licensed Software or -Support. Use of any such Online Services is discretionary for the Licensee and -some of them may be subject to additional fees. - -“Open Source Qt” shall mean the non-commercial Qt computer software products, -licensed under the terms of the GNU Lesser General Public License, version 2.1 -or later (“LGPL”) or the GNU General Public License, version 2.0 or later -(“GPL”). For clarity, Open Source Qt shall not be provided nor governed under -this Agreement. - -”Party” or “Parties” shall mean Licensee and/or The Qt Company. - -“Qt 3D Studio” shall mean all versions of The Qt Company’s Qt 3D Studio, a 3D -user interface design and development environment for rapid designing and -prototyping of animated user interfaces. - -“Qt Design Studio” shall mean all versions of The Qt Company’s Qt Design Studio -tool, a 2D user interface design and development environment for rapid designing -and prototyping of animated user interfaces. - -“Qt for Application Development” shall mean The Qt Company’s productized -offering, which consist of all versions of -(i) Qt Toolkit, and -(ii) Qt Tools/Applications. - -“Qt for Device Creation” shall mean The Qt Company’s productized offering, -which consist of all versions of -(i) Qt for Application Development, and -(ii) Software components specific to embedded software development as set forth - in Appendix 1, Sections 1b and 1d. - -“Qt Toolkit” shall mean the modules defined in Appendix 1, Section 1a. - -“Qt Tools/Applications” shall mean the tools defined in Appendix 1, Section 1c. - -"Redistributables" shall mean the portions of the Licensed Software set forth in -Appendix 1, Section 2 that may be distributed pursuant to the terms of this -Agreement in object code form only, including any relevant documentation. Where -relevant, any reference to Licensed Software in this Agreement shall include and -refer also to Redistributables. - -“Renewal Term” shall mean an extension of previous License Term as agreed -between the Parties. - -“Submitted Modified Software” shall have the meaning as set forth in -Section 2.3. - -“Support” shall mean standard developer support that is provided by The Qt -Company to assist Designated Users in using the Licensed Software in accordance -with The Qt Company’s standard support terms and as further defined in -Section 8 hereunder. - -“Taxes” shall have the meaning set forth in Section 10.5. - -“Term” shall have the meaning set forth in Section 12. - -“The Qt Company” shall mean: -(i) in the event Licensee is an individual residing in the United States or a - legal entity incorporated in the United States or having its headquarters - in the United States, The Qt Company Inc., a Delaware corporation with its - office at 2350 Mission College Blvd., Suite 1020, Santa Clara, CA 95054, - USA.; or -(ii) in the event the Licensee is an individual residing outside of the United - States or a legal entity incorporated outside of the United States or - having its registered office outside of the United States, The Qt Company - Ltd., a Finnish company with its registered office at Bertel Jungin aukio - D3A, 02600 Espoo, Finland. - -"Third Party Software " shall have the meaning set forth in Section 4. - -“Updates” shall mean a release or version of the Licensed Software containing -bug fixes, error corrections and other changes that are generally made available -to users of the Licensed Software that have contracted for Support. Updates are -generally depicted as a change to the digits following the decimal in the -Licensed Software version number. The Qt Company shall make Updates available to -the Licensee under the Support. Updates shall be considered as part of the -Licensed Software hereunder. - -“Upgrades” shall mean a release or version of the Licensed Software containing -enhancements and new features and are generally depicted as a change to the -first digit of the Licensed Software version number. In the event Upgrades are -provided to the Licensee under this Agreement, they shall be considered as part -of the Licensed Software hereunder. - -2. OWNERSHIP -2.1 Ownership of The Qt Company -The Licensed Software is protected by copyright laws and international copyright -treaties, as well as other intellectual property laws and treaties. The Licensed -Software is licensed, not sold. All The Qt Company's Intellectual Property -Rights are and shall remain the exclusive property of The Qt Company or its -licensors respectively. - -2.2 Ownership of Licensee -All the Licensee's Intellectual Property Rights are and shall remain the -exclusive property of the Licensee or its licensors respectively. All -Intellectual Property Rights to the Modified Software, Applications and Devices -shall remain with the Licensee and no rights thereto shall be granted by the -Licensee to The Qt Company under this Agreement (except as set forth in Section -2.3 below). - -2.3 Modified Software -Licensee may create bug-fixes, error corrections, patches or modifications to -the Licensed Software (“Modified Software”). Such Modified Software may break -the source or binary compatibility with the Licensed Software (including without -limitation through changing the application programming interfaces ("API") or by -adding, changing or deleting any variable, method, or class signature in the -Licensed Software and/or any inter-process protocols, services or standards in -the Licensed Software libraries). To the extent that Licensee’s Modified -Software so breaks source or binary compatibility with the Licensed Software, -Licensee acknowledges that The Qt Company's ability to provide Support may be -prevented or limited and Licensee's ability to make use of Updates may be -restricted. Licensee may, at its sole and absolute discretion, choose to submit -Modified Software to The Qt Company (“Submitted Modified Software”) in -connection with Licensee’s Support request, service request or otherwise. In the -event Licensee does so, then, Licensee hereby grants The Qt Company a -sublicensable, assignable, irrevocable, perpetual, worldwide, non-exclusive, -royalty-free and fully paid-up license, under all of Licensee’s Intellectual -Property Rights, to reproduce, adapt, translate, modify, and prepare derivative -works of, publicly display, publicly perform, sublicense, make available and -distribute such Submitted Modified Software as The Qt Company sees fit at its -free and absolute discretion. - -3. LICENSES GRANTED -3.1 Development with Licensed Software -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable license, valid for the -License Term, to use, modify and copy the Licensed Software by Designated Users -on the Development Platforms for the sole purposes of designing, developing, -demonstrating and testing Application(s) and/or Devices, and to provide thereto -related support and other related services to end-user Customers. Licensee may -install copies of the Licensed Software on an unlimited number of computers -provided that (i) only the Designated Users may use the Licensed Software, and -(ii) all Designated Users must have a valid Development License to use Licensed -Software. Licensee may at any time designate another Designated User to replace -a then-current Designated User by notifying The Qt Company in writing, provided -that any Designated User may be replaced only once during any six-month period. -Upon expiry of the initially agreed License Term, the respective License Terms -shall be automatically extended to one or more Renewal Term(s), unless and until -either Party notifies the other Party in writing that it does not wish to -continue the License Term, such notification to be provided to the other Party -no less than ninety (90) days before expiry of the respective License Term. -Unless otherwise agreed between the Parties, Renewal Term shall be of equal -length with the initial Term. Any such Renewal Term shall be subject to License -Fees agreed between the Parties or, if no advance agreement exists, subject to -The Qt Company’s standard pricing applicable at the commencement date of any -such Renewal Term. - -3.2 Distribution of Applications -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable, revocable (for cause -pursuant to this Agreement) right and license, valid for the Term, to (i) -distribute, by itself or through its Contractors, Redistributables as installed, -incorporated or integrated into Applications for execution on the Deployment -Platforms, and (ii) grant sublicenses to Redistributables, as distributed -hereunder, for Customers solely for Customer’s internal use and to the extent -necessary in order for the Customers to use the Applications for their -respective intended purposes. -Right to distribute the Redistributables as part of an Application as provided -herein is not royalty-bearing but is conditional upon the Licensee having paid -the agreed Development Licenses from The Qt Company before distributing any -Redistributables to Customers. - -3.3 Distribution of Devices -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable, revocable (for cause -pursuant to this Agreement) right and license, valid for the Term, to (i) -distribute, by itself or through one or more tiers of Contractors, -Redistributables as installed, incorporated or integrated, or intended to be -installed, incorporated or integrated into Devices for execution on the -Deployment Platforms, and (ii) grant sublicenses to Redistributables, as -distributed hereunder, for Customers solely for Customer’s internal use and to -the extent necessary in order for the Customers to use the Devices for their -respective intended purposes. -Right to distribute the Redistributables with Devices as provided herein is -conditional upon the Licensee having purchased and paid the appropriate amount -of Development Licenses for Qt for Device Creation product and Distribution -Licenses from The Qt Company before distributing any Redistributables to -Customers. - -3.4 Further Requirements -The licenses granted above in this Section 3 by The Qt Company to Licensee are -conditional and subject to Licensee's compliance with the following terms: -(i) Licensee shall not remove or alter any copyright, trademark or other - proprietary rights notice contained in any portion of the Licensed - Software; -(ii) Applications must add primary and substantial functionality to the - Licensed Software; -(iii) Applications may not pass on functionality which in any way makes it - possible for others to create software with the Licensed Software; - provided however that Licensee may use the Licensed Software's scripting - and QML ("Qt Quick") functionality solely in order to enable scripting, - themes and styles that augment the functionality and appearance of the - Application(s) without adding primary and substantial functionality to - the Application(s); -(iv) Applications must not compete with the Licensed Software; -(v) Licensee shall not use The Qt Company's or any of its suppliers' names, - logos, or trademarks to market Applications, except that Licensee may use - “Built with Qt” logo to indicate that Application(s) was developed using - the Licensed Software; -(vi) Licensee shall not distribute, sublicense or disclose source code of - Licensed Software to any third party (provided however that Licensee may - appoint employee(s) of Contractors as Designated Users to use Licensed - Software pursuant to this Agreement). Such right may be available for the - Licensee subject to a separate software development kit (“SDK”) license - agreement to be concluded with The Qt Company; -(vii) Licensee shall not grant the Customers a right to (i) make copies of the - Redistributables except when and to the extent required to use the - Applications and/or Devices for their intended purpose, (ii) modify the - Redistributables or create derivative works thereof, (iii) decompile, - disassemble or otherwise reverse engineer Redistributables, or (iv) - redistribute any copy or portion of the Redistributables to any third - party, except as part of the onward sale of the Device on which the - Redistributables are installed; -(viii) Licensee shall not and shall cause that its Affiliates or Contractors - shall not a) in any way combine, incorporate or integrate Licensed - Software with, or use Licensed Software for creation of, any software - created with or incorporating Open Source Qt, or b) incorporate or - integrate Applications into a hardware device or product other than a - Device, unless Licensee has received an advance written permission from - The Qt Company to do so. Absent such written permission, any and all - distribution by the Licensee during the Term of a hardware device or - product a) which incorporate or integrate any part of Licensed Software - or Open Source Qt; or b) where the main user interface or substantial - functionality is provided by software built with Licensed Software or - Open Source Qt or otherwise depends on the Licensed Software or Open - Source Qt, shall be considered as a Device distribution under this - Agreement and dependent on compliance thereof (including but not limited - to obligation to pay applicable License Fees for such distribution). - Notwithstanding what is provided above in this sub-section (viii), - Licensee is entitled to use and combine Qt 3D Studio and/or Qt Design - Studio with Open Source Qt (“Combination”) for its internal evaluation - purposes, provided that Licensee shall in no way transfer, publish, - disclose, display or otherwise make available any software or work - resulting from such Combination; -(ix) Licensee shall cause all of its Affiliates and Contractors entitled to - make use of the licenses granted under this Agreement, to be - contractually bound to comply with the relevant terms of this Agreement - and not to use the Licensed Software beyond the terms hereof and for any - purposes other than operating within the scope of their services for - Licensee. Licensee shall be responsible for any and all actions and - omissions of its Affiliates and Contractors relating to the Licensed - Software and use thereof (including but not limited to payment of all - applicable License Fees); -(x) Except when and to the extent explicitly provided in this Section 3, - Licensee shall not transfer, publish, disclose, display or otherwise - make available the Licensed Software; -; and -(xi) Licensee shall not attempt or enlist a third party to conduct or attempt - to conduct any of the above. - -Above terms shall not be applicable if and to the extent they conflict with any -mandatory provisions of any applicable laws. Any use of Licensed Software beyond -the provisions of this Agreement is strictly prohibited and requires an -additional license from The Qt Company. - -4. THIRD PARTY SOFTWARE -The Licensed Software may provide links to third party libraries or code -(collectively "Third Party Software") to implement various functions. Third -Party Software does not comprise part of the Licensed Software. In some cases, -access to Third Party Software may be included in the Licensed Software. Such -Third Party Software will be listed in the ".../src/3rdparty" source tree -delivered with the Licensed Software or documented in the Licensed Software, as -such may be amended from time to time. Licensee acknowledges that use or -distribution of Third Party Software is in all respects subject to applicable -license terms of applicable third party right holders. - -5. PRE-RELEASE CODE -The Licensed Software may contain pre-release code and functionality marked or -otherwise stated as “Technology Preview”, “Alpha”, “Beta” or similar -designation. Such pre-release code may be present in order to provide -experimental support for new platforms or preliminary versions of one or more -new functionalities. The pre-release code may not be at the level of performance -and compatibility of a final, generally available, product offering of the -Licensed Software. The pre-release parts of the Licensed Software may not -operate correctly, may contain errors and may be substantially modified by The -Qt Company prior to the first commercial product release, if any. The Qt Company -is under no obligation to make pre-release code commercially available, or -provide any Support or Updates relating thereto. The Qt Company assumes no -liability whatsoever regarding any pre-release code, but any use thereof is -exclusively at Licensee’s own risk and expense. For clarity, Licensee is -entitled to use such pre-release code pursuant to Section 3, just like other -Licensed Software, provided however that in the event Add-on Products are -included and available as such pre-release code, Licensee’s right to use such -Add-on Products is nevertheless subject to and conditional upon conclusion of -separate agreement with The Qt Company. - -6. LIMITED WARRANTY AND WARRANTY DISCLAIMER -The Qt Company hereby represents and warrants that it has the power and -authority to grant the rights and licenses granted to Licensee under this -Agreement. Except as set forth above, the Licensed Software is licensed to -Licensee "as is" and Licensee’s exclusive remedy and The Qt Company’s entire -liability for errors in the Licensed Software shall be limited, at The Qt -Company’s option, to correction of the error, replacement of the Licensed -Software or return of the applicable fees paid for the defective Licensed -Software for the time period during which the License is not able to utilize the -Licensed Software under the terms of this Agreement. - -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF -ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER -WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND -NON-INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES NOT -WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE’S REQUIREMENTS OR THAT -IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE -UNINTERRUPTED. ALL USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE -RISK OF AND RESPONSIBILITY OF LICENSEE. - -7. INDEMNIFICATION AND LIMITATION OF LIABILITY -7.1 Limitation of Liability -EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II) -BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO -EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY FOR ANY LOSS OF PROFIT, -LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, SPECIAL, -CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY KIND, -HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT. PARTIES -SPECIFICALLY AGREE THAT LICENSEE’S OBLIGATION TO PAY LICENSE AND OTHER FEES -CORRESPONDING TO ACTUAL USAGE OF LICENSED SOFTWARE HEREUNDER SHALL BE CONSIDERED -AS A DIRECT DAMAGE. EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL -MISCONDUCT, AND (II) BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY -APPLICABLE LAW, IN NO EVENT SHALL EITHER PARTY’S TOTAL AGGREGATE LIABILITY UNDER -THIS AGREEMENT EXCEED THE AGGREGATE LICENSE FEES PAID OR PAYABLE TO THE QT -COMPANY FROM LICENSEE DURING THE PERIOD OF TWELVE (12) MONTHS IMMEDIATELY -PRECEDING THE EVENT RESULTING IN SUCH LIABILITY. THE PROVISIONS OF THIS SECTION -7 ALLOCATE THE RISKS UNDER THIS AGREEMENT BETWEEN THE QT COMPANY AND LICENSEE -AND THE PARTIES HAVE RELIED UPON THE LIMITATIONS SET FORTH HEREIN IN DETERMINING -WHETHER TO ENTER INTO THIS AGREEMENT. - -7.2 Licensee´s Indemnification -Licensee shall indemnify and hold harmless The Qt Company from and against any -claim, injury, judgment, settlement, loss or expense, including attorneys' fees -related to: (a) Licensee’s misrepresentation in connection with The Qt Company -or the Licensed Software or breach of this Agreement, (b) the Application or -Device (except where such cause of liability is solely attributable to the -Licensed Software). - -8. SUPPORT, UPDATES AND ONLINE SERVICES -Upon due payment of the agreed License Fees the Licensee will be eligible to -receive Support and Updates and to use the Online Services during the License -Term, provided, however, that in the event the License Term is longer than 36 -months, Support is provided only for the first 12 months, unless the Parties -specifically otherwise agree. Unless otherwise decided by The Company at its -free and absolute discretion, Upgrades will not be included in the Support but -may be available subject to additional fees. From time to time The Qt Company -may change the Support terms, provided that during the respective ongoing -License Term the level of Support provided by The Qt Company may not be reduced -without the consent of the Licensee. Unless otherwise agreed, The Qt Company -shall not be responsible for providing any service or support to Customers. - -9. CONFIDENTIALITY -Each Party acknowledges that during the Term of this Agreement each Party may -receive information about the other Party's business, business methods, business -plans, customers, business relations, technology, and other information, -including the terms of this Agreement, that is confidential and of great value -to the other Party, and the value of which would be significantly reduced if -disclosed to third parties (“Confidential Information”). Accordingly, when a -Party (the “Receiving Party”) receives Confidential Information from the other -Party (the “Disclosing Party”), the Receiving Party shall only disclose such -information to employees and Contractors on a need to know basis, and shall -cause its employees and employees of its Affiliates to: (i) maintain any and all -Confidential Information in confidence; (ii) not disclose the Confidential -Information to a third party without the Disclosing Party's prior written -approval; and (iii) not, directly or indirectly, use the Confidential -Information for any purpose other than for exercising its rights and fulfilling -its responsibilities pursuant to this Agreement. Each Party shall take -reasonable measures to protect the Confidential Information of the other Party, -which measures shall not be less than the measures taken by such Party to -protect its own confidential and proprietary information. Obligation of -confidentiality shall not apply to information that (i) is or becomes generally -known to the public through no act or omission of the Receiving Party; (ii) was -in the Receiving Party's lawful possession prior to the disclosure hereunder and -was not subject to limitations on disclosure or use; (iii) is developed -independently by employees or Contractors of the Receiving Party or other -persons working for the Receiving Party who have not had access to the -Confidential Information of the Disclosing Party, as proven by the written -records of the Receiving Party; (iv) is lawfully disclosed to the Receiving -Party without restrictions, by a third party not under an obligation of -confidentiality; or (v) the Receiving Party is legally compelled to disclose, in -which case the Receiving Party shall notify the Disclosing Party of such -compelled disclosure and assert the privileged and confidential nature of the -information and cooperate fully with the Disclosing Party to limit the scope of -disclosure and the dissemination of disclosed Confidential Information to the -minimum extent necessary. The obligations under this Section 9 shall continue to -remain in force for a period of five (5) years after the last disclosure, and, -with respect to trade secrets, for so long as such trade secrets are protected -under applicable trade secret laws. - -10. FEES, DELIVERY AND PAYMENT -10.1 License Fees -License Fees are described in The Qt Company’s standard price list, quote or -Purchase Order confirmation or in an appendix hereto, as the case may be. The -License Fees shall not be refunded or claimed as a credit in any event or for -any reason whatsoever. - -10.2 Ordering Licenses -Licensee may purchase Development Licenses and Distribution Licenses pursuant to -agreed pricing terms or, if no specific pricing terms have been agreed upon, at -The Qt Company's standard pricing terms applicable at the time of purchase. -Licensee shall submit all purchase orders for Development Licenses and -Distribution Licenses to The Qt Company by email or any other method acceptable -to The Qt Company (each such order is referred to herein as a “Purchase Order”) -for confirmation, whereupon the Purchase Order shall become binding between the -Parties. - -10.3 Distribution License Packs -Unless otherwise agreed, Distribution Licenses shall be purchased by way of -Distribution License Packs. Upon due payment of the ordered Distribution License -Pack(s), the Licensee will have an account of Distribution Licenses available -for installing, bundling or integrating (all jointly “installing”) the -Redistributables with the Devices or for otherwise distributing the -Redistributables in accordance with this Agreement. Each time Licensee -“installs” or distributes a copy of Redistributables, then one Distribution -License is used, and Licensee’s account of available Distribution Licenses is -decreased accordingly. Licensee may “install” copies of the Redistributables so -long as Licensee has Distribution Licenses remaining on its account. -Redistributables will be deemed to have been “installed” into a Device when one -of the following circumstances shall have occurred: a) the Redistributables have -been loaded onto the Device and used outside of the Licensee’s premises or b) -the Device has been fully tested and placed into Licensee's inventory (or sold) -for the first time (i.e., Licensee will not be required to use (or pay for) more -than one Distribution License for each individual Device, e.g. in a situation -where a Device is returned to Licensee's inventory after delivery to a -distributor or sale to a Customer). In addition, if Licensee includes a back-up -copy of the Redistributables on a CD-ROM or other storage medium along with the -product, that backup copy of the Redistributables will not be deemed to have -been “installed” and will not require an additional Distribution License. - -10.4 Payment Terms -License Fees and any other charges under this Agreement shall be paid by -Licensee no later than thirty (30) days from the date of the applicable invoice -from The Qt Company. The Qt Company will submit an invoice to Licensee after the -date of this Agreement and/or after The Qt Company receives a Purchase Order -from Licensee. A late payment charge of the lower of (a) one percent per month; -or (b) the interest rate stipulated by applicable law, shall be charged on any -unpaid balances that remain past due. The Qt Company shall have the right to -suspend, terminate or withhold grants of all rights to the Licensed Software -hereunder, including but not limited to the Developer License, Distribution -License, and Support, should Licensee fail to make payment in timely fashion. - -10.5 Taxes -All License Fees and other charges payable hereunder are gross amounts but -exclusive of any value added tax, use tax, sales tax and other taxes, duties or -tariffs (“Taxes”). Such applicable Taxes shall be paid by Licensee, or, where -applicable, in lieu of payment of such Taxes, Licensee shall provide an -exemption certificate to The Qt Company and any applicable authority. - -11 RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS -11.1 Licensee’s Record-keeping -Licensee shall at all times maintain accurate and up-to-date written records of -Licensee’s activities related to the use of Licensed Software and distribution -of Redistributables. The records shall be adequate to determine Licensee’s -compliance with the provisions of this Agreement and to demonstrate the number -of Designated Users and Redistributables distributed by Licensee. The records -shall conform to good accounting practices reasonably acceptable to The Qt -Company. Licensee shall, within thirty (30) days from receiving The Qt Company’s -request to that effect, deliver to The Qt Company a report on Licensee’s usage -of Licensed Software, such report to contain information, in sufficient detail, -on (i) amount of users working with Licensed Software, (ii) copies of -Redistributables distributed by Licensee during that calendar quarter, (iii) -number of undistributed copies of Redistributables and corresponding number of -unused Distribution Licenses remaining on Licensee’s account, and (iv) any other -information as The Qt Company may reasonably require from time to time. - -11.2. The Qt Company’s Audit Rights -The Qt Company or an independent auditor acting on behalf of The Qt Company’s, -may, upon at least five (5) business days’ prior written notice and at its -expense, audit Licensee with respect to the use of the Redistributables, but not -more frequently than once during each 6-month period. Such audit may be -conducted by mail, electronic means or through an in-person visit to Licensee’s -place of business. Any such in-person audit shall be conducted during regular -business hours at Licensee's facilities and shall not unreasonably interfere -with Licensee's business activities. The Qt Company or the independent auditor -acting on behalf of The Qt Company shall be entitled to inspect Licensee’s -Records. All such Licensee’s Records and use thereof shall be subject to an -obligation of confidentiality under this Agreement. If an audit reveals that -Licensee is using the Licensed Software beyond scope of the licenses Licensee -has paid for, Licensee agrees to immediately pay The Qt Company any amounts owed -for such unauthorized use. -In addition, in the event the audit reveals a material violation of the terms of -this Agreement (underpayment of more than 5% of License Fees shall always be -deemed a material violation for purposes of this section), then the Licensee -shall pay The Qt Company's reasonable cost of conducting such audit. - -12 TERM AND TERMINATION -12.1 Term -This Agreement shall enter into force upon due acceptance by both Parties and -remain in force for as long as there is any Development License(s) in force -(“Term”), unless and until terminated pursuant to the terms of this Section 12. - -12.2 Termination by The Qt Company -The Qt Company shall have the right to terminate this Agreement upon thirty (30) -days prior written notice if the Licensee is in material breach of any -obligation of this Agreement and fails to remedy such breach within such notice -period. - -12.3 Mutual Right to Terminate -Either Party shall have the right to terminate this Agreement immediately upon -written notice in the event that the other Party becomes insolvent, files for -any form of bankruptcy, makes any assignment for the benefit of creditors, has a -receiver, administrative receiver or officer appointed over the whole or a -substantial part of its assets, ceases to conduct business, or an act equivalent -to any of the above occurs under the laws of the jurisdiction of the other -Party. - -12.4 Parties´ Rights and Duties upon Termination -Upon expiry or termination of the Agreement Licensee shall cease and shall cause -all Designated Users (including those of its Affiliates’ and Contractors’) to -cease using the Licensed Software and distribution of the Redistributables under -this Agreement. -Notwithstanding the above, in the event the Agreement expires or is terminated: -(i) as a result of The Qt Company choosing not to renew the Development - License(s) as set forth in Section 3.1, then all valid licenses possessed - by the Licensee at such date shall be extended to be valid in perpetuity - under the terms of this Agreement and Licensee is entitled to purchase - additional licenses as set forth in Section 10.2; or -(ii) for reason other than by The Qt Company pursuant to item (i) above or - pursuant to Section 12.2, then the Licensee is entitled, for a period of - six (6) months after the effective date of termination, to continue - distribution of Devices under the Distribution Licenses paid but unused at - such effective date of termination. Upon any such termination the Licensee - shall destroy or return to The Qt Company all copies of the Licensed - Software and all related materials and will certify the same to The Qt - Company upon its request, provided however that Licensee may retain and - exploit such copies of the Licensed Software as it may reasonably require - in providing continued support to Customers. -Expiry or termination of this Agreement for any reason whatsoever shall not -relieve Licensee of its obligation to pay any License Fees accrued or payable to -The Qt Company prior to the effective date of termination, and Licensee shall -immediately pay to The Qt Company all such fees upon the effective date of -termination. Termination of this Agreement shall not affect any rights of -Customers to continue use of Applications and Devices (and therein incorporated -Redistributables). - -12.5 Extension in case of bankruptcy -In the event The Qt Company is declared bankrupt under a final, non-cancellable -decision by relevant court of law, and this Agreement is not, at the date of -expiry of the Development License(s) pursuant to Section 3.1, assigned to party, -who has assumed The Qt Company’s position as a legitimate licensor of Licensed -Software under this Agreement, then all valid licenses possessed by the Licensee -at such date of expiry, and which the Licensee has not notified for expiry, -shall be extended to be valid in perpetuity under the terms of this Agreement. - -13. GOVERNING LAW AND LEGAL VENUE -In the event this Agreement is in the name of The Qt Company Inc., a Delaware -Corporation, then: -(i) this Agreement shall be construed and interpreted in accordance with the - laws of the State of California, USA, excluding its choice of law - provisions; -(ii) the United Nations Convention on Contracts for the International Sale of - Goods will not apply to this Agreement; and -(iii) any dispute, claim or controversy arising out of or relating to this - Agreement or the breach, termination, enforcement, interpretation or - validity thereof, including the determination of the scope or - applicability of this Agreement to arbitrate, shall be determined by - arbitration in San Francisco, USA, before one arbitrator. The arbitration - shall be administered by JAMS pursuant to JAMS' Streamlined Arbitration - Rules and Procedures. Judgment on the Award may be entered in any court - having jurisdiction. This Section shall not preclude parties from seeking - provisional remedies in aid of arbitration from a court of appropriate - jurisdiction. -In the event this Agreement is in the name of The Qt Company Ltd., a Finnish -Company, then: -(i) this Agreement shall be construed and interpreted in accordance with the - laws of Finland, excluding its choice of law provisions; -(ii) the United Nations Convention on Contracts for the International Sale of - Goods will not apply to this Agreement; and -(iii) any disputes, controversy or claim arising out of or relating to this - Agreement, or the breach, termination or validity thereof shall be shall - be finally settled by arbitration in accordance with the Arbitration Rules - of Finland Chamber of Commerce. The arbitration tribunal shall consist of - one (1), or if either Party so requires, of three (3), arbitrators. The - award shall be final and binding and enforceable in any court of competent - jurisdiction. The arbitration shall be held in Helsinki, Finland and the - process shall be conducted in the English language. This Section shall not - preclude parties from seeking provisional remedies in aid of arbitration - from a court of appropriate jurisdiction. - -14. GENERAL PROVISIONS -14.1 No Assignment -Except in the case of a merger or sale of substantially all of its corporate -assets, Licensee shall not be entitled to assign or transfer all or any of its -rights, benefits and obligations under this Agreement without the prior written -consent of The Qt Company, which shall not be unreasonably withheld or delayed. -The Qt Company shall be entitled to freely assign or transfer any of its rights, -benefits or obligations under this Agreement. - -14.2 No Third Party Representations -Licensee shall make no representations or warranties concerning the Licensed -Software on behalf of The Qt Company. Any representation or warranty Licensee -makes or purports to make on The Qt Company’s behalf shall be void as to The Qt -Company. - -14.3 Surviving Sections -Any terms and conditions that by their nature or otherwise reasonably should -survive termination of this Agreement shall so be deemed to survive. - -14.4 Entire Agreement -This Agreement, the exhibits hereto, the License Certificate and any applicable -Purchase Order constitute the complete agreement between the Parties and -supersedes all prior or contemporaneous discussions, representations, and -proposals, written or oral, with respect to the subject matters discussed -herein. -In the event of any conflict or inconsistency between this Agreement and any -Purchase Order, the terms of this Agreement will prevail over the terms of the -Purchase Order with respect to such conflict or inconsistency. -Parties specifically acknowledge and agree that this Agreement prevails over any -click-to-accept or similar agreements the Designated Users may need to accept -online upon download of the Licensed Software, as may be required by The Qt -Company’s applicable processes relating to Licensed Software. - -14.5 Modifications -No modification of this Agreement shall be effective unless contained in a -writing executed by an authorized representative of each Party. No term or -condition contained in Licensee's Purchase Order shall apply unless expressly -accepted by The Qt Company in writing. - -14.6 Force Majeure -Except for the payment obligations hereunder, neither Party shall be liable to -the other for any delay or non-performance of its obligations hereunder in the -event and to the extent that such delay or non-performance is due to an event of -act of God, terrorist attack or other similar unforeseeable catastrophic event -that prevents either Party for fulfilling its obligations under this Agreement -and which such Party cannot avoid or circumvent (“Force Majeure Event”). If the -Force Majeure Event results in a delay or non-performance of a Party for a -period of three (3) months or longer, then either Party shall have the right to -terminate this Agreement with immediate effect without any liability (except for -the obligations of payment arising prior to the event of Force Majeure) towards -the other Party. - -14.7 Notices -Any notice given by one Party to the other shall be deemed properly given and -deemed received if specifically acknowledged by the receiving Party in writing -or when successfully delivered to the recipient by hand, fax, or special courier -during normal business hours on a business day to the addresses specified for -each Party on the signature page. Each communication and document made or -delivered by one Party to the other Party pursuant to this Agreement shall be in -the English language. - -14.8 Export Control -Licensee acknowledges that the Redistributables may be subject to export control -restrictions under the applicable laws of respective countries. Licensee shall -fully comply with all applicable export license restrictions and requirements as -well as with all laws and regulations relating to the Redistributables and -exercise of licenses hereunder and shall procure all necessary governmental -authorizations, including without limitation, all necessary licenses, approvals, -permissions or consents, where necessary for the re-exportation of the -Redistributables, Applications and/or Devices. - -14.9 No Implied License -There are no implied licenses or other implied rights granted under this -Agreement, and all rights, save for those expressly granted hereunder, shall -remain with The Qt Company and its licensors. In addition, no licenses or -immunities are granted to the combination of the Licensed Software with any -other software or hardware not delivered by The Qt Company under this Agreement. - -14.10 Attorney Fees -The prevailing Party in any action to enforce this Agreement shall be entitled -to recover its attorney’s fees and costs in connection with such action. - -14.11 Severability -If any provision of this Agreement shall be adjudged by any court of competent -jurisdiction to be unenforceable or invalid, that provision shall be limited or -eliminated to the minimum extent necessary so that this Agreement shall -otherwise remain in full force and effect and enforceable. - - - -APPENDICES -The Agreement includes Appendix 1 as shown below. In addition, the Agreement may -include one or more of the Appendices 3-5 listed below depending on the -product(s) purchased by the Licensee, what is stated in the quote or invoice, -and/or what is stated on the License Certificate. - -  -APPENDIX 1: LICENSED SOFTWARE -1a. Licensed Software - Qt Toolkit -Module Description -Qt Core Core non-graphical classes used by other modules. -Qt GUI Base classes for graphical user interface (GUI) - components. -Qt Multimedia Classes for audio, video and camera functionality. -Qt Multimedia Widgets Widget-based classes for implementing multimedia - functionality. -Qt Network Classes to make network programming easier and more - portable. -Qt QML Classes for QML and JavaScript languages. -Qt Quick A declarative framework for building highly dynamic - applications with custom user interfaces. -Qt Quick Controls 2 Provides lightweight QML types for creating - performant user interfaces for desktop, embedded, and - mobile devices. -Qt Quick Dialogs Types for creating and interacting with system - dialogs from a Qt Quick application. -Qt Quick Layouts Layouts are items that are used to arrange Qt Quick 2 - based items in the user interface. -Qt Quick Test A unit test framework for QML applications. -Qt SQL Classes for database integration using SQL. -Qt Test Classes for unit testing Qt applications and - libraries. -Qt Widgets Classes to extend Qt GUI with C++ widgets. -Active Qt Classes for applications which use ActiveX and COM -Qt 3D Functionality for near-realtime simulation systems - with support for 2D and 3D rendering. -Qt Android Extras Provides platform-specific APIs for Android. -Qt Bluetooth Provides access to Bluetooth hardware. -Qt Canvas 3D Enables OpenGL-like 3D drawing calls from Qt Quick - applications using JavaScript. -Qt Concurrent Classes for writing multi-threaded programs without - using low-level threading primitives. -Qt D-Bus Classes for inter-process communication over the - D-Bus protocol. -Qt Gamepad Enables Qt applications to support the use of gamepad - hardware. -Qt Graphical Effects Graphical effects for use with Qt Quick 2. -Qt Help Classes for integrating documentation into - applications, similar to Qt Assistant. -Qt Image Formats Plugins for additional image formats: TIFF, MNG, TGA, - WBMP. -Qt Location Displays map, navigation, and place content in a QML - application. -Qt Mac Extras Provides platform-specific APIs for macOS. -Qt Network Authorization Provides support for OAuth-based authorization to - online services. -Qt NFC Provides access to Near-Field communication (NFC) - hardware. -Qt Platform Headers Provides classes that encapsulate platform-specific - information. -Qt Positioning Provides access to position, satellite and area - monitoring classes. -Qt Print Support Classes to make printing easier and more portable. -Qt Purchasing Enables in-app purchase of products in Qt - applications. -Qt for Python Python bindings for Qt. -Qt Quick Controls Reusable Qt Quick based UI controls to create classic - desktop-style user interfaces. -Qt Quick Extras Provides a specialized set of controls that can be - used to build interfaces in Qt Quick. -Qt Quick Widgets Provides a C++ widget class for displaying a Qt - Quick user interface. -Qt SCXML Provides classes and tools for creating state - machines from SCXML files. -Qt Sensors Provides access to sensor hardware and motion gesture - recognition. -Qt Serial Bus Provides access to serial industrial bus interface. -Qt Serial Port Provides access to hardware and virtual serial ports. -Qt Speech Provides support for accessibility features such as - text-to-speech. -Qt SVG Classes for displaying the contents of SVG files. -Qt UI Tools Classes for loading QWidget based forms created in Qt - Designer dynamically, at runtime. -Qt WebChannel Provides access to QObject or QML objects from HTML - clients for seamless integration of Qt applications - with HTML/JavaScript clients. -Qt WebEngine Classes and functions for embedding web content in - applications using the Chromium browser project. -Qt WebSockets Provides WebSocket communication. -Qt WebView Displays web content in a QML application by using - APIs native to the platform. -Qt Windows Extras Provides platform-specific APIs for Windows. -Qt X11 Extras Provides platform-specific APIs for X11. -Qt XML C++ implementations of SAX and DOM. -Qt XML Patterns Support for XPath, XQuery, XSLT and XML schema - validation. -Qt Wayland Compositor Provides a framework to develop a Wayland compositor. -Qt Charts UI Components for displaying charts. -Qt Data Visualization UI Components for creating 3D data visualizations. -Qt Virtual Keyboard A framework for implementing different input methods - as well as a QML virtual keyboard. - -1b. Licensed software – Embedded software development libraries -Module Description -Boot 2 Qt stack Yocto based Embedded Linux stack for selected - target hardware -Qt OTA Client-side capability for device image - updates Over The Air. -Device Utilities Collection of API’s to manage the device; - E.g. display, WiFi and Bluetooth settings. -Qt Debugging Bridge (QDB) Daemon Enables host-target deployment, debugging, - profiling and other features over USB. Up to - developer to decide if this is left in the - final solution. - -1c. Licensed Software - Qt Tools/Applications -Tool Description -Qt Creator The integrated development environment for Qt. -Qt Designer Qt tool for designing and building graphical user interfaces. -Qt Linguist Tool used to add translations to Qt applications. -Qt Assistant Tool for viewing online documentation in Qt help-file format. -Qmake Utility tool used to automate the generation of make files. -uic User interface compiler for the Qt GUI toolkit. -rcc Resource compiler used for embedding resources into Qt - applications. -lupdate Tool that finds the translatable strings in the specified source, - header and Qt Designer interface files, and produces or updates - translation files. -lrelease Tool that produces translation files in the compact binary format - used by localized Qt applications. -qlalr Qt parser generator tool. -qdoc Configurable documentation generation tool. -qmlscene QML launcher tool -qmlviewer QML launcher tool - -1d. Licensed software –Qt Tools/Applications specific to embedded software -development -Tool Description -Target toolchains Cross compilation toolchains for - supported target devices and operating - systems -Qt Debugging Bridge (QDB) Host Tools Enables deployment, debugging, - profiling and other features over USB - from development host PC to target - device. -qtconfig-gui Qt Lite Configurator tool graphical - interface -Qt Emulator Qt emulator - -2. Parts of the Licensed Software that are permitted for distribution in -object-code form only (“Redistributables”) under this Agreement: - -2a. Qt for Application Development -(i) The Licensed Software's Qt Toolkit libraries defined in 1a -(ii) The Licensed Software's installer framework - -2b. Qt for Device Creation -(i) Qt for Application Development Redistributables defined in 2a -(ii) The Licensed Software’s Embedded software development libraries defined in - 1b - -2c. Qt 3D Studio -The Licensed Software’s Qt 3D Studio Runtime (“Qt53DStudioRuntime2”) - - -APPENDIX 3: ADDITIONS TO LICENSED SOFTWARE -In addition to what is provided under the definition of the Licensed Software, -Parties agree that Licensed Software shall also include the following additional -software products of The Qt Company if included in the quote / invoice: -Qt for Automation - - MQTT software protocol libraries - - KNX software protocol libraries - - OPCUA (open source backend) - - OPCUA (Unified Automation backend) -Qt Safe Renderer - - Qt Safe Renderer library -Qt Application Manager - - Qt Application Manager library with Qt Creator integration - -All the above is considered as Redistributables and subject to applicable -provisions and limitations including but not limited to what is defined in -Section 3. - - -APPENDIX 4: SMALL BUSINESS AND START-UP APPENDIX -The provisions of this Appendix 4 are applicable for Start-up Companies and for -the Evaluation Term. -For the purpose of this Appendix 4, the following additional definitions shall -be applicable: - “Trial Term” shall mean a period of twelve (12) months. - “Start-up Company” means a company with a maximum annual revenue, including - funding, equivalent to 100,000 USD (in applicable currency) during a respective - calendar year, as evidenced by duly audited records of the Licensee and - approved by The Qt Company. - -During the Trial Term, Section 3 shall apply with following modifications -(“Trial Term Modifications”): - - Licenses granted under Sections 3.1 and 3.2 shall be free of any charge. For - clarity, License for distribution of Devices pursuant to Section 3.3 is - subject to applicable License Fee for necessary Distribution Licenses; - - Development License under Section 3.1 is limited to a maximum of three (3) - Designated Users; and - - Support is available subject to availability, as judged by The Qt Company at - its free and absolute discretion. - -Upon expiry of the Trial Term: - a) This Appendix 4 is terminated, Trial Term Modifications cease to remain in - force, Licensee’s Development Licenses shall be automatically converted into - licenses subject to a License Fee (in the amount specified in the quote or - in Appendix 2 and payable with a 30-day payment term) and Licensee’s rights - and obligations under this Agreement shall continue to remain in force under - the standard provisions of the Agreement, unless the Licensee notifies The - Qt Company in writing no less than ninety (90) days before such expiry date - that Licensee does not agree to such continuance, in which event the - Agreement, and all rights of the Licensee thereunder, shall expire; provided - however that - b) in the event the Licensee still qualifies as a Start-up Company, the - Licensee has an option (“Option”), instead of what is stated in item a) - above, to extend the Trial Term renewal is limited to one time and total - duration of Trial Terms thus to 24 months after the effective date. Licensee - shall notify The Qt Company in writing no less than ninety (90) days before - the expiry date, if Licensee wish to exercise the Option. - - -APPENDIX 5: NON-COMMERCIAL USE APPENDIX -The provisions of this Appendix 5 are applicable for non-commercial use of the -Licensed Software by the Licensee. -For the purpose of this Appendix 5, the following additional definitions -(replacing the relevant definition of the Agreement, where applicable) shall be -applicable: - “Demo Units” shall mean (i) hardware development platform, which incorporates - the Licensed Software along with Licensee’s software and/or hardware, and - (ii) prototype versions of Applications or Devices. - “Designated User(s)” shall mean the employees and students of the Licensee. - “Licensee Products” shall mean Applications and/or Devices. - “Permitted Purpose” shall mean (i) Licensee’s internal evaluation and testing - of Licensed Software, (ii) building Demo Units as well as (iii) educational - use. - “Term” shall mean a period of twelve (12) months or any such other period as - may be agreed between the Parties. - -For the purpose of this Appendix 5, the following changes shall be agreed with -respect to relevant Sections of the Agreement: - I. Recital (A) shall be replaced in its entirety to read as follows: “(A) - Licensee wishes to use the Licensed Software for the Permitted Purpose.” - II. Section 3.1 shall be replaced in its entirety to read as follows: - “The Qt Company grants to Licensee a personal, non-exclusive, - non-transferable, revocable, royalty-free license, valid for the Term, to - use, modify and copy the Licensed Software solely for the Permitted - Purpose. Licensee may install copies of the Licensed Software on an - unlimited number of computers provided that only Designated Users may use - the Licensed Software. Licensee may demonstrate the Demo Units, provided - that such demonstrations must be conducted by Licensee, and the Demo Units - must remain in Licensee’s possession and under Licensee’s control at all - times. For clarity, this Agreement does not (i) entitle Licensee to use - Licensed Software to create Applications or Devices (other than prototypes - thereof) or (ii) carry any distribution rights to Licensee, but such - rights are subject to and conditional upon conclusion of a separate - license agreement with The Qt Company.” - III. Sections 3.2, 3.3, 8 and 10 shall be deleted. - IV. Section 3.4 shall be replaced in its entirety to read as follows: - “Licensee shall not: - - remove or alter any copyright, trademark or other proprietary rights - notice contained in any portion of the Licensed Software; - - transfer, publish, sublicense, disclose, display or otherwise make - the Licensed Software available to any third party (except that - Licensee may demonstrate the Demo Units pursuant to Section 3.1); - - in any way combine, incorporate or integrate Licensed Software with, or - use Licensed Software for creation of, any software created with or - incorporating Open Source Qt; - Licensee shall cause all Designated Users who make use of the licenses - granted under this Agreement, to be contractually bound to comply with - the relevant terms of this Agreement and not to use the Licensed - Software beyond the terms hereof. Licensee shall be responsible for any - and all actions and omissions of its Designated Users relating to the - Licensed Software and use thereof. Any use of Licensed Software beyond - the provisions of this Agreement is strictly prohibited and requires an - additional license from The Qt Company.” - V. Section 12 shall be replaced in its entirety to read as follows: - “This Agreement shall enter into force upon due acceptance by both Parties - and remain in force for the Term, unless and until terminated pursuant to - the terms of Section 12. Upon termination of the Agreement, Licensee shall - cease using the Licensed Software. All other copies of Licensed Software - in the possession or control of Licensee must be erased or destroyed. An - officer of Licensee must, upon request, promptly deliver to The Qt Company - a written confirmation that this has occurred.” - -Except for the modifications specified above, this Appendix carries no change to -the terms of the Agreement which shall remain in full force. diff -Nru qtcharts-opensource-src-5.12.5/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT qtcharts-opensource-src-5.9.5/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT --- qtcharts-opensource-src-5.12.5/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT 2019-09-06 12:05:48.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT 1970-01-01 00:00:00.000000000 +0000 @@ -1,1089 +0,0 @@ -QT LICENSE AGREEMENT -Agreement version 4.1 -This License Agreement (“Agreement”) is a legal agreement between The Qt Company -(as defined below) and the Licensee (as defined below) for the license of -Licensed Software (as defined below). Capitalized terms used herein are defined -in Section 1. -WHEREAS: - -(A) Licensee wishes to use the Licensed Software for the purpose of developing - and distributing Applications and/or Devices; and -(B) The Qt Company is willing to grant the Licensee a right to use Licensed - Software for such purpose pursuant to term and conditions of this Agreement. - -NOW, THEREFORE, THE PARTIES HEREBY AGREE AS FOLLOWS: - -1. DEFINITIONS -“Affiliate” of a Party shall mean an entity (i) which is directly or indirectly -controlling such Party; (ii) which is under the same direct or indirect -ownership or control as such Party; or (iii) which is directly or indirectly -owned or controlled by such Party. For these purposes, an entity shall be -treated as being controlled by another if that other entity has fifty percent -(50 %) or more of the votes in such entity, is able to direct its affairs and/or -to control the composition of its board of directors or equivalent body. - -“Add-on Products” shall mean The Qt Company’s specific add-on software products -(for example Qt Safe Renderer, Qt for Automation, Qt Application Manager), which -are not licensed as part of The Qt Company’s standard offering, but shall be -included into the scope of Licensed Software only if so specifically agreed -between the Parties. - -“Applications” shall mean Licensee's software products created using the -Licensed Software, which may include the Redistributables, or part thereof. - -“Contractor(s)” shall mean third party consultants, distributors and contractors -performing services to a Party under applicable contractual arrangement. - -“Customer(s)” shall mean Licensee’s end users to whom Licensee, directly or -indirectly, distributes copies of the Redistributables. - -“Deployment Platforms” shall mean operating systems specified in the License -Certificate, in which the Redistributables can be distributed pursuant to the -terms and conditions of this Agreement. - -“Designated User(s)” shall mean the employee(s) of Licensee or Licensee’s -Affiliates acting within the scope of their employment or Licensee's Contractors -acting within the scope of their services for Licensee and on behalf of -Licensee. Designated Users shall be named in the License Certificate. - -“Development License” shall mean the license needed by the Licensee for each -Designated User to use the Licensed Software under the license grant described -in Section 3.1 of this Agreement. Development Licenses are available separately -for Qt for Application Development (desktop) and Qt for Device Creation -(embedded) products, each product having its designated scope and purpose of -use. Distribution Licenses are always connected to Qt for Device Creation -product only. - -“Development Platforms” shall mean those operating systems specified in the -License Certificate, in which the Licensed Software can be used under the -Development License, but not distributed in any form or used for any other -purpose. - -“Devices” shall mean hardware devices or products that 1) are manufactured -and/or distributed by the Licensee or its Affiliates or Contractors, and 2) -(i) incorporate or integrate the Redistributables or parts thereof; or (ii) do -not incorporate or integrate the Redistributables at the time of distribution, -but where, when used by a Customer, the main user interface or substantial -functionality of such device is provided by Application(s) or otherwise depends -on the Licensed Software. Devices shall be specified in Appendix 2 or in a -quote. - -“Distribution License(s)” shall mean the license required for distribution of -Redistributables in connection with Devices pursuant to license grant described -in Section 3.3 of this Agreement. - -“Distribution License Packs” shall mean set of prepaid Distribution Licenses for -distribution of Redistributables, as defined in The Qt Company’s standard price -list, quote, Purchase Order confirmation or in an appendix hereto, as the case -may be. - -“Intellectual Property Rights” shall mean patents (including utility models), -design patents, and designs (whether or not capable of registration), chip -topography rights and other like protection, copyrights, trademarks, service -marks, trade names, logos or other words or symbols and any other form of -statutory protection of any kind and applications for any of the foregoing as -well as any trade secrets. - -“License Certificate” shall mean a certificate generated by The Qt Company for -each Designated User respectively upon them downloading the Licensed Software. -License Certificate will be available under respective Designated User’s Qt -Account at account.qt.io and it will specify the Designated User, the -Development Platforms, Deployment Platforms and the License Term. The terms of -the License Certificate are considered part of this Agreement and shall be -updated from time to time to reflect any agreed changes to the foregoing terms -relating to Designated User’s rights to the Licensed Software. - -“License Fee” shall mean the fee charged to the Licensee for rights granted -under the terms of this Agreement. - -“License Term” shall mean the agreed validity period of the Development License -of the respective Designated User, during which time the Designated User is -entitled to use the Licensed Software, as set forth in the respective License -Certificate. - -“Licensed Software” shall mean either -(i) Qt for Application Development or -(ii) Qt for Device Creation, and/or -(iii) Qt 3D Studio, and/or -(iv) Qt Design Studio, and/or -(v) selected Add-on Products, if any, depending on which product(s) the - Licensee has purchased under this Agreement, - -as well as corresponding online or electronic documentation, associated media -and printed materials, including the source code, example programs and the -documentation, licensed to the Licensee under this Agreement. Licensed Software -does not include Third Party Software (as defined in Section 4) or Open Source -Qt. The Qt Company may, in the course of its development activities, at its free -and absolute discretion and without any obligation to send or publish any -notifications to the Licensee or in general, make changes, additions or -deletions in the components and functionalities of the Licensed Software, -provided that no such changes, additions or deletions will affect the already -released version of the Licensed Software, but only upcoming version(s). - -“Licensee” shall mean the individual or legal entity that is party to this -Agreement, as identified on the signature page hereof. - -“Licensee’s Records” shall mean books and records that are likely to contain -information bearing on Licensee’s compliance with this Agreement or the payments -due to The Qt Company under this Agreement, including, but not limited to: -assembly logs, sales records and distribution records. - -“Modified Software” shall have the meaning as set forth in Section 2.3. - -“Online Services” shall mean any services or access to systems made available by -The Qt Company to the Licensee over the Internet relating to the Licensed -Software or for the purpose of use by the Licensee of the Licensed Software or -Support. Use of any such Online Services is discretionary for the Licensee and -some of them may be subject to additional fees. - -“Open Source Qt” shall mean the non-commercial Qt computer software products, -licensed under the terms of the GNU Lesser General Public License, version 2.1 -or later (“LGPL”) or the GNU General Public License, version 2.0 or later -(“GPL”). For clarity, Open Source Qt shall not be provided nor governed under -this Agreement. - -”Party” or “Parties” shall mean Licensee and/or The Qt Company. - -“Qt 3D Studio” shall mean all versions of The Qt Company’s Qt 3D Studio, a 3D -user interface design and development environment for rapid designing and -prototyping of animated user interfaces. - -“Qt Design Studio” shall mean all versions of The Qt Company’s Qt Design Studio -tool, a 2D user interface design and development environment for rapid designing -and prototyping of animated user interfaces. - -“Qt for Application Development” shall mean The Qt Company’s productized -offering, which consist of all versions of -(i) Qt Toolkit, and -(ii) Qt Tools/Applications. - -“Qt for Device Creation” shall mean The Qt Company’s productized offering, -which consist of all versions of -(i) Qt for Application Development, and -(ii) Software components specific to embedded software development as set forth - in Appendix 1, Sections 1b and 1d. - -“Qt Toolkit” shall mean the modules defined in Appendix 1, Section 1a. - -“Qt Tools/Applications” shall mean the tools defined in Appendix 1, Section 1c. - -"Redistributables" shall mean the portions of the Licensed Software set forth in -Appendix 1, Section 2 that may be distributed pursuant to the terms of this -Agreement in object code form only, including any relevant documentation. Where -relevant, any reference to Licensed Software in this Agreement shall include and -refer also to Redistributables. - -“Renewal Term” shall mean an extension of previous License Term as agreed -between the Parties. - -“Submitted Modified Software” shall have the meaning as set forth in -Section 2.3. - -“Support” shall mean standard developer support that is provided by The Qt -Company to assist Designated Users in using the Licensed Software in accordance -with The Qt Company’s standard support terms and as further defined in -Section 8 hereunder. - -“Taxes” shall have the meaning set forth in Section 10.5. - -“Term” shall have the meaning set forth in Section 12. - -“The Qt Company” shall mean: -(i) in the event Licensee is an individual residing in the United States or a - legal entity incorporated in the United States or having its headquarters - in the United States, The Qt Company Inc., a Delaware corporation with its - office at 2350 Mission College Blvd., Suite 1020, Santa Clara, CA 95054, - USA.; or -(ii) in the event the Licensee is an individual residing outside of the United - States or a legal entity incorporated outside of the United States or - having its registered office outside of the United States, The Qt Company - Ltd., a Finnish company with its registered office at Bertel Jungin aukio - D3A, 02600 Espoo, Finland. - -"Third Party Software " shall have the meaning set forth in Section 4. - -“Updates” shall mean a release or version of the Licensed Software containing -bug fixes, error corrections and other changes that are generally made available -to users of the Licensed Software that have contracted for Support. Updates are -generally depicted as a change to the digits following the decimal in the -Licensed Software version number. The Qt Company shall make Updates available to -the Licensee under the Support. Updates shall be considered as part of the -Licensed Software hereunder. - -“Upgrades” shall mean a release or version of the Licensed Software containing -enhancements and new features and are generally depicted as a change to the -first digit of the Licensed Software version number. In the event Upgrades are -provided to the Licensee under this Agreement, they shall be considered as part -of the Licensed Software hereunder. - -2. OWNERSHIP -2.1 Ownership of The Qt Company -The Licensed Software is protected by copyright laws and international copyright -treaties, as well as other intellectual property laws and treaties. The Licensed -Software is licensed, not sold. All The Qt Company's Intellectual Property -Rights are and shall remain the exclusive property of The Qt Company or its -licensors respectively. - -2.2 Ownership of Licensee -All the Licensee's Intellectual Property Rights are and shall remain the -exclusive property of the Licensee or its licensors respectively. All -Intellectual Property Rights to the Modified Software, Applications and Devices -shall remain with the Licensee and no rights thereto shall be granted by the -Licensee to The Qt Company under this Agreement (except as set forth in Section -2.3 below). - -2.3 Modified Software -Licensee may create bug-fixes, error corrections, patches or modifications to -the Licensed Software (“Modified Software”). Such Modified Software may break -the source or binary compatibility with the Licensed Software (including without -limitation through changing the application programming interfaces ("API") or by -adding, changing or deleting any variable, method, or class signature in the -Licensed Software and/or any inter-process protocols, services or standards in -the Licensed Software libraries). To the extent that Licensee’s Modified -Software so breaks source or binary compatibility with the Licensed Software, -Licensee acknowledges that The Qt Company's ability to provide Support may be -prevented or limited and Licensee's ability to make use of Updates may be -restricted. Licensee may, at its sole and absolute discretion, choose to submit -Modified Software to The Qt Company (“Submitted Modified Software”) in -connection with Licensee’s Support request, service request or otherwise. In the -event Licensee does so, then, Licensee hereby grants The Qt Company a -sublicensable, assignable, irrevocable, perpetual, worldwide, non-exclusive, -royalty-free and fully paid-up license, under all of Licensee’s Intellectual -Property Rights, to reproduce, adapt, translate, modify, and prepare derivative -works of, publicly display, publicly perform, sublicense, make available and -distribute such Submitted Modified Software as The Qt Company sees fit at its -free and absolute discretion. - -3. LICENSES GRANTED -3.1 Development with Licensed Software -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable license, valid for the -License Term, to use, modify and copy the Licensed Software by Designated Users -on the Development Platforms for the sole purposes of designing, developing, -demonstrating and testing Application(s) and/or Devices, and to provide thereto -related support and other related services to end-user Customers. Licensee may -install copies of the Licensed Software on an unlimited number of computers -provided that (i) only the Designated Users may use the Licensed Software, and -(ii) all Designated Users must have a valid Development License to use Licensed -Software. Licensee may at any time designate another Designated User to replace -a then-current Designated User by notifying The Qt Company in writing, provided -that any Designated User may be replaced only once during any six-month period. -Upon expiry of the initially agreed License Term, the respective License Terms -shall be automatically extended to one or more Renewal Term(s), unless and until -either Party notifies the other Party in writing that it does not wish to -continue the License Term, such notification to be provided to the other Party -no less than ninety (90) days before expiry of the respective License Term. -Unless otherwise agreed between the Parties, Renewal Term shall be of equal -length with the initial Term. Any such Renewal Term shall be subject to License -Fees agreed between the Parties or, if no advance agreement exists, subject to -The Qt Company’s standard pricing applicable at the commencement date of any -such Renewal Term. - -3.2 Distribution of Applications -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable, revocable (for cause -pursuant to this Agreement) right and license, valid for the Term, to (i) -distribute, by itself or through its Contractors, Redistributables as installed, -incorporated or integrated into Applications for execution on the Deployment -Platforms, and (ii) grant sublicenses to Redistributables, as distributed -hereunder, for Customers solely for Customer’s internal use and to the extent -necessary in order for the Customers to use the Applications for their -respective intended purposes. -Right to distribute the Redistributables as part of an Application as provided -herein is not royalty-bearing but is conditional upon the Licensee having paid -the agreed Development Licenses from The Qt Company before distributing any -Redistributables to Customers. - -3.3 Distribution of Devices -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable, revocable (for cause -pursuant to this Agreement) right and license, valid for the Term, to (i) -distribute, by itself or through one or more tiers of Contractors, -Redistributables as installed, incorporated or integrated, or intended to be -installed, incorporated or integrated into Devices for execution on the -Deployment Platforms, and (ii) grant sublicenses to Redistributables, as -distributed hereunder, for Customers solely for Customer’s internal use and to -the extent necessary in order for the Customers to use the Devices for their -respective intended purposes. -Right to distribute the Redistributables with Devices as provided herein is -conditional upon the Licensee having purchased and paid the appropriate amount -of Development Licenses for Qt for Device Creation product and Distribution -Licenses from The Qt Company before distributing any Redistributables to -Customers. - -3.4 Further Requirements -The licenses granted above in this Section 3 by The Qt Company to Licensee are -conditional and subject to Licensee's compliance with the following terms: -(i) Licensee shall not remove or alter any copyright, trademark or other - proprietary rights notice contained in any portion of the Licensed - Software; -(ii) Applications must add primary and substantial functionality to the - Licensed Software; -(iii) Applications may not pass on functionality which in any way makes it - possible for others to create software with the Licensed Software; - provided however that Licensee may use the Licensed Software's scripting - and QML ("Qt Quick") functionality solely in order to enable scripting, - themes and styles that augment the functionality and appearance of the - Application(s) without adding primary and substantial functionality to - the Application(s); -(iv) Applications must not compete with the Licensed Software; -(v) Licensee shall not use The Qt Company's or any of its suppliers' names, - logos, or trademarks to market Applications, except that Licensee may use - “Built with Qt” logo to indicate that Application(s) was developed using - the Licensed Software; -(vi) Licensee shall not distribute, sublicense or disclose source code of - Licensed Software to any third party (provided however that Licensee may - appoint employee(s) of Contractors as Designated Users to use Licensed - Software pursuant to this Agreement). Such right may be available for the - Licensee subject to a separate software development kit (“SDK”) license - agreement to be concluded with The Qt Company; -(vii) Licensee shall not grant the Customers a right to (i) make copies of the - Redistributables except when and to the extent required to use the - Applications and/or Devices for their intended purpose, (ii) modify the - Redistributables or create derivative works thereof, (iii) decompile, - disassemble or otherwise reverse engineer Redistributables, or (iv) - redistribute any copy or portion of the Redistributables to any third - party, except as part of the onward sale of the Device on which the - Redistributables are installed; -(viii) Licensee shall not and shall cause that its Affiliates or Contractors - shall not a) in any way combine, incorporate or integrate Licensed - Software with, or use Licensed Software for creation of, any software - created with or incorporating Open Source Qt, or b) incorporate or - integrate Applications into a hardware device or product other than a - Device, unless Licensee has received an advance written permission from - The Qt Company to do so. Absent such written permission, any and all - distribution by the Licensee during the Term of a hardware device or - product a) which incorporate or integrate any part of Licensed Software - or Open Source Qt; or b) where the main user interface or substantial - functionality is provided by software built with Licensed Software or - Open Source Qt or otherwise depends on the Licensed Software or Open - Source Qt, shall be considered as a Device distribution under this - Agreement and dependent on compliance thereof (including but not limited - to obligation to pay applicable License Fees for such distribution). - Notwithstanding what is provided above in this sub-section (viii), - Licensee is entitled to use and combine Qt 3D Studio and/or Qt Design - Studio with Open Source Qt (“Combination”) for its internal evaluation - purposes, provided that Licensee shall in no way transfer, publish, - disclose, display or otherwise make available any software or work - resulting from such Combination; -(ix) Licensee shall cause all of its Affiliates and Contractors entitled to - make use of the licenses granted under this Agreement, to be - contractually bound to comply with the relevant terms of this Agreement - and not to use the Licensed Software beyond the terms hereof and for any - purposes other than operating within the scope of their services for - Licensee. Licensee shall be responsible for any and all actions and - omissions of its Affiliates and Contractors relating to the Licensed - Software and use thereof (including but not limited to payment of all - applicable License Fees); -(x) Except when and to the extent explicitly provided in this Section 3, - Licensee shall not transfer, publish, disclose, display or otherwise - make available the Licensed Software; -; and -(xi) Licensee shall not attempt or enlist a third party to conduct or attempt - to conduct any of the above. - -Above terms shall not be applicable if and to the extent they conflict with any -mandatory provisions of any applicable laws. Any use of Licensed Software beyond -the provisions of this Agreement is strictly prohibited and requires an -additional license from The Qt Company. - -4. THIRD PARTY SOFTWARE -The Licensed Software may provide links to third party libraries or code -(collectively "Third Party Software") to implement various functions. Third -Party Software does not comprise part of the Licensed Software. In some cases, -access to Third Party Software may be included in the Licensed Software. Such -Third Party Software will be listed in the ".../src/3rdparty" source tree -delivered with the Licensed Software or documented in the Licensed Software, as -such may be amended from time to time. Licensee acknowledges that use or -distribution of Third Party Software is in all respects subject to applicable -license terms of applicable third party right holders. - -5. PRE-RELEASE CODE -The Licensed Software may contain pre-release code and functionality marked or -otherwise stated as “Technology Preview”, “Alpha”, “Beta” or similar -designation. Such pre-release code may be present in order to provide -experimental support for new platforms or preliminary versions of one or more -new functionalities. The pre-release code may not be at the level of performance -and compatibility of a final, generally available, product offering of the -Licensed Software. The pre-release parts of the Licensed Software may not -operate correctly, may contain errors and may be substantially modified by The -Qt Company prior to the first commercial product release, if any. The Qt Company -is under no obligation to make pre-release code commercially available, or -provide any Support or Updates relating thereto. The Qt Company assumes no -liability whatsoever regarding any pre-release code, but any use thereof is -exclusively at Licensee’s own risk and expense. For clarity, Licensee is -entitled to use such pre-release code pursuant to Section 3, just like other -Licensed Software, provided however that in the event Add-on Products are -included and available as such pre-release code, Licensee’s right to use such -Add-on Products is nevertheless subject to and conditional upon conclusion of -separate agreement with The Qt Company. - -6. LIMITED WARRANTY AND WARRANTY DISCLAIMER -The Qt Company hereby represents and warrants that it has the power and -authority to grant the rights and licenses granted to Licensee under this -Agreement. Except as set forth above, the Licensed Software is licensed to -Licensee "as is" and Licensee’s exclusive remedy and The Qt Company’s entire -liability for errors in the Licensed Software shall be limited, at The Qt -Company’s option, to correction of the error, replacement of the Licensed -Software or return of the applicable fees paid for the defective Licensed -Software for the time period during which the License is not able to utilize the -Licensed Software under the terms of this Agreement. - -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF -ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER -WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND -NON-INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES NOT -WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE’S REQUIREMENTS OR THAT -IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE -UNINTERRUPTED. ALL USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE -RISK OF AND RESPONSIBILITY OF LICENSEE. - -7. INDEMNIFICATION AND LIMITATION OF LIABILITY -7.1 Limitation of Liability -EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II) -BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO -EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY FOR ANY LOSS OF PROFIT, -LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, SPECIAL, -CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY KIND, -HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT. PARTIES -SPECIFICALLY AGREE THAT LICENSEE’S OBLIGATION TO PAY LICENSE AND OTHER FEES -CORRESPONDING TO ACTUAL USAGE OF LICENSED SOFTWARE HEREUNDER SHALL BE CONSIDERED -AS A DIRECT DAMAGE. EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL -MISCONDUCT, AND (II) BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY -APPLICABLE LAW, IN NO EVENT SHALL EITHER PARTY’S TOTAL AGGREGATE LIABILITY UNDER -THIS AGREEMENT EXCEED THE AGGREGATE LICENSE FEES PAID OR PAYABLE TO THE QT -COMPANY FROM LICENSEE DURING THE PERIOD OF TWELVE (12) MONTHS IMMEDIATELY -PRECEDING THE EVENT RESULTING IN SUCH LIABILITY. THE PROVISIONS OF THIS SECTION -7 ALLOCATE THE RISKS UNDER THIS AGREEMENT BETWEEN THE QT COMPANY AND LICENSEE -AND THE PARTIES HAVE RELIED UPON THE LIMITATIONS SET FORTH HEREIN IN DETERMINING -WHETHER TO ENTER INTO THIS AGREEMENT. - -7.2 Licensee´s Indemnification -Licensee shall indemnify and hold harmless The Qt Company from and against any -claim, injury, judgment, settlement, loss or expense, including attorneys' fees -related to: (a) Licensee’s misrepresentation in connection with The Qt Company -or the Licensed Software or breach of this Agreement, (b) the Application or -Device (except where such cause of liability is solely attributable to the -Licensed Software). - -8. SUPPORT, UPDATES AND ONLINE SERVICES -Upon due payment of the agreed License Fees the Licensee will be eligible to -receive Support and Updates and to use the Online Services during the License -Term, provided, however, that in the event the License Term is longer than 36 -months, Support is provided only for the first 12 months, unless the Parties -specifically otherwise agree. Unless otherwise decided by The Company at its -free and absolute discretion, Upgrades will not be included in the Support but -may be available subject to additional fees. From time to time The Qt Company -may change the Support terms, provided that during the respective ongoing -License Term the level of Support provided by The Qt Company may not be reduced -without the consent of the Licensee. Unless otherwise agreed, The Qt Company -shall not be responsible for providing any service or support to Customers. - -9. CONFIDENTIALITY -Each Party acknowledges that during the Term of this Agreement each Party may -receive information about the other Party's business, business methods, business -plans, customers, business relations, technology, and other information, -including the terms of this Agreement, that is confidential and of great value -to the other Party, and the value of which would be significantly reduced if -disclosed to third parties (“Confidential Information”). Accordingly, when a -Party (the “Receiving Party”) receives Confidential Information from the other -Party (the “Disclosing Party”), the Receiving Party shall only disclose such -information to employees and Contractors on a need to know basis, and shall -cause its employees and employees of its Affiliates to: (i) maintain any and all -Confidential Information in confidence; (ii) not disclose the Confidential -Information to a third party without the Disclosing Party's prior written -approval; and (iii) not, directly or indirectly, use the Confidential -Information for any purpose other than for exercising its rights and fulfilling -its responsibilities pursuant to this Agreement. Each Party shall take -reasonable measures to protect the Confidential Information of the other Party, -which measures shall not be less than the measures taken by such Party to -protect its own confidential and proprietary information. Obligation of -confidentiality shall not apply to information that (i) is or becomes generally -known to the public through no act or omission of the Receiving Party; (ii) was -in the Receiving Party's lawful possession prior to the disclosure hereunder and -was not subject to limitations on disclosure or use; (iii) is developed -independently by employees or Contractors of the Receiving Party or other -persons working for the Receiving Party who have not had access to the -Confidential Information of the Disclosing Party, as proven by the written -records of the Receiving Party; (iv) is lawfully disclosed to the Receiving -Party without restrictions, by a third party not under an obligation of -confidentiality; or (v) the Receiving Party is legally compelled to disclose, in -which case the Receiving Party shall notify the Disclosing Party of such -compelled disclosure and assert the privileged and confidential nature of the -information and cooperate fully with the Disclosing Party to limit the scope of -disclosure and the dissemination of disclosed Confidential Information to the -minimum extent necessary. The obligations under this Section 9 shall continue to -remain in force for a period of five (5) years after the last disclosure, and, -with respect to trade secrets, for so long as such trade secrets are protected -under applicable trade secret laws. - -10. FEES, DELIVERY AND PAYMENT -10.1 License Fees -License Fees are described in The Qt Company’s standard price list, quote or -Purchase Order confirmation or in an appendix hereto, as the case may be. The -License Fees shall not be refunded or claimed as a credit in any event or for -any reason whatsoever. - -10.2 Ordering Licenses -Licensee may purchase Development Licenses and Distribution Licenses pursuant to -agreed pricing terms or, if no specific pricing terms have been agreed upon, at -The Qt Company's standard pricing terms applicable at the time of purchase. -Licensee shall submit all purchase orders for Development Licenses and -Distribution Licenses to The Qt Company by email or any other method acceptable -to The Qt Company (each such order is referred to herein as a “Purchase Order”) -for confirmation, whereupon the Purchase Order shall become binding between the -Parties. - -10.3 Distribution License Packs -Unless otherwise agreed, Distribution Licenses shall be purchased by way of -Distribution License Packs. Upon due payment of the ordered Distribution License -Pack(s), the Licensee will have an account of Distribution Licenses available -for installing, bundling or integrating (all jointly “installing”) the -Redistributables with the Devices or for otherwise distributing the -Redistributables in accordance with this Agreement. Each time Licensee -“installs” or distributes a copy of Redistributables, then one Distribution -License is used, and Licensee’s account of available Distribution Licenses is -decreased accordingly. Licensee may “install” copies of the Redistributables so -long as Licensee has Distribution Licenses remaining on its account. -Redistributables will be deemed to have been “installed” into a Device when one -of the following circumstances shall have occurred: a) the Redistributables have -been loaded onto the Device and used outside of the Licensee’s premises or b) -the Device has been fully tested and placed into Licensee's inventory (or sold) -for the first time (i.e., Licensee will not be required to use (or pay for) more -than one Distribution License for each individual Device, e.g. in a situation -where a Device is returned to Licensee's inventory after delivery to a -distributor or sale to a Customer). In addition, if Licensee includes a back-up -copy of the Redistributables on a CD-ROM or other storage medium along with the -product, that backup copy of the Redistributables will not be deemed to have -been “installed” and will not require an additional Distribution License. - -10.4 Payment Terms -License Fees and any other charges under this Agreement shall be paid by -Licensee no later than thirty (30) days from the date of the applicable invoice -from The Qt Company. The Qt Company will submit an invoice to Licensee after the -date of this Agreement and/or after The Qt Company receives a Purchase Order -from Licensee. A late payment charge of the lower of (a) one percent per month; -or (b) the interest rate stipulated by applicable law, shall be charged on any -unpaid balances that remain past due. The Qt Company shall have the right to -suspend, terminate or withhold grants of all rights to the Licensed Software -hereunder, including but not limited to the Developer License, Distribution -License, and Support, should Licensee fail to make payment in timely fashion. - -10.5 Taxes -All License Fees and other charges payable hereunder are gross amounts but -exclusive of any value added tax, use tax, sales tax and other taxes, duties or -tariffs (“Taxes”). Such applicable Taxes shall be paid by Licensee, or, where -applicable, in lieu of payment of such Taxes, Licensee shall provide an -exemption certificate to The Qt Company and any applicable authority. - -11 RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS -11.1 Licensee’s Record-keeping -Licensee shall at all times maintain accurate and up-to-date written records of -Licensee’s activities related to the use of Licensed Software and distribution -of Redistributables. The records shall be adequate to determine Licensee’s -compliance with the provisions of this Agreement and to demonstrate the number -of Designated Users and Redistributables distributed by Licensee. The records -shall conform to good accounting practices reasonably acceptable to The Qt -Company. Licensee shall, within thirty (30) days from receiving The Qt Company’s -request to that effect, deliver to The Qt Company a report on Licensee’s usage -of Licensed Software, such report to contain information, in sufficient detail, -on (i) amount of users working with Licensed Software, (ii) copies of -Redistributables distributed by Licensee during that calendar quarter, (iii) -number of undistributed copies of Redistributables and corresponding number of -unused Distribution Licenses remaining on Licensee’s account, and (iv) any other -information as The Qt Company may reasonably require from time to time. - -11.2. The Qt Company’s Audit Rights -The Qt Company or an independent auditor acting on behalf of The Qt Company’s, -may, upon at least five (5) business days’ prior written notice and at its -expense, audit Licensee with respect to the use of the Redistributables, but not -more frequently than once during each 6-month period. Such audit may be -conducted by mail, electronic means or through an in-person visit to Licensee’s -place of business. Any such in-person audit shall be conducted during regular -business hours at Licensee's facilities and shall not unreasonably interfere -with Licensee's business activities. The Qt Company or the independent auditor -acting on behalf of The Qt Company shall be entitled to inspect Licensee’s -Records. All such Licensee’s Records and use thereof shall be subject to an -obligation of confidentiality under this Agreement. If an audit reveals that -Licensee is using the Licensed Software beyond scope of the licenses Licensee -has paid for, Licensee agrees to immediately pay The Qt Company any amounts owed -for such unauthorized use. -In addition, in the event the audit reveals a material violation of the terms of -this Agreement (underpayment of more than 5% of License Fees shall always be -deemed a material violation for purposes of this section), then the Licensee -shall pay The Qt Company's reasonable cost of conducting such audit. - -12 TERM AND TERMINATION -12.1 Term -This Agreement shall enter into force upon due acceptance by both Parties and -remain in force for as long as there is any Development License(s) in force -(“Term”), unless and until terminated pursuant to the terms of this Section 12. - -12.2 Termination by The Qt Company -The Qt Company shall have the right to terminate this Agreement upon thirty (30) -days prior written notice if the Licensee is in material breach of any -obligation of this Agreement and fails to remedy such breach within such notice -period. - -12.3 Mutual Right to Terminate -Either Party shall have the right to terminate this Agreement immediately upon -written notice in the event that the other Party becomes insolvent, files for -any form of bankruptcy, makes any assignment for the benefit of creditors, has a -receiver, administrative receiver or officer appointed over the whole or a -substantial part of its assets, ceases to conduct business, or an act equivalent -to any of the above occurs under the laws of the jurisdiction of the other -Party. - -12.4 Parties´ Rights and Duties upon Termination -Upon expiry or termination of the Agreement Licensee shall cease and shall cause -all Designated Users (including those of its Affiliates’ and Contractors’) to -cease using the Licensed Software and distribution of the Redistributables under -this Agreement. -Notwithstanding the above, in the event the Agreement expires or is terminated: -(i) as a result of The Qt Company choosing not to renew the Development - License(s) as set forth in Section 3.1, then all valid licenses possessed - by the Licensee at such date shall be extended to be valid in perpetuity - under the terms of this Agreement and Licensee is entitled to purchase - additional licenses as set forth in Section 10.2; or -(ii) for reason other than by The Qt Company pursuant to item (i) above or - pursuant to Section 12.2, then the Licensee is entitled, for a period of - six (6) months after the effective date of termination, to continue - distribution of Devices under the Distribution Licenses paid but unused at - such effective date of termination. Upon any such termination the Licensee - shall destroy or return to The Qt Company all copies of the Licensed - Software and all related materials and will certify the same to The Qt - Company upon its request, provided however that Licensee may retain and - exploit such copies of the Licensed Software as it may reasonably require - in providing continued support to Customers. -Expiry or termination of this Agreement for any reason whatsoever shall not -relieve Licensee of its obligation to pay any License Fees accrued or payable to -The Qt Company prior to the effective date of termination, and Licensee shall -immediately pay to The Qt Company all such fees upon the effective date of -termination. Termination of this Agreement shall not affect any rights of -Customers to continue use of Applications and Devices (and therein incorporated -Redistributables). - -12.5 Extension in case of bankruptcy -In the event The Qt Company is declared bankrupt under a final, non-cancellable -decision by relevant court of law, and this Agreement is not, at the date of -expiry of the Development License(s) pursuant to Section 3.1, assigned to party, -who has assumed The Qt Company’s position as a legitimate licensor of Licensed -Software under this Agreement, then all valid licenses possessed by the Licensee -at such date of expiry, and which the Licensee has not notified for expiry, -shall be extended to be valid in perpetuity under the terms of this Agreement. - -13. GOVERNING LAW AND LEGAL VENUE -In the event this Agreement is in the name of The Qt Company Inc., a Delaware -Corporation, then: -(i) this Agreement shall be construed and interpreted in accordance with the - laws of the State of California, USA, excluding its choice of law - provisions; -(ii) the United Nations Convention on Contracts for the International Sale of - Goods will not apply to this Agreement; and -(iii) any dispute, claim or controversy arising out of or relating to this - Agreement or the breach, termination, enforcement, interpretation or - validity thereof, including the determination of the scope or - applicability of this Agreement to arbitrate, shall be determined by - arbitration in San Francisco, USA, before one arbitrator. The arbitration - shall be administered by JAMS pursuant to JAMS' Streamlined Arbitration - Rules and Procedures. Judgment on the Award may be entered in any court - having jurisdiction. This Section shall not preclude parties from seeking - provisional remedies in aid of arbitration from a court of appropriate - jurisdiction. -In the event this Agreement is in the name of The Qt Company Ltd., a Finnish -Company, then: -(i) this Agreement shall be construed and interpreted in accordance with the - laws of Finland, excluding its choice of law provisions; -(ii) the United Nations Convention on Contracts for the International Sale of - Goods will not apply to this Agreement; and -(iii) any disputes, controversy or claim arising out of or relating to this - Agreement, or the breach, termination or validity thereof shall be shall - be finally settled by arbitration in accordance with the Arbitration Rules - of Finland Chamber of Commerce. The arbitration tribunal shall consist of - one (1), or if either Party so requires, of three (3), arbitrators. The - award shall be final and binding and enforceable in any court of competent - jurisdiction. The arbitration shall be held in Helsinki, Finland and the - process shall be conducted in the English language. This Section shall not - preclude parties from seeking provisional remedies in aid of arbitration - from a court of appropriate jurisdiction. - -14. GENERAL PROVISIONS -14.1 No Assignment -Except in the case of a merger or sale of substantially all of its corporate -assets, Licensee shall not be entitled to assign or transfer all or any of its -rights, benefits and obligations under this Agreement without the prior written -consent of The Qt Company, which shall not be unreasonably withheld or delayed. -The Qt Company shall be entitled to freely assign or transfer any of its rights, -benefits or obligations under this Agreement. - -14.2 No Third Party Representations -Licensee shall make no representations or warranties concerning the Licensed -Software on behalf of The Qt Company. Any representation or warranty Licensee -makes or purports to make on The Qt Company’s behalf shall be void as to The Qt -Company. - -14.3 Surviving Sections -Any terms and conditions that by their nature or otherwise reasonably should -survive termination of this Agreement shall so be deemed to survive. - -14.4 Entire Agreement -This Agreement, the exhibits hereto, the License Certificate and any applicable -Purchase Order constitute the complete agreement between the Parties and -supersedes all prior or contemporaneous discussions, representations, and -proposals, written or oral, with respect to the subject matters discussed -herein. -In the event of any conflict or inconsistency between this Agreement and any -Purchase Order, the terms of this Agreement will prevail over the terms of the -Purchase Order with respect to such conflict or inconsistency. -Parties specifically acknowledge and agree that this Agreement prevails over any -click-to-accept or similar agreements the Designated Users may need to accept -online upon download of the Licensed Software, as may be required by The Qt -Company’s applicable processes relating to Licensed Software. - -14.5 Modifications -No modification of this Agreement shall be effective unless contained in a -writing executed by an authorized representative of each Party. No term or -condition contained in Licensee's Purchase Order shall apply unless expressly -accepted by The Qt Company in writing. - -14.6 Force Majeure -Except for the payment obligations hereunder, neither Party shall be liable to -the other for any delay or non-performance of its obligations hereunder in the -event and to the extent that such delay or non-performance is due to an event of -act of God, terrorist attack or other similar unforeseeable catastrophic event -that prevents either Party for fulfilling its obligations under this Agreement -and which such Party cannot avoid or circumvent (“Force Majeure Event”). If the -Force Majeure Event results in a delay or non-performance of a Party for a -period of three (3) months or longer, then either Party shall have the right to -terminate this Agreement with immediate effect without any liability (except for -the obligations of payment arising prior to the event of Force Majeure) towards -the other Party. - -14.7 Notices -Any notice given by one Party to the other shall be deemed properly given and -deemed received if specifically acknowledged by the receiving Party in writing -or when successfully delivered to the recipient by hand, fax, or special courier -during normal business hours on a business day to the addresses specified for -each Party on the signature page. Each communication and document made or -delivered by one Party to the other Party pursuant to this Agreement shall be in -the English language. - -14.8 Export Control -Licensee acknowledges that the Redistributables may be subject to export control -restrictions under the applicable laws of respective countries. Licensee shall -fully comply with all applicable export license restrictions and requirements as -well as with all laws and regulations relating to the Redistributables and -exercise of licenses hereunder and shall procure all necessary governmental -authorizations, including without limitation, all necessary licenses, approvals, -permissions or consents, where necessary for the re-exportation of the -Redistributables, Applications and/or Devices. - -14.9 No Implied License -There are no implied licenses or other implied rights granted under this -Agreement, and all rights, save for those expressly granted hereunder, shall -remain with The Qt Company and its licensors. In addition, no licenses or -immunities are granted to the combination of the Licensed Software with any -other software or hardware not delivered by The Qt Company under this Agreement. - -14.10 Attorney Fees -The prevailing Party in any action to enforce this Agreement shall be entitled -to recover its attorney’s fees and costs in connection with such action. - -14.11 Severability -If any provision of this Agreement shall be adjudged by any court of competent -jurisdiction to be unenforceable or invalid, that provision shall be limited or -eliminated to the minimum extent necessary so that this Agreement shall -otherwise remain in full force and effect and enforceable. - - - -APPENDICES -The Agreement includes Appendix 1 as shown below. In addition, the Agreement may -include one or more of the Appendices 3-5 listed below depending on the -product(s) purchased by the Licensee, what is stated in the quote or invoice, -and/or what is stated on the License Certificate. - -  -APPENDIX 1: LICENSED SOFTWARE -1a. Licensed Software - Qt Toolkit -Module Description -Qt Core Core non-graphical classes used by other modules. -Qt GUI Base classes for graphical user interface (GUI) - components. -Qt Multimedia Classes for audio, video and camera functionality. -Qt Multimedia Widgets Widget-based classes for implementing multimedia - functionality. -Qt Network Classes to make network programming easier and more - portable. -Qt QML Classes for QML and JavaScript languages. -Qt Quick A declarative framework for building highly dynamic - applications with custom user interfaces. -Qt Quick Controls 2 Provides lightweight QML types for creating - performant user interfaces for desktop, embedded, and - mobile devices. -Qt Quick Dialogs Types for creating and interacting with system - dialogs from a Qt Quick application. -Qt Quick Layouts Layouts are items that are used to arrange Qt Quick 2 - based items in the user interface. -Qt Quick Test A unit test framework for QML applications. -Qt SQL Classes for database integration using SQL. -Qt Test Classes for unit testing Qt applications and - libraries. -Qt Widgets Classes to extend Qt GUI with C++ widgets. -Active Qt Classes for applications which use ActiveX and COM -Qt 3D Functionality for near-realtime simulation systems - with support for 2D and 3D rendering. -Qt Android Extras Provides platform-specific APIs for Android. -Qt Bluetooth Provides access to Bluetooth hardware. -Qt Canvas 3D Enables OpenGL-like 3D drawing calls from Qt Quick - applications using JavaScript. -Qt Concurrent Classes for writing multi-threaded programs without - using low-level threading primitives. -Qt D-Bus Classes for inter-process communication over the - D-Bus protocol. -Qt Gamepad Enables Qt applications to support the use of gamepad - hardware. -Qt Graphical Effects Graphical effects for use with Qt Quick 2. -Qt Help Classes for integrating documentation into - applications, similar to Qt Assistant. -Qt Image Formats Plugins for additional image formats: TIFF, MNG, TGA, - WBMP. -Qt Location Displays map, navigation, and place content in a QML - application. -Qt Mac Extras Provides platform-specific APIs for macOS. -Qt Network Authorization Provides support for OAuth-based authorization to - online services. -Qt NFC Provides access to Near-Field communication (NFC) - hardware. -Qt Platform Headers Provides classes that encapsulate platform-specific - information. -Qt Positioning Provides access to position, satellite and area - monitoring classes. -Qt Print Support Classes to make printing easier and more portable. -Qt Purchasing Enables in-app purchase of products in Qt - applications. -Qt for Python Python bindings for Qt. -Qt Quick Controls Reusable Qt Quick based UI controls to create classic - desktop-style user interfaces. -Qt Quick Extras Provides a specialized set of controls that can be - used to build interfaces in Qt Quick. -Qt Quick Widgets Provides a C++ widget class for displaying a Qt - Quick user interface. -Qt SCXML Provides classes and tools for creating state - machines from SCXML files. -Qt Sensors Provides access to sensor hardware and motion gesture - recognition. -Qt Serial Bus Provides access to serial industrial bus interface. -Qt Serial Port Provides access to hardware and virtual serial ports. -Qt Speech Provides support for accessibility features such as - text-to-speech. -Qt SVG Classes for displaying the contents of SVG files. -Qt UI Tools Classes for loading QWidget based forms created in Qt - Designer dynamically, at runtime. -Qt WebChannel Provides access to QObject or QML objects from HTML - clients for seamless integration of Qt applications - with HTML/JavaScript clients. -Qt WebEngine Classes and functions for embedding web content in - applications using the Chromium browser project. -Qt WebSockets Provides WebSocket communication. -Qt WebView Displays web content in a QML application by using - APIs native to the platform. -Qt Windows Extras Provides platform-specific APIs for Windows. -Qt X11 Extras Provides platform-specific APIs for X11. -Qt XML C++ implementations of SAX and DOM. -Qt XML Patterns Support for XPath, XQuery, XSLT and XML schema - validation. -Qt Wayland Compositor Provides a framework to develop a Wayland compositor. -Qt Charts UI Components for displaying charts. -Qt Data Visualization UI Components for creating 3D data visualizations. -Qt Virtual Keyboard A framework for implementing different input methods - as well as a QML virtual keyboard. - -1b. Licensed software – Embedded software development libraries -Module Description -Boot 2 Qt stack Yocto based Embedded Linux stack for selected - target hardware -Qt OTA Client-side capability for device image - updates Over The Air. -Device Utilities Collection of API’s to manage the device; - E.g. display, WiFi and Bluetooth settings. -Qt Debugging Bridge (QDB) Daemon Enables host-target deployment, debugging, - profiling and other features over USB. Up to - developer to decide if this is left in the - final solution. - -1c. Licensed Software - Qt Tools/Applications -Tool Description -Qt Creator The integrated development environment for Qt. -Qt Designer Qt tool for designing and building graphical user interfaces. -Qt Linguist Tool used to add translations to Qt applications. -Qt Assistant Tool for viewing online documentation in Qt help-file format. -Qmake Utility tool used to automate the generation of make files. -uic User interface compiler for the Qt GUI toolkit. -rcc Resource compiler used for embedding resources into Qt - applications. -lupdate Tool that finds the translatable strings in the specified source, - header and Qt Designer interface files, and produces or updates - translation files. -lrelease Tool that produces translation files in the compact binary format - used by localized Qt applications. -qlalr Qt parser generator tool. -qdoc Configurable documentation generation tool. -qmlscene QML launcher tool -qmlviewer QML launcher tool - -1d. Licensed software –Qt Tools/Applications specific to embedded software -development -Tool Description -Target toolchains Cross compilation toolchains for - supported target devices and operating - systems -Qt Debugging Bridge (QDB) Host Tools Enables deployment, debugging, - profiling and other features over USB - from development host PC to target - device. -qtconfig-gui Qt Lite Configurator tool graphical - interface -Qt Emulator Qt emulator - -2. Parts of the Licensed Software that are permitted for distribution in -object-code form only (“Redistributables”) under this Agreement: - -2a. Qt for Application Development -(i) The Licensed Software's Qt Toolkit libraries defined in 1a -(ii) The Licensed Software's installer framework - -2b. Qt for Device Creation -(i) Qt for Application Development Redistributables defined in 2a -(ii) The Licensed Software’s Embedded software development libraries defined in - 1b - -2c. Qt 3D Studio -The Licensed Software’s Qt 3D Studio Runtime (“Qt53DStudioRuntime2”) - - -APPENDIX 3: ADDITIONS TO LICENSED SOFTWARE -In addition to what is provided under the definition of the Licensed Software, -Parties agree that Licensed Software shall also include the following additional -software products of The Qt Company if included in the quote / invoice: -Qt for Automation - - MQTT software protocol libraries - - KNX software protocol libraries - - OPCUA (open source backend) - - OPCUA (Unified Automation backend) -Qt Safe Renderer - - Qt Safe Renderer library -Qt Application Manager - - Qt Application Manager library with Qt Creator integration - -All the above is considered as Redistributables and subject to applicable -provisions and limitations including but not limited to what is defined in -Section 3. - - -APPENDIX 4: SMALL BUSINESS AND START-UP APPENDIX -The provisions of this Appendix 4 are applicable for Start-up Companies and for -the Evaluation Term. -For the purpose of this Appendix 4, the following additional definitions shall -be applicable: - “Trial Term” shall mean a period of twelve (12) months. - “Start-up Company” means a company with a maximum annual revenue, including - funding, equivalent to 100,000 USD (in applicable currency) during a respective - calendar year, as evidenced by duly audited records of the Licensee and - approved by The Qt Company. - -During the Trial Term, Section 3 shall apply with following modifications -(“Trial Term Modifications”): - - Licenses granted under Sections 3.1 and 3.2 shall be free of any charge. For - clarity, License for distribution of Devices pursuant to Section 3.3 is - subject to applicable License Fee for necessary Distribution Licenses; - - Development License under Section 3.1 is limited to a maximum of three (3) - Designated Users; and - - Support is available subject to availability, as judged by The Qt Company at - its free and absolute discretion. - -Upon expiry of the Trial Term: - a) This Appendix 4 is terminated, Trial Term Modifications cease to remain in - force, Licensee’s Development Licenses shall be automatically converted into - licenses subject to a License Fee (in the amount specified in the quote or - in Appendix 2 and payable with a 30-day payment term) and Licensee’s rights - and obligations under this Agreement shall continue to remain in force under - the standard provisions of the Agreement, unless the Licensee notifies The - Qt Company in writing no less than ninety (90) days before such expiry date - that Licensee does not agree to such continuance, in which event the - Agreement, and all rights of the Licensee thereunder, shall expire; provided - however that - b) in the event the Licensee still qualifies as a Start-up Company, the - Licensee has an option (“Option”), instead of what is stated in item a) - above, to extend the Trial Term renewal is limited to one time and total - duration of Trial Terms thus to 24 months after the effective date. Licensee - shall notify The Qt Company in writing no less than ninety (90) days before - the expiry date, if Licensee wish to exercise the Option. - - -APPENDIX 5: NON-COMMERCIAL USE APPENDIX -The provisions of this Appendix 5 are applicable for non-commercial use of the -Licensed Software by the Licensee. -For the purpose of this Appendix 5, the following additional definitions -(replacing the relevant definition of the Agreement, where applicable) shall be -applicable: - “Demo Units” shall mean (i) hardware development platform, which incorporates - the Licensed Software along with Licensee’s software and/or hardware, and - (ii) prototype versions of Applications or Devices. - “Designated User(s)” shall mean the employees and students of the Licensee. - “Licensee Products” shall mean Applications and/or Devices. - “Permitted Purpose” shall mean (i) Licensee’s internal evaluation and testing - of Licensed Software, (ii) building Demo Units as well as (iii) educational - use. - “Term” shall mean a period of twelve (12) months or any such other period as - may be agreed between the Parties. - -For the purpose of this Appendix 5, the following changes shall be agreed with -respect to relevant Sections of the Agreement: - I. Recital (A) shall be replaced in its entirety to read as follows: “(A) - Licensee wishes to use the Licensed Software for the Permitted Purpose.” - II. Section 3.1 shall be replaced in its entirety to read as follows: - “The Qt Company grants to Licensee a personal, non-exclusive, - non-transferable, revocable, royalty-free license, valid for the Term, to - use, modify and copy the Licensed Software solely for the Permitted - Purpose. Licensee may install copies of the Licensed Software on an - unlimited number of computers provided that only Designated Users may use - the Licensed Software. Licensee may demonstrate the Demo Units, provided - that such demonstrations must be conducted by Licensee, and the Demo Units - must remain in Licensee’s possession and under Licensee’s control at all - times. For clarity, this Agreement does not (i) entitle Licensee to use - Licensed Software to create Applications or Devices (other than prototypes - thereof) or (ii) carry any distribution rights to Licensee, but such - rights are subject to and conditional upon conclusion of a separate - license agreement with The Qt Company.” - III. Sections 3.2, 3.3, 8 and 10 shall be deleted. - IV. Section 3.4 shall be replaced in its entirety to read as follows: - “Licensee shall not: - - remove or alter any copyright, trademark or other proprietary rights - notice contained in any portion of the Licensed Software; - - transfer, publish, sublicense, disclose, display or otherwise make - the Licensed Software available to any third party (except that - Licensee may demonstrate the Demo Units pursuant to Section 3.1); - - in any way combine, incorporate or integrate Licensed Software with, or - use Licensed Software for creation of, any software created with or - incorporating Open Source Qt; - Licensee shall cause all Designated Users who make use of the licenses - granted under this Agreement, to be contractually bound to comply with - the relevant terms of this Agreement and not to use the Licensed - Software beyond the terms hereof. Licensee shall be responsible for any - and all actions and omissions of its Designated Users relating to the - Licensed Software and use thereof. Any use of Licensed Software beyond - the provisions of this Agreement is strictly prohibited and requires an - additional license from The Qt Company.” - V. Section 12 shall be replaced in its entirety to read as follows: - “This Agreement shall enter into force upon due acceptance by both Parties - and remain in force for the Term, unless and until terminated pursuant to - the terms of Section 12. Upon termination of the Agreement, Licensee shall - cease using the Licensed Software. All other copies of Licensed Software - in the possession or control of Licensee must be erased or destroyed. An - officer of Licensee must, upon request, promptly deliver to The Qt Company - a written confirmation that this has occurred.” - -Except for the modifications specified above, this Appendix carries no change to -the terms of the Agreement which shall remain in full force. diff -Nru qtcharts-opensource-src-5.12.5/.QT-FOR-AUTOMOTIVE-LICENSE-AGREEMENT qtcharts-opensource-src-5.9.5/.QT-FOR-AUTOMOTIVE-LICENSE-AGREEMENT --- qtcharts-opensource-src-5.12.5/.QT-FOR-AUTOMOTIVE-LICENSE-AGREEMENT 2019-09-06 12:05:48.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/.QT-FOR-AUTOMOTIVE-LICENSE-AGREEMENT 1970-01-01 00:00:00.000000000 +0000 @@ -1,894 +0,0 @@ -QT AUTOMOTIVE SUITE LICENSE AGREEMENT -Agreement version 3.0 - -This Qt Automotive Suite License Agreement (“Agreement”) is a legal agreement -between The Qt Company (as defined below) and the Licensee (as defined below) -for the license of Licensed Software (as defined below). Capitalized terms used -herein are defined in Section 1. - -WHEREAS: - -(A) Licensee wishes to use the Licensed Software for the purpose of developing -and distributing Applications and/or Devices; and - -(B) The Qt Company is willing to grant the Licensee a right to use Licensed -Software for such purpose pursuant to term and conditions of this Agreement. - -NOW, THEREFORE, THE PARTIES HEREBY AGREE AS FOLLOWS: - -1. DEFINITIONS - -"Affiliate" of a Party shall mean an entity (i) which is directly or indirectly -controlling such Party; (ii) which is under the same direct or indirect -ownership or control as such Party; or (iii) which is directly or indirectly -owned or controlled by such Party. For these purposes, an entity shall be -treated as being controlled by another if that other entity has fifty percent -(50 %) or more of the votes in such entity, is able to direct its affairs and/or -to control the composition of its board of directors or equivalent body. - -"Applications" shall mean Licensee's software products created using the -Licensed Software in connection with the Program, which may include the -Redistributables, or part thereof. - -"Contractor(s)" shall mean third party consultants, distributors and contractors -performing services to a Party under applicable contractual arrangement. - -"Customer(s)" shall mean Licensee's end users to whom Licensee, directly or -indirectly, distributes copies of the Redistributables. - -"Deployment Platforms" shall mean operating systems specified in the License -Certificate, in which the Redistributables can be distributed pursuant to the -terms and conditions of this Agreement. - -"Designated User(s)" shall mean the employee(s) of Licensee or Licensee's -Affiliates acting within the scope of their employment or Licensee's -Contractors acting within the scope of their services for Licensee and on behalf -of Licensee. Designated Users shall be named in the License Certificate. - -"Development License" shall mean the license needed by the Licensee for each -Designated User to use the Licensed Software under the license grant described -in Section 3.1 of this Agreement. - -"Development Platforms" shall mean those operating systems specified in the -License Certificate, in which the Licensed Software can be used under the -Development License, but not distributed in any form or used for any other -purpose. - -"Devices" shall mean hardware devices or products that 1) are manufactured -and/or distributed by the Licensee or its Affiliates or Contractors in -connection with the Program, and (2)(i) incorporate or integrate the -Redistributables or parts thereof; or (ii) do not incorporate or integrate -the Redistributables at the time of distribution, but where, when used by a -Customer, the main user interface or substantial functionality of such -device is provided by Application(s) or otherwise depends on the Licensed -Software. - -"Distribution License(s)" shall mean the license required for distribution of -Redistributables in accordance with the license grant described in Section -3.2(ii)-(iii) of this Agreement. - -"Distribution License Packs" shall mean set of prepaid Distribution Licenses -for distribution of Redistributables, as defined in The Qt Company's standard -price list, quote, Purchase Order confirmation or in an appendix hereto, as the -case may be. - -"Initial Support Term" shall mean a time period of twelve (12) months, -calculated from the effective date of this Agreement. - -"Intellectual Property Rights" shall mean patents (including utility models), -design patents, and designs (whether or not capable of registration), chip -topography rights and other like protection, copyrights, trademarks, service -marks, trade names, logos or other words or symbols and any other form of -statutory protection of any kind and applications for any of the foregoing -as well as any trade secrets. -"Licensee" shall mean the individual or legal entity that is party to this -Agreement, as identified on the signature page hereof. - -"License Certificate" shall mean a certificate accompanying the Licensed -Software and generated for each Designated User respectively. License -Certificate will specify the Designated User, the Development Platforms, -Deployment Platforms, Program and the Term of this Agreement. The terms of the -License Certificate are considered part of this Agreement and shall be updated -from time to time to reflect any changes to the foregoing terms relating to -Licensee's rights to the Licensed Software. - -"Licensee's Records" shall mean books and records that are likely to contain -information bearing on Licensee's compliance with this Agreement or the payments -due to The Qt Company under this Agreement, including, but not limited to: -assembly logs, sales records and distribution records. - -"Licensee´s SDK Contractors" shall mean Contractors of Licensee, who have -purchased or received SDK from the Licensee relating to the Program. - -"License Fee" shall mean the fee charged to the Licensee for rights granted -under the terms of this Agreement. - -"Licensed Software" shall mean all versions of The Qt Company's computer -software products, online or electronic documentation, associated media and -printed materials, including the source code, example programs and the -documentation, licensed to the Licensee under this Agreement. Licensed Software -does not include Third Party Software (as defined in Section 4) or Open Source -Qt. - -"Modified Software" shall mean bug-fixes, error corrections, patches or -modifications made to the Licensed Software by Licensee, including documentation -related thereto. - -"Online Services" shall mean any services or access to systems made available -by The Qt Company to the Licensee over the Internet relating to the Licensed -Software or for the purpose of use by the Licensee of the Licensed Software or -Support. Use of any such Online Services is discretionary for the Licensee and -some of them may be subject to additional fees. - -"Open Source Qt" shall mean all versions of The Qt Company's Qt computer -software products, online or electronic documentation, associated media and -printed materials, including the source code, example programs and the -documentation available under the terms of the GNU Lesser General Public -License, version 2.1 or later ("LGPL") or the GNU General Public License, -version 2.0 or later ("GPL"). - -"Party" or "Parties" shall mean Licensee and/or The Qt Company. - -"Program" shall mean Licensee´s business program for which purpose the Licensee -is entitled to use the Licensed Software and grant the Licensee's SDK -Contractors a right to use the Licensed Software as part of a SDK. - -"Redistributables" shall mean the portions of the Licensed Software set forth -in Appendix 1, Section 1 that may be distributed pursuant to the terms of this -Agreement in object code form only, including any relevant documentation. Where -relevant, any reference to Licensed Software in this Agreement shall include and -refer also to Redistributables. - -"SDK" or "Software Development Kit" shall mean a combination of software modules -including Licensed Software intended to be utilized in connection with the -Program. - -"Submitted Modified Software" shall have the meaning as set forth in Section -2.3. - -"Support" shall mean standard developer support that is provided by -The Qt Company to assist Designated Users in using the Licensed Software in -accordance with The Qt Company's standard support terms. - -"Support Renewal Term" shall mean a time period of twelve (12) months, -calculated from the end of the Initial Support Term or previous Support Renewal -Term, as applicable. - -"Support Term" shall mean the Initial Support Term and any possible Support -Renewal Terms(s) during which time the Licensee is eligible to receive for -Support for the Licensed Software. - -"Taxes" shall have the meaning set forth in Section 10.5. - -"Term" shall mean the validity period of this Agreement, as set forth in the -License Certificate. - -“The Qt Company” shall mean: - -(i) in the event Licensee is an individual residing in the United States or a -legal entity incorporated in the United States or having its headquarters in the -United States, The Qt Company Inc., a Delaware corporation with its office at -2350 Mission College Blvd., Suite 1020, Santa Clara, CA 95054, USA.; or - -(ii) in the event the Licensee is an individual residing outside of the United -States or a legal entity incorporated outside of the United States or having its -registered office outside of the United States, The Qt Company Ltd., a Finnish -company with its registered office at Bertel Jungin aukio D3A, 02600 Espoo, -Finland. - -"Updates" shall mean a release or version of the Licensed Software containing -bug fixes, error corrections and other changes that are generally made available -to users of the Licensed Software that have contracted for Support. Updates are -generally depicted as a change to the digits following the decimal in the -Licensed Software version number. The Qt Company shall make Updates available to -the Licensee under the Support. Updates shall be considered as part of the -Licensed Software hereunder. - -"Upgrades" shall mean a release or version of the Licensed Software containing -enhancements and new features and are generally depicted as a change to the -first digit of the Licensed Software version number. In the event Upgrades are -provided to the Licensee under this Agreement, they shall be considered as part -of the Licensed Software hereunder. - -2. OWNERSHIP 2.1 - -Ownership of The Qt Company - -The Licensed Software is protected by copyright laws and international copyright -treaties, as well as other intellectual property laws and treaties. The Licensed -Software is licensed, not sold. - -All The Qt Company's Intellectual Property Rights are and shall remain the -exclusive property of The Qt Company or its licensors respectively. - -2.2 Ownership of Licensee - -All the Licensee's Intellectual Property Rights are and shall remain the -exclusive property of the Licensee or its licensors respectively. - -All Intellectual Property Rights to the Modified Software, Applications and -Devices shall remain with the Licensee and no rights thereto shall be granted by -the Licensee to The Qt Company under this Agreement (except as set forth in -Section 2.3 below). - -2.3 Modified Software - -Licensee may create Modified Software that breaks the source or binary -compatibility with the Licensed Software. This includes, but is not limited to, -changing the application programming interfaces ("API") by adding, changing or -deleting any variable, method, or class signature in the Licensed Software -and/or any inter-process protocols, services or standards in the Licensed -Software libraries. To the extent that Licensee breaks source or binary -compatibility with the Licensed Software, Licensee acknowledges that The Qt -Company's ability to provide Support may be prevented or limited and Licensee's -ability to make use of Updates may be restricted. - -To the extent Licensee submits Modified Software to The Qt Company ("Submitted -Modified Software"), Licensee hereby grants The Qt Company a sublicensable, -assignable, irrevocable, perpetual, worldwide, non-exclusive, royalty-free and -fully paid-up license, under all of Licensee's Intellectual Property Rights, to -reproduce, adapt, translate, modify, and prepare derivative works of, publicly -display, publicly perform, sublicense, make available and distribute such -Submitted Modified Software as The Qt Company sees fit at its free and absolute -discretion. For the sake of clarity, the Licensee shall have no obligation to -provide Modified Software to The Qt Company. - -3. LICENSES GRANTED - -3.1 Development with Licensed Software - -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non- exclusive, non-transferable license, valid for the -Term, to use, modify and copy the Licensed Software by Designated Users on the -Development Platforms for the sole purposes of designing, developing, -demonstrating and testing Application(s) and/or Devices, and to provide thereto -related support and other services to end-user Customers. - -Licensee may install copies of the Licensed Software on an unlimited number of -computers provided that (i) only the Designated Users may use the Licensed -Software, and (ii) all Designated Users must have a valid Development License to -use Licensed Software. - -Licensee may at any time designate another Designated User to replace a -then-current Designated User by notifying The Qt Company in writing, provided -that any Designated User may be replaced only once during any six-month period. - -3.2 Distribution of Redistributables - -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non- exclusive, non-transferable license, valid for the -Term, to (i) distribute, by itself or through its Contractors, Redistributables -as installed, incorporated or integrated into Applications for execution on the -Deployment Platforms, and (ii) distribute, by itself or through one or more -tiers of Contractors, Redistributables as installed, incorporated or integrated, -or intended to be installed, incorporated or integrated into Devices for -execution on the Deployment Platforms, and (iii) grant sublicenses to -Redistributables, as distributed hereunder, for Customers solely for Customer's -internal use and to the extent necessary in order for the Customers to use the -Applications and/or Devices for their respective intended purposes. - -Right to distribute the Redistributables as provided herein is conditional upon -the Licensee having purchased and paid the appropriate amount of Development and -Distribution Licenses from The Qt Company before distributing any -Redistributables to Customers. - -For the avoidance of any doubt it is specifically acknowledged and agreed that -distribution of Redistributables solely as installed, incorporated or integrated -into Applications for execution on the Deployment Platform(s), as specified in -(i) of the first paragraph of Section 3.2 above, i.e. with no connection to -Devices or intention to use in connection therewith, shall not require a -Distribution License. - -3.3 SDK License - -The Qt Company grants to Licensee a personal, worldwide, non-exclusive, -non-transferable license, valid for the Term, to (i) distribute Licensed -Software as a part of the SDK to Licensee´s SDK Contractors in connection with -the Program and (ii) in connection with the Program, by itself or by Licensee's -SDK Contractors, combine, incorporate or integrate Licensed Software with, or -use Licensed Software for creation of, any software created with or -incorporating Open Source Qt, provided, however, that: - -(i) the Licensee´s SDK Contractors are only entitled to use the Licensed -Software as part of SDK and for the sole purpose of developing software for -Devices that are distributed under the Program; and - -(ii) Licensee´s SDK Contractors shall not be entitled to distribute the SDK or -any part thereof to any third parties. - -For the avoidance of any doubt, the distribution of such software development -tools that do not contain Licensed Software shall not be covered by this -Agreement. - -3.4 Further Requirements - -The licenses granted above in this Section 3 by The Qt Company to Licensee are -conditional and subject to Licensee's compliance with the following terms: - -(i) Licensee shall not remove or alter any copyright, trademark or other -proprietary rights notice contained in any portion of the Licensed Software; - -(ii) Applications and SDKs must add primary and substantial functionality to the -Licensed Software; - -(iii) Applications may not pass on functionality which in any way makes it -possible for others to create software with the Licensed Software; provided -however that Licensee may use the Licensed Software's scripting and QML ("Qt -Quick") functionality solely in order to enable scripting, themes and styles -that augment the functionality and appearance of the Application(s) without -adding primary and substantial functionality to the Application(s); - -(iv) Applications and SDKs must not compete with the Licensed Software; - -(v) Licensee shall not use The Qt Company's or any of its suppliers' names, -logos, or trademarks to market Applications or SDKs, except that Licensee may -use "Built with Qt" logo to indicate that Application(s) was developed using -the Licensed Software; - -(vi) Except as expressly provided in Section 3.3, Licensee shall not -distribute, sublicense or disclose source code of Licensed Software to any third -party (provided however that Licensee may appoint employee(s) of Contractors as -Designated Users to use Licensed Software pursuant to this Agreement); - -(vii) Licensee shall not grant the Customers a right to (i) make copies of the -Redistributables except when and to the extent required to use the Applications -and/or Devices for their intended purpose, (ii) modify the Redistributables or -create derivative works thereof, (iii) decompile, disassemble or otherwise -reverse engineer Redistributables, or (iv) redistribute any copy or portion of -the Redistributables to any third party, except as part of the onward sale of -the Device on which the Redistributables are installed; - -(viii) Except as expressly provided in Section 3.3, Licensee shall not and -shall cause that its Affiliates, Contractors and Licensee's SDK Contractors -shall not a) in any way, combine, incorporate or integrate Licensed Software -with, or use Licensed Software for creation of, any software created with or -incorporating Open Source Qt or b) incorporate or integrate Applications into a -hardware device or product other than a Device, unless Licensee has received an -advance written permission from The Qt Company to do so. Unless specifically -otherwise agreed, any and all distribution by the Licensee during the Term of -a hardware device or product a) which incorporate or integrate any part of -Licensed Software or Open Source Qt; or b) where the main user interface or -substantial functionality is provided by software build with Licensed -Software or Open Source Qt or otherwise depends on the Licensed Software or Open -Open Source Qt, shall be considered as distribution under this Agreement and -dependent on compliance thereof (including but not limited to obligation to -pay applicable License Fees for such distribution); - -(ix) Licensee shall cause all of its Affiliates and Contractors entitled to make -use of the licenses granted under this Agreement, to be contractually bound to -comply with the relevant terms of this Agreement and not to use the Licensed -Software beyond the terms hereof and for any purposes other than operating -within the scope of their services for Licensee. Licensee shall be responsible -for any and all actions and omissions of its Affiliates and Contractors relating -to the Licensed Software and use thereof (including but not limited to payment -of all applicable License Fees); - -(x) Except when and to the extent explicitly provided in this Section 3, -Licensee shall not transfer, publish, disclose, display or otherwise make -available the Licensed Software; - -(xi) Licensee shall not take any action inconsistent with The Qt Company's -Intellectual Property Rights; and - -(xii) Attempt or enlist a third party to conduct or attempt to conduct any of -the above. - -Above terms shall not be applicable if and to the extent they conflict with any -mandatory provisions of any applicable laws. - -Any use of Licensed Software beyond the provisions of this Agreement is strictly -prohibited and requires an additional license from The Qt Company. - -4. THIRD PARTY SOFTWARE - -The Licensed Software may provide links to third party libraries or code -(collectively "Third Party Software") to implement various functions. Third -Party Software does not comprise part of the Licensed Software. In some cases, -access to Third Party Software may be included in the Licensed Software. Such -Third Party Software will be listed in the ".../src/3rdparty" source tree -delivered with the Licensed Software or documented in the Licensed Software, as -such may be amended from time to time. Licensee acknowledges that use or -distribution of Third Party Software is in all respects subject to applicable -license terms of applicable third party right holders. 5. PRE-RELEASE CODE - -The Licensed Software may contain pre-release code and functionality marked or -otherwise stated as "Technology Preview", "Alpha", "Beta" or similar -designation. Such pre-release code may be present in order to provide -experimental support for new platforms or preliminary versions of one or more -new functionalities. The pre-release code may not be at the level of performance -and compatibility of a final, generally available, product offering of the -Licensed Software. The pre-release parts of the Licensed Software may not -operate correctly, may contain errors and may be substantially modified by The -Qt Company prior to the first commercial product release, if any. The Qt Company -is under no obligation to make pre-release code commercially available, or -provide any Support or Updates relating thereto. The Qt Company assumes no -liability whatsoever regarding any pre-release code, but any use thereof is -exclusively at Licensee's own risk and expense. - -6. LIMITED WARRANTY AND WARRANTY DISCLAIMER - -The Qt Company hereby represents and warrants that it has the power and -authority to grant the rights and licenses granted to Licensee under this -Agreement. - -Except as set forth above, the Licensed Software is licensed to Licensee "as -is". - -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF -ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL WARRANTIES, -EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT -WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES NOT WARRANT THAT THE -LICENSED SOFTWARE WILL SATISFY LICENSEE'S REQUIREMENTS OR THAT IT WILL OPERATE -WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE UNINTERRUPTED. ALL -USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE RISK OF AND -RESPONSIBILITY OF LICENSEE. - -Licensee's exclusive remedy and The Qt Company's entire liability for Licensed -Software shall be limited, at The Qt Company's option, to correction of the -error, replacement of the Licensed Software or return of the applicable fees -paid for the defective Licensed Software for the time period during which the -License is not able to utilize the Licensed Software under the terms of this -Agreement. - -7. INDEMNIFICATION AND LIMITATION OF LIABILITY - -7.1 Limitation of Liability - -EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, (II) -LICENSEE'S DUTY TO PAY ALL APPLICABLE LICENSE FEES AND COMPENSATIONS, AND (III) -BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO -EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY FOR ANY LOSS OF PROFIT, -LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, SPECIAL, -CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY KIND, -HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT. - -EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, (II) -LICENSEE'S DUTY TO PAY ALL APPLICABLE LICENSE FEES AND COMPENSATIONS, AND (III) -BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO -EVENT SHALL EITHER PARTY'S TOTAL AGGREGATE LIABILITY UNDER THIS AGREEMENT EXCEED -THE AGGREGATE LICENSE FEES RECEIVED BY THE QT COMPANY FROM LICENSEE DURING THE -PERIOD OF TWELVE (12) MONTHS IMMEDIATELY PRECEDING THE EVENT RESULTING IN SUCH -LIABILITY. - -THE PROVISIONS OF THIS SECTION 7 ALLOCATE THE RISKS UNDER THIS AGREEMENT BETWEEN -THE QT COMPANY AND LICENSEE AND THE PARTIES HAVE RELIED UPON THE LIMITATIONS SET -FORTH HEREIN IN DETERMINING WHETHER TO ENTER INTO THIS AGREEMENT. - -7.2 Licensee´s Indemnification - -Licensee shall indemnify and hold harmless The Qt Company from and against any -claim, injury, judgment, settlement, loss or expense, including attorneys' fees -related to: (a) Licensee's misrepresentation in connection with The Qt Company -or the Licensed Software or breach of this Agreement, (b) the Application or -Device (except where such cause of liability is solely attributable to the -Licensed Software). - -8. SUPPORT, UPDATES AND ONLINE SERVICES - -Licensee will be eligible to receive Support and Updates and to use the Online -Services during the Support Term. Unless otherwise decided by The Company at its -free and absolute discretion, Upgrades will not be included in the Support but -may be available subject to additional fees. - -Licenses granted under this Agreement shall include a prepaid Initial Support -Term. - -Initial Support Term shall be automatically extended to one or more Support -Renewal Term(s), unless and until either Party notifies the other Party in -writing that it does not wish to continue the Support, such notification to be -provided to the other Party no less than ninety (90) days before expiry of the -Initial Support Term or respective Support Renewal Term. During any such Support -Renewal Term Support shall be available subject to prices and terms agreed -between the Parties or, if no advance agreement exists, subject to The Qt -Company's standard pricing applicable at the commencement date of any such -Support Renewal Term. From time to time The Qt Company may change Support -provided within each Support plan; provided that during the respective Initial -Support Term or Support Renewal Term (as the case may be), the level of Support -provided by The Qt Company may not be reduced without the consent of the -Licensee. - -Unless otherwise agreed, The Qt Company shall not be responsible for providing -any service or support to the Customers. - -9. CONFIDENTIALITY - -Each Party acknowledges that during the Term of this Agreement each Party may -receive information about the other Party's business, business methods, business -plans, customers, business relations, technology, and other information, -including the terms of this Agreement, that is confidential and of great value -to the other Party, and the value of which would be significantly reduced if -disclosed to third parties ("Confidential Information"). Accordingly, when a -Party (the "Receiving Party") receives Confidential Information from the other -Party (the "Disclosing Party"), the Receiving Party shall only disclose such -information to employees and Contractors on a need to know basis, and shall -cause its employees and employees of its Affiliates to: (i) maintain any and all -Confidential Information in confidence; (ii) not disclose the Confidential -Information to a third party without the Disclosing Party's prior written -approval; and (iii) not, directly or indirectly, use the Confidential -Information for any purpose other than for exercising its rights and fulfilling -its responsibilities pursuant to this Agreement. Each Party shall take -reasonable measures to protect the Confidential Information of the other Party, -which measures shall not be less than the measures taken by such Party to -protect its own confidential and proprietary information. - -Obligation of confidentiality shall not apply to information that (i) is or -becomes generally known to the public through no act or omission of the -Receiving Party; (ii) was in the Receiving Party's lawful possession prior to -the disclosure hereunder and was not subject to limitations on disclosure or -use; (iii) is developed independently by employees or Contractors of the -Receiving Party or other persons working for the Receiving Party who have not -had access to the Confidential Information of the Disclosing Party, as proven by -the written records of the Receiving Party; (iv) is lawfully disclosed to the -Receiving Party without restrictions, by a third party not under an obligation -of confidentiality; or (v) the Receiving Party is legally compelled to disclose, -in which case the Receiving Party shall notify the Disclosing Party of such -compelled disclosure and assert the privileged and confidential nature of the -information and cooperate fully with the Disclosing Party to limit the scope of -disclosure and the dissemination of disclosed Confidential Information to the -minimum extent necessary. - -The obligations under this Section 9 shall continue to remain in force for a -period of five (5) years after the last disclosure, and, with respect to trade -secrets, for so long as such trade secrets are protected under applicable trade -secret laws. - -10. FEES, DELIVERY AND PAYMENT - -10.1 License Fees - -License Fees are described in The Qt Company's standard price list, quote or -Purchase Order confirmation or in an appendix hereto, as the case may be. The -License Fees shall not be refunded or claimed as a credit, even on the ground -that Distribution Licenses are not used, i.e. Redistributables are not actually -distributed corresponding to the Distribution Licenses purchased, or for any -other reason. - -10.2 Ordering Licenses - -Licensee may purchase Development Licenses and Distribution Licenses pursuant to -agreed pricing terms or, if no specific pricing terms have been agreed upon, at -The Qt Company's standard pricing terms applicable at the time of purchase. - -Licensee shall submit all purchase orders for Development Licenses and -Distribution Licenses to The Qt Company by email or any other method acceptable -to The Qt Company (each such order is referred to herein as a "Purchase Order") -for confirmation, whereupon the Purchase Order shall become binding between the -Parties. - -10.3 Distribution - -License Packs Unless otherwise agreed, the Distribution Licenses are bought by -way of Distribution License Packs. - -Upon due payment of the ordered Distribution License Pack(s), the Licensee will -have an account of Distribution Licenses available for installing, bundling or -integrating (all jointly "installing") the Redistributables with the Devices or -for otherwise distributing the Redistributables in accordance with this -Agreement. - -Each time Licensee "installs" or distributes a copy of Redistributables, then -one Distribution License is used, and Licensee's account of available -Distribution Licenses is decreased accordingly. - -Licensee may "install" copies of the Redistributables so long as Licensee has -Distribution Licenses remaining on its account. - -Redistributables will be deemed to have been "installed" into a Device when one -of the following circumstances shall have occurred: a) the Redistributables -have been loaded onto the Device and used outside of the Licensee's premises or -b) the Device has been fully tested and placed into Licensee's inventory (or -sold) for the first time (i.e., Licensee will not be required to use (or pay -for) more than one Distribution License for each individual Device, e.g. in a -situation where a Device is returned to Licensee's inventory after delivery to -a distributor or sale to a Customer). In addition, if Licensee includes a -back-up copy of the Redistributables on a CD-ROM or other storage medium -along with the product, that backup copy of the Redistributables will not -be deemed to have been "installed" and will not require an additional -Distribution License. - -10.4 Payment Terms -License Fees and any other charges under this Agreement shall be paid by -Licensee no later than thirty (30) days from the date of the applicable invoice -from The Qt Company. - -The Qt Company will submit an invoice to Licensee after the date of this -Agreement and/or after The Qt Company receives a Purchase Order from Licensee. -A late payment charge of the lower of (a) one percent per month; or (b) the -interest rate stipulated by applicable law, shall be charged on any unpaid -balances that remain past due. - -The Qt Company shall have the right to suspend, terminate or withhold grants of -all rights to the Licensed Software hereunder, including but not limited to the -Developer License, Distribution License, and Support, should Licensee fail to -make payment in a timely fashion. - -10.5 Taxes -All License Fees and other charges payable hereunder are gross amounts but -exclusive of any value added tax, use tax, sales tax and other taxes, duties or -tariffs ("Taxes"). Such applicable Taxes shall be paid by Licensee, or, where -applicable, in lieu of payment of such Taxes, Licensee shall provide an -exemption certificate to The Qt Company and any applicable authority. - -11 RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS - -11.1 Licensee's Record-keeping - -Licensee shall at all times maintain accurate and up-to-date written records of -Licensee's activities related to the use of Licensed Software and distribution -of Redistributables. The records shall be adequate to determine Licensee's -compliance with the provisions of this Agreement and to demonstrate the number -of Designated Users and Redistributables distributed by Licensee. The records -shall conform to good accounting practices reasonably acceptable to The Qt -Company. - -Licensee shall, within thirty (30) days from the end of each calendar -quarter, deliver to The Qt Company a report detailing the number of Designated -Users and copies of Redistributables distributed by Licensee during that -calendar quarter, and also detailing the number of undistributed copies of -Redistributables made by Licensee and remaining in its account (i.e., -undistributed copies for which Distribution Licenses have been or need to be -obtained from The Qt Company). Such report shall contain such other information -as The Qt Company shall reasonably require from time to time. - -11.2. The Qt Company's Audit Rights - -The Qt Company or an independent auditor acting on behalf of The Qt Company's, -may, upon at least five (5) business days' prior written notice and at its -expense, audit Licensee with respect to the use of the Redistributables, but -not more frequently than once during each 6-month period. Such audit may be -conducted by mail, electronic means or through an in-person visit to -Licensee's place of business. Any such in-person audit shall be conducted -during regular business hours at Licensee's facilities and shall not -unreasonably interfere with Licensee's business activities. The Qt Company or -the independent auditor acting on behalf of The Qt Company shall be entitled to -inspect Licensee's Records. All such Licensee's Records and use thereof shall be -subject to an obligation of confidentiality under this Agreement. - -If an audit reveals that Licensee is using the Licensed Software beyond scope of -the licenses Licensee has paid for, Licensee agrees to immediately pay The Qt -Company any amounts owed for such unauthorized use. - -In addition, in the event the audit reveals a material violation of the terms of -this Agreement (underpayment of more than 5% of License Fees shall always be -deemed a material violation for purposes of this section), then the Licensee -shall pay The Qt Company's reasonable cost of conducting such audit. - -12 TERM AND TERMINATION - -12.1 Term - -This Agreement shall enter into force upon due acceptance by both Parties and -remain in force for the Term, unless and until terminated pursuant to the terms -of this Section 12. - -12.2 Termination by The Qt Company - -The Qt Company shall have the right to terminate this Agreement upon thirty -(30) days prior written notice if (i) the Licensee is in material breach of any -obligation of this Agreement and fails to remedy such breach within such notice -period; (ii) or Licensee or any of its Affiliates bring a suit before any court -or administrative agency or otherwise assert a claim against The Qt Company's -or any of its Affiliates' Intellectual Property Rights or validity thereof. - -12.3 Mutual Right to Terminate - -Either Party shall have the right to terminate this Agreement immediately upon -written notice in the event that the other Party becomes insolvent, files for -any form of bankruptcy, makes any assignment for the benefit of creditors, has a -receiver, administrative receiver or officer appointed over the whole or a -substantial part of its assets, ceases to conduct business, or an act equivalent -to any of the above occurs under the laws of the jurisdiction of the other -Party. - -12.4 Parties´ Rights and Duties upon Termination - -Upon expiry or termination of the Agreement for any reason, Licensee shall, -within 30 days after such termination, cease and shall cause all Designated -Users (including those of its Affiliates' and Contractors') and Licensee's SDK -Contractors to cease using the Licensed Software and distribution of the -Redistributables under this Agreement. Notwithstanding the above, in the event -the Agreement expires or is terminated for reason other than by The Qt Company -pursuant to Section 12.2, the Licensee is entitled, for a period of six (6) -months after the effective date of termination, to continue distribution of -Devices under the Distribution Licenses paid but unused at such effective date -of termination. - -Upon any such termination the Licensee shall destroy or return to The Qt -Company all copies of the Licensed Software and all related materials and will -certify the same to The Qt Company upon its request, provided however that -Licensee may retain and exploit such copies of the Licensed Software as it may -reasonably require in providing continued support to Customers. - -Expiry or termination of this Agreement for any reason whatsoever shall not -relieve Licensee of its obligation to pay any License Fees accrued or payable -to The Qt Company prior to the effective date of termination, and Licensee shall -immediately pay to The Qt Company all such fees upon the effective date of -termination. Termination of this Agreement shall not affect any rights of -Customers to continue use of Applications and Devices (and therein incorporated -Redistributables). - -13.GOVERNING LAW AND LEGAL VENUE - -In the event this Agreement is in the name of The Qt Company Inc., a Delaware -Corporation, then: - -(i) this Agreement shall be construed and interpreted in accordance with the -laws of the State of California, USA, excluding its choice of law provisions; - -(ii) the United Nations Convention on Contracts for the International Sale of -Goods will not apply to this Agreement; and - -(iii) any dispute, claim or controversy arising out of or relating to this -Agreement or the breach, termination, enforcement, interpretation or validity -thereof, including the determination of the scope or applicability of this -Agreement to arbitrate, shall be determined by arbitration in San Francisco, -USA, before one arbitrator. The arbitration shall be administered by JAMS -pursuant to JAMS' Streamlined Arbitration Rules and Procedures. Judgment on the -Award may be entered in any court having jurisdiction. This Section shall not -preclude parties from seeking provisional remedies in aid of arbitration from a -court of appropriate jurisdiction. - -In the event this Agreement is in the name of The Qt Company Ltd., a Finnish -Company, then: - -(i) this Agreement shall be construed and interpreted in accordance with the -laws of Finland, excluding its choice of law provisions; - -(ii) the United Nations Convention on Contracts for the International Sale of -Goods will not apply to this Agreement; and - -(iii) any disputes, controversy or claim arising out of or relating to this -Agreement, or the breach, termination or validity thereof shall be shall be -finally settled by arbitration in accordance with the Arbitration Rules of -Finland Chamber of Commerce. The arbitration tribunal shall consist of one (1), -or if either Party so requires, of three (3), arbitrators. The award shall be -final and binding and enforceable in any court of competent jurisdiction. The -arbitration shall be held in Helsinki, Finland and the process shall be -conducted in the English language. This Section shall not preclude parties from -seeking provisional remedies in aid of arbitration from a court of appropriate -jurisdiction. - -14. GENERAL PROVISIONS - -14.1 No Assignment Licensee - -shall not be entitled to assign or transfer all or any of its rights, benefits -and obligations under this Agreement without the prior written consent of The Qt -Company, which shall not be unreasonably withheld or delayed. The Qt Company -shall be entitled to freely assign or transfer any of its rights, benefits or -obligations under this Agreement. - -14.2 No Third Party Representations - -Licensee shall make no representations or warranties concerning the Licensed -Software on behalf of The Qt Company. Any representation or warranty Licensee -makes or purports to make on The Qt Company's behalf shall be void as to The Qt -Company. - -14.3 Surviving Sections - -Any terms and conditions that by their nature or otherwise reasonably should -survive termination of this Agreement shall so be deemed to survive. - -14.4 Entire Agreement - -This Agreement, the exhibits hereto, the License Certificate and any applicable -Purchase Order constitute the complete agreement between the Parties and -supersedes all prior or contemporaneous discussions, representations, and -proposals, written or oral, with respect to the subject matters discussed -herein. In the event of any conflict or inconsistency between this Agreement and -any Purchase Order, the terms of this Agreement will prevail over the terms of -the Purchase Order with respect to such conflict or inconsistency. - -14.5 Modifications - -No modification of this Agreement shall be effective unless contained in a -writing executed by an authorized representative of each Party. No term or -condition contained in Licensee's Purchase Order shall apply unless expressly -accepted by The Qt Company in writing. - -14.6 Force Majeure - -Except for the payment obligations hereunder, neither Party shall be liable to -the other for any delay or non-performance of its obligations hereunder in the -event and to the extent that such delay or non- performance is due to an event -of act of God, terrorist attack or other similar unforeseeable catastrophic -event that prevents either Party for fulfilling its obligations under this -Agreement and which such Party cannot avoid or circumvent ("Force Majeure -Event"). If the Force Majeure Event results in a delay or non- performance of a -Party for a period of three (3) months or longer, then either Party shall have -the right to terminate this Agreement with immediate effect without any -liability (except for the obligations of payment arising prior to the event of -Force Majeure) towards the other Party. - -14.7 Notices - -Any notice given by one Party to the other shall be deemed properly given and -deemed received if specifically acknowledged by the receiving Party in writing -or when successfully delivered to the recipient by hand, fax, or special courier -during normal business hours on a business day to the addresses specified for -The Qt Company in the beginning of this Agreement, and for the Licensee in the -Licensee’s account profile. Each communication and document made or delivered by -one Party to the other Party pursuant to this Agreement shall be in the English -language. - -14.8 Export Control -Licensee acknowledges that the Redistributables may be subject to export -control restrictions under the applicable laws of respective countries. -Licensee shall fully comply with all applicable export license restrictions -and requirements as well as with all lawses hereunder and shall procure all -necessary governmental authorizations, including without limitation, all -necessary licenses, approvals, permissions or consents, where necessary for -the re- exportation of the Redistributables, Applications -and/or Devices. - -14.9 No Implied License -There are no implied licenses or other implied rights granted under this -Agreement, and all rights, save for those expressly granted hereunder, shall -remain with The Qt Company and its licensors. In addition, no licenses or -immunities are granted to the combination of the Licensed Software with any -other software or hardware not delivered by The Qt Company under this Agreement. - -14.10 Attorney Fees - -The prevailing Party in any action to enforce this Agreement shall be entitled -to recover its attorney's fees and costs in connection with such action. - -14.11 Severability - -If any provision of this Agreement shall be adjudged by any court of competent -jurisdiction to be unenforceable or invalid, that provision shall be limited or -eliminated to the minimum extent necessary so that this Agreement shall -otherwise remain in full force and effect and enforceable. - -IN WITNESS WHEREOF, the Parties hereto, intending to be legally bound hereby, -have caused this Agreement to be executed by Licensee’s authorized -representative installing the Licensed Software and accepting the terms hereof -in connection therewith. - -Appendix 1 - -1. Parts of the Licensed Software that are permitted for distribution in object -code form only ("Redistributables") under this Agreement: - -- The Licensed Software's essential and add-on libraries - -- The Licensed Software's configuration tool ("qtconfig") - -- The Licensed Software's help tool ("Qt Assistant") - -- The Licensed Software's internationalization tools ("Qt Linguist", "lupdate", -"lrelease") - -- The Licensed Software's QML ("Qt Quick") launcher tool ("qmlscene" and -"qmlviewer") - -- The Licensed Software's installer framework - -2. Parts of the Licensed Software that are not permitted for distribution -include, but are not limited to: - -- The Licensed Software's source code and header files - -- The Licensed Software's documentation - -- The Licensed Software's documentation generation tool ("qdoc") - -- The Licensed Software's tool for writing makefiles ("qmake") - -- The Licensed Software's Meta Object Compiler ("moc") - -- The Licensed Software's User Interface Compiler ("uic" or in the case of Qt Jambi: "juic") - -- The Licensed Software's Resource Compiler ("rcc") - -- The Licensed Software's generator (only in the case of Qt Jambi if applicable) - -- The Licensed Software's parts of the IDE tool ("Qt Creator") - -- The Licensed Software's Emulator - -- Build scripts, recipes and other material for creating the -configuration of Licensed Software and/or 3rd party components, including the -reference operating system configuration delivered in conjunction with the diff -Nru qtcharts-opensource-src-5.12.5/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT qtcharts-opensource-src-5.9.5/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT --- qtcharts-opensource-src-5.12.5/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT 2019-09-06 12:05:48.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT 1970-01-01 00:00:00.000000000 +0000 @@ -1,1089 +0,0 @@ -QT LICENSE AGREEMENT -Agreement version 4.1 -This License Agreement (“Agreement”) is a legal agreement between The Qt Company -(as defined below) and the Licensee (as defined below) for the license of -Licensed Software (as defined below). Capitalized terms used herein are defined -in Section 1. -WHEREAS: - -(A) Licensee wishes to use the Licensed Software for the purpose of developing - and distributing Applications and/or Devices; and -(B) The Qt Company is willing to grant the Licensee a right to use Licensed - Software for such purpose pursuant to term and conditions of this Agreement. - -NOW, THEREFORE, THE PARTIES HEREBY AGREE AS FOLLOWS: - -1. DEFINITIONS -“Affiliate” of a Party shall mean an entity (i) which is directly or indirectly -controlling such Party; (ii) which is under the same direct or indirect -ownership or control as such Party; or (iii) which is directly or indirectly -owned or controlled by such Party. For these purposes, an entity shall be -treated as being controlled by another if that other entity has fifty percent -(50 %) or more of the votes in such entity, is able to direct its affairs and/or -to control the composition of its board of directors or equivalent body. - -“Add-on Products” shall mean The Qt Company’s specific add-on software products -(for example Qt Safe Renderer, Qt for Automation, Qt Application Manager), which -are not licensed as part of The Qt Company’s standard offering, but shall be -included into the scope of Licensed Software only if so specifically agreed -between the Parties. - -“Applications” shall mean Licensee's software products created using the -Licensed Software, which may include the Redistributables, or part thereof. - -“Contractor(s)” shall mean third party consultants, distributors and contractors -performing services to a Party under applicable contractual arrangement. - -“Customer(s)” shall mean Licensee’s end users to whom Licensee, directly or -indirectly, distributes copies of the Redistributables. - -“Deployment Platforms” shall mean operating systems specified in the License -Certificate, in which the Redistributables can be distributed pursuant to the -terms and conditions of this Agreement. - -“Designated User(s)” shall mean the employee(s) of Licensee or Licensee’s -Affiliates acting within the scope of their employment or Licensee's Contractors -acting within the scope of their services for Licensee and on behalf of -Licensee. Designated Users shall be named in the License Certificate. - -“Development License” shall mean the license needed by the Licensee for each -Designated User to use the Licensed Software under the license grant described -in Section 3.1 of this Agreement. Development Licenses are available separately -for Qt for Application Development (desktop) and Qt for Device Creation -(embedded) products, each product having its designated scope and purpose of -use. Distribution Licenses are always connected to Qt for Device Creation -product only. - -“Development Platforms” shall mean those operating systems specified in the -License Certificate, in which the Licensed Software can be used under the -Development License, but not distributed in any form or used for any other -purpose. - -“Devices” shall mean hardware devices or products that 1) are manufactured -and/or distributed by the Licensee or its Affiliates or Contractors, and 2) -(i) incorporate or integrate the Redistributables or parts thereof; or (ii) do -not incorporate or integrate the Redistributables at the time of distribution, -but where, when used by a Customer, the main user interface or substantial -functionality of such device is provided by Application(s) or otherwise depends -on the Licensed Software. Devices shall be specified in Appendix 2 or in a -quote. - -“Distribution License(s)” shall mean the license required for distribution of -Redistributables in connection with Devices pursuant to license grant described -in Section 3.3 of this Agreement. - -“Distribution License Packs” shall mean set of prepaid Distribution Licenses for -distribution of Redistributables, as defined in The Qt Company’s standard price -list, quote, Purchase Order confirmation or in an appendix hereto, as the case -may be. - -“Intellectual Property Rights” shall mean patents (including utility models), -design patents, and designs (whether or not capable of registration), chip -topography rights and other like protection, copyrights, trademarks, service -marks, trade names, logos or other words or symbols and any other form of -statutory protection of any kind and applications for any of the foregoing as -well as any trade secrets. - -“License Certificate” shall mean a certificate generated by The Qt Company for -each Designated User respectively upon them downloading the Licensed Software. -License Certificate will be available under respective Designated User’s Qt -Account at account.qt.io and it will specify the Designated User, the -Development Platforms, Deployment Platforms and the License Term. The terms of -the License Certificate are considered part of this Agreement and shall be -updated from time to time to reflect any agreed changes to the foregoing terms -relating to Designated User’s rights to the Licensed Software. - -“License Fee” shall mean the fee charged to the Licensee for rights granted -under the terms of this Agreement. - -“License Term” shall mean the agreed validity period of the Development License -of the respective Designated User, during which time the Designated User is -entitled to use the Licensed Software, as set forth in the respective License -Certificate. - -“Licensed Software” shall mean either -(i) Qt for Application Development or -(ii) Qt for Device Creation, and/or -(iii) Qt 3D Studio, and/or -(iv) Qt Design Studio, and/or -(v) selected Add-on Products, if any, depending on which product(s) the - Licensee has purchased under this Agreement, - -as well as corresponding online or electronic documentation, associated media -and printed materials, including the source code, example programs and the -documentation, licensed to the Licensee under this Agreement. Licensed Software -does not include Third Party Software (as defined in Section 4) or Open Source -Qt. The Qt Company may, in the course of its development activities, at its free -and absolute discretion and without any obligation to send or publish any -notifications to the Licensee or in general, make changes, additions or -deletions in the components and functionalities of the Licensed Software, -provided that no such changes, additions or deletions will affect the already -released version of the Licensed Software, but only upcoming version(s). - -“Licensee” shall mean the individual or legal entity that is party to this -Agreement, as identified on the signature page hereof. - -“Licensee’s Records” shall mean books and records that are likely to contain -information bearing on Licensee’s compliance with this Agreement or the payments -due to The Qt Company under this Agreement, including, but not limited to: -assembly logs, sales records and distribution records. - -“Modified Software” shall have the meaning as set forth in Section 2.3. - -“Online Services” shall mean any services or access to systems made available by -The Qt Company to the Licensee over the Internet relating to the Licensed -Software or for the purpose of use by the Licensee of the Licensed Software or -Support. Use of any such Online Services is discretionary for the Licensee and -some of them may be subject to additional fees. - -“Open Source Qt” shall mean the non-commercial Qt computer software products, -licensed under the terms of the GNU Lesser General Public License, version 2.1 -or later (“LGPL”) or the GNU General Public License, version 2.0 or later -(“GPL”). For clarity, Open Source Qt shall not be provided nor governed under -this Agreement. - -”Party” or “Parties” shall mean Licensee and/or The Qt Company. - -“Qt 3D Studio” shall mean all versions of The Qt Company’s Qt 3D Studio, a 3D -user interface design and development environment for rapid designing and -prototyping of animated user interfaces. - -“Qt Design Studio” shall mean all versions of The Qt Company’s Qt Design Studio -tool, a 2D user interface design and development environment for rapid designing -and prototyping of animated user interfaces. - -“Qt for Application Development” shall mean The Qt Company’s productized -offering, which consist of all versions of -(i) Qt Toolkit, and -(ii) Qt Tools/Applications. - -“Qt for Device Creation” shall mean The Qt Company’s productized offering, -which consist of all versions of -(i) Qt for Application Development, and -(ii) Software components specific to embedded software development as set forth - in Appendix 1, Sections 1b and 1d. - -“Qt Toolkit” shall mean the modules defined in Appendix 1, Section 1a. - -“Qt Tools/Applications” shall mean the tools defined in Appendix 1, Section 1c. - -"Redistributables" shall mean the portions of the Licensed Software set forth in -Appendix 1, Section 2 that may be distributed pursuant to the terms of this -Agreement in object code form only, including any relevant documentation. Where -relevant, any reference to Licensed Software in this Agreement shall include and -refer also to Redistributables. - -“Renewal Term” shall mean an extension of previous License Term as agreed -between the Parties. - -“Submitted Modified Software” shall have the meaning as set forth in -Section 2.3. - -“Support” shall mean standard developer support that is provided by The Qt -Company to assist Designated Users in using the Licensed Software in accordance -with The Qt Company’s standard support terms and as further defined in -Section 8 hereunder. - -“Taxes” shall have the meaning set forth in Section 10.5. - -“Term” shall have the meaning set forth in Section 12. - -“The Qt Company” shall mean: -(i) in the event Licensee is an individual residing in the United States or a - legal entity incorporated in the United States or having its headquarters - in the United States, The Qt Company Inc., a Delaware corporation with its - office at 2350 Mission College Blvd., Suite 1020, Santa Clara, CA 95054, - USA.; or -(ii) in the event the Licensee is an individual residing outside of the United - States or a legal entity incorporated outside of the United States or - having its registered office outside of the United States, The Qt Company - Ltd., a Finnish company with its registered office at Bertel Jungin aukio - D3A, 02600 Espoo, Finland. - -"Third Party Software " shall have the meaning set forth in Section 4. - -“Updates” shall mean a release or version of the Licensed Software containing -bug fixes, error corrections and other changes that are generally made available -to users of the Licensed Software that have contracted for Support. Updates are -generally depicted as a change to the digits following the decimal in the -Licensed Software version number. The Qt Company shall make Updates available to -the Licensee under the Support. Updates shall be considered as part of the -Licensed Software hereunder. - -“Upgrades” shall mean a release or version of the Licensed Software containing -enhancements and new features and are generally depicted as a change to the -first digit of the Licensed Software version number. In the event Upgrades are -provided to the Licensee under this Agreement, they shall be considered as part -of the Licensed Software hereunder. - -2. OWNERSHIP -2.1 Ownership of The Qt Company -The Licensed Software is protected by copyright laws and international copyright -treaties, as well as other intellectual property laws and treaties. The Licensed -Software is licensed, not sold. All The Qt Company's Intellectual Property -Rights are and shall remain the exclusive property of The Qt Company or its -licensors respectively. - -2.2 Ownership of Licensee -All the Licensee's Intellectual Property Rights are and shall remain the -exclusive property of the Licensee or its licensors respectively. All -Intellectual Property Rights to the Modified Software, Applications and Devices -shall remain with the Licensee and no rights thereto shall be granted by the -Licensee to The Qt Company under this Agreement (except as set forth in Section -2.3 below). - -2.3 Modified Software -Licensee may create bug-fixes, error corrections, patches or modifications to -the Licensed Software (“Modified Software”). Such Modified Software may break -the source or binary compatibility with the Licensed Software (including without -limitation through changing the application programming interfaces ("API") or by -adding, changing or deleting any variable, method, or class signature in the -Licensed Software and/or any inter-process protocols, services or standards in -the Licensed Software libraries). To the extent that Licensee’s Modified -Software so breaks source or binary compatibility with the Licensed Software, -Licensee acknowledges that The Qt Company's ability to provide Support may be -prevented or limited and Licensee's ability to make use of Updates may be -restricted. Licensee may, at its sole and absolute discretion, choose to submit -Modified Software to The Qt Company (“Submitted Modified Software”) in -connection with Licensee’s Support request, service request or otherwise. In the -event Licensee does so, then, Licensee hereby grants The Qt Company a -sublicensable, assignable, irrevocable, perpetual, worldwide, non-exclusive, -royalty-free and fully paid-up license, under all of Licensee’s Intellectual -Property Rights, to reproduce, adapt, translate, modify, and prepare derivative -works of, publicly display, publicly perform, sublicense, make available and -distribute such Submitted Modified Software as The Qt Company sees fit at its -free and absolute discretion. - -3. LICENSES GRANTED -3.1 Development with Licensed Software -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable license, valid for the -License Term, to use, modify and copy the Licensed Software by Designated Users -on the Development Platforms for the sole purposes of designing, developing, -demonstrating and testing Application(s) and/or Devices, and to provide thereto -related support and other related services to end-user Customers. Licensee may -install copies of the Licensed Software on an unlimited number of computers -provided that (i) only the Designated Users may use the Licensed Software, and -(ii) all Designated Users must have a valid Development License to use Licensed -Software. Licensee may at any time designate another Designated User to replace -a then-current Designated User by notifying The Qt Company in writing, provided -that any Designated User may be replaced only once during any six-month period. -Upon expiry of the initially agreed License Term, the respective License Terms -shall be automatically extended to one or more Renewal Term(s), unless and until -either Party notifies the other Party in writing that it does not wish to -continue the License Term, such notification to be provided to the other Party -no less than ninety (90) days before expiry of the respective License Term. -Unless otherwise agreed between the Parties, Renewal Term shall be of equal -length with the initial Term. Any such Renewal Term shall be subject to License -Fees agreed between the Parties or, if no advance agreement exists, subject to -The Qt Company’s standard pricing applicable at the commencement date of any -such Renewal Term. - -3.2 Distribution of Applications -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable, revocable (for cause -pursuant to this Agreement) right and license, valid for the Term, to (i) -distribute, by itself or through its Contractors, Redistributables as installed, -incorporated or integrated into Applications for execution on the Deployment -Platforms, and (ii) grant sublicenses to Redistributables, as distributed -hereunder, for Customers solely for Customer’s internal use and to the extent -necessary in order for the Customers to use the Applications for their -respective intended purposes. -Right to distribute the Redistributables as part of an Application as provided -herein is not royalty-bearing but is conditional upon the Licensee having paid -the agreed Development Licenses from The Qt Company before distributing any -Redistributables to Customers. - -3.3 Distribution of Devices -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable, revocable (for cause -pursuant to this Agreement) right and license, valid for the Term, to (i) -distribute, by itself or through one or more tiers of Contractors, -Redistributables as installed, incorporated or integrated, or intended to be -installed, incorporated or integrated into Devices for execution on the -Deployment Platforms, and (ii) grant sublicenses to Redistributables, as -distributed hereunder, for Customers solely for Customer’s internal use and to -the extent necessary in order for the Customers to use the Devices for their -respective intended purposes. -Right to distribute the Redistributables with Devices as provided herein is -conditional upon the Licensee having purchased and paid the appropriate amount -of Development Licenses for Qt for Device Creation product and Distribution -Licenses from The Qt Company before distributing any Redistributables to -Customers. - -3.4 Further Requirements -The licenses granted above in this Section 3 by The Qt Company to Licensee are -conditional and subject to Licensee's compliance with the following terms: -(i) Licensee shall not remove or alter any copyright, trademark or other - proprietary rights notice contained in any portion of the Licensed - Software; -(ii) Applications must add primary and substantial functionality to the - Licensed Software; -(iii) Applications may not pass on functionality which in any way makes it - possible for others to create software with the Licensed Software; - provided however that Licensee may use the Licensed Software's scripting - and QML ("Qt Quick") functionality solely in order to enable scripting, - themes and styles that augment the functionality and appearance of the - Application(s) without adding primary and substantial functionality to - the Application(s); -(iv) Applications must not compete with the Licensed Software; -(v) Licensee shall not use The Qt Company's or any of its suppliers' names, - logos, or trademarks to market Applications, except that Licensee may use - “Built with Qt” logo to indicate that Application(s) was developed using - the Licensed Software; -(vi) Licensee shall not distribute, sublicense or disclose source code of - Licensed Software to any third party (provided however that Licensee may - appoint employee(s) of Contractors as Designated Users to use Licensed - Software pursuant to this Agreement). Such right may be available for the - Licensee subject to a separate software development kit (“SDK”) license - agreement to be concluded with The Qt Company; -(vii) Licensee shall not grant the Customers a right to (i) make copies of the - Redistributables except when and to the extent required to use the - Applications and/or Devices for their intended purpose, (ii) modify the - Redistributables or create derivative works thereof, (iii) decompile, - disassemble or otherwise reverse engineer Redistributables, or (iv) - redistribute any copy or portion of the Redistributables to any third - party, except as part of the onward sale of the Device on which the - Redistributables are installed; -(viii) Licensee shall not and shall cause that its Affiliates or Contractors - shall not a) in any way combine, incorporate or integrate Licensed - Software with, or use Licensed Software for creation of, any software - created with or incorporating Open Source Qt, or b) incorporate or - integrate Applications into a hardware device or product other than a - Device, unless Licensee has received an advance written permission from - The Qt Company to do so. Absent such written permission, any and all - distribution by the Licensee during the Term of a hardware device or - product a) which incorporate or integrate any part of Licensed Software - or Open Source Qt; or b) where the main user interface or substantial - functionality is provided by software built with Licensed Software or - Open Source Qt or otherwise depends on the Licensed Software or Open - Source Qt, shall be considered as a Device distribution under this - Agreement and dependent on compliance thereof (including but not limited - to obligation to pay applicable License Fees for such distribution). - Notwithstanding what is provided above in this sub-section (viii), - Licensee is entitled to use and combine Qt 3D Studio and/or Qt Design - Studio with Open Source Qt (“Combination”) for its internal evaluation - purposes, provided that Licensee shall in no way transfer, publish, - disclose, display or otherwise make available any software or work - resulting from such Combination; -(ix) Licensee shall cause all of its Affiliates and Contractors entitled to - make use of the licenses granted under this Agreement, to be - contractually bound to comply with the relevant terms of this Agreement - and not to use the Licensed Software beyond the terms hereof and for any - purposes other than operating within the scope of their services for - Licensee. Licensee shall be responsible for any and all actions and - omissions of its Affiliates and Contractors relating to the Licensed - Software and use thereof (including but not limited to payment of all - applicable License Fees); -(x) Except when and to the extent explicitly provided in this Section 3, - Licensee shall not transfer, publish, disclose, display or otherwise - make available the Licensed Software; -; and -(xi) Licensee shall not attempt or enlist a third party to conduct or attempt - to conduct any of the above. - -Above terms shall not be applicable if and to the extent they conflict with any -mandatory provisions of any applicable laws. Any use of Licensed Software beyond -the provisions of this Agreement is strictly prohibited and requires an -additional license from The Qt Company. - -4. THIRD PARTY SOFTWARE -The Licensed Software may provide links to third party libraries or code -(collectively "Third Party Software") to implement various functions. Third -Party Software does not comprise part of the Licensed Software. In some cases, -access to Third Party Software may be included in the Licensed Software. Such -Third Party Software will be listed in the ".../src/3rdparty" source tree -delivered with the Licensed Software or documented in the Licensed Software, as -such may be amended from time to time. Licensee acknowledges that use or -distribution of Third Party Software is in all respects subject to applicable -license terms of applicable third party right holders. - -5. PRE-RELEASE CODE -The Licensed Software may contain pre-release code and functionality marked or -otherwise stated as “Technology Preview”, “Alpha”, “Beta” or similar -designation. Such pre-release code may be present in order to provide -experimental support for new platforms or preliminary versions of one or more -new functionalities. The pre-release code may not be at the level of performance -and compatibility of a final, generally available, product offering of the -Licensed Software. The pre-release parts of the Licensed Software may not -operate correctly, may contain errors and may be substantially modified by The -Qt Company prior to the first commercial product release, if any. The Qt Company -is under no obligation to make pre-release code commercially available, or -provide any Support or Updates relating thereto. The Qt Company assumes no -liability whatsoever regarding any pre-release code, but any use thereof is -exclusively at Licensee’s own risk and expense. For clarity, Licensee is -entitled to use such pre-release code pursuant to Section 3, just like other -Licensed Software, provided however that in the event Add-on Products are -included and available as such pre-release code, Licensee’s right to use such -Add-on Products is nevertheless subject to and conditional upon conclusion of -separate agreement with The Qt Company. - -6. LIMITED WARRANTY AND WARRANTY DISCLAIMER -The Qt Company hereby represents and warrants that it has the power and -authority to grant the rights and licenses granted to Licensee under this -Agreement. Except as set forth above, the Licensed Software is licensed to -Licensee "as is" and Licensee’s exclusive remedy and The Qt Company’s entire -liability for errors in the Licensed Software shall be limited, at The Qt -Company’s option, to correction of the error, replacement of the Licensed -Software or return of the applicable fees paid for the defective Licensed -Software for the time period during which the License is not able to utilize the -Licensed Software under the terms of this Agreement. - -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF -ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER -WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND -NON-INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES NOT -WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE’S REQUIREMENTS OR THAT -IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE -UNINTERRUPTED. ALL USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE -RISK OF AND RESPONSIBILITY OF LICENSEE. - -7. INDEMNIFICATION AND LIMITATION OF LIABILITY -7.1 Limitation of Liability -EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II) -BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO -EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY FOR ANY LOSS OF PROFIT, -LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, SPECIAL, -CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY KIND, -HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT. PARTIES -SPECIFICALLY AGREE THAT LICENSEE’S OBLIGATION TO PAY LICENSE AND OTHER FEES -CORRESPONDING TO ACTUAL USAGE OF LICENSED SOFTWARE HEREUNDER SHALL BE CONSIDERED -AS A DIRECT DAMAGE. EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL -MISCONDUCT, AND (II) BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY -APPLICABLE LAW, IN NO EVENT SHALL EITHER PARTY’S TOTAL AGGREGATE LIABILITY UNDER -THIS AGREEMENT EXCEED THE AGGREGATE LICENSE FEES PAID OR PAYABLE TO THE QT -COMPANY FROM LICENSEE DURING THE PERIOD OF TWELVE (12) MONTHS IMMEDIATELY -PRECEDING THE EVENT RESULTING IN SUCH LIABILITY. THE PROVISIONS OF THIS SECTION -7 ALLOCATE THE RISKS UNDER THIS AGREEMENT BETWEEN THE QT COMPANY AND LICENSEE -AND THE PARTIES HAVE RELIED UPON THE LIMITATIONS SET FORTH HEREIN IN DETERMINING -WHETHER TO ENTER INTO THIS AGREEMENT. - -7.2 Licensee´s Indemnification -Licensee shall indemnify and hold harmless The Qt Company from and against any -claim, injury, judgment, settlement, loss or expense, including attorneys' fees -related to: (a) Licensee’s misrepresentation in connection with The Qt Company -or the Licensed Software or breach of this Agreement, (b) the Application or -Device (except where such cause of liability is solely attributable to the -Licensed Software). - -8. SUPPORT, UPDATES AND ONLINE SERVICES -Upon due payment of the agreed License Fees the Licensee will be eligible to -receive Support and Updates and to use the Online Services during the License -Term, provided, however, that in the event the License Term is longer than 36 -months, Support is provided only for the first 12 months, unless the Parties -specifically otherwise agree. Unless otherwise decided by The Company at its -free and absolute discretion, Upgrades will not be included in the Support but -may be available subject to additional fees. From time to time The Qt Company -may change the Support terms, provided that during the respective ongoing -License Term the level of Support provided by The Qt Company may not be reduced -without the consent of the Licensee. Unless otherwise agreed, The Qt Company -shall not be responsible for providing any service or support to Customers. - -9. CONFIDENTIALITY -Each Party acknowledges that during the Term of this Agreement each Party may -receive information about the other Party's business, business methods, business -plans, customers, business relations, technology, and other information, -including the terms of this Agreement, that is confidential and of great value -to the other Party, and the value of which would be significantly reduced if -disclosed to third parties (“Confidential Information”). Accordingly, when a -Party (the “Receiving Party”) receives Confidential Information from the other -Party (the “Disclosing Party”), the Receiving Party shall only disclose such -information to employees and Contractors on a need to know basis, and shall -cause its employees and employees of its Affiliates to: (i) maintain any and all -Confidential Information in confidence; (ii) not disclose the Confidential -Information to a third party without the Disclosing Party's prior written -approval; and (iii) not, directly or indirectly, use the Confidential -Information for any purpose other than for exercising its rights and fulfilling -its responsibilities pursuant to this Agreement. Each Party shall take -reasonable measures to protect the Confidential Information of the other Party, -which measures shall not be less than the measures taken by such Party to -protect its own confidential and proprietary information. Obligation of -confidentiality shall not apply to information that (i) is or becomes generally -known to the public through no act or omission of the Receiving Party; (ii) was -in the Receiving Party's lawful possession prior to the disclosure hereunder and -was not subject to limitations on disclosure or use; (iii) is developed -independently by employees or Contractors of the Receiving Party or other -persons working for the Receiving Party who have not had access to the -Confidential Information of the Disclosing Party, as proven by the written -records of the Receiving Party; (iv) is lawfully disclosed to the Receiving -Party without restrictions, by a third party not under an obligation of -confidentiality; or (v) the Receiving Party is legally compelled to disclose, in -which case the Receiving Party shall notify the Disclosing Party of such -compelled disclosure and assert the privileged and confidential nature of the -information and cooperate fully with the Disclosing Party to limit the scope of -disclosure and the dissemination of disclosed Confidential Information to the -minimum extent necessary. The obligations under this Section 9 shall continue to -remain in force for a period of five (5) years after the last disclosure, and, -with respect to trade secrets, for so long as such trade secrets are protected -under applicable trade secret laws. - -10. FEES, DELIVERY AND PAYMENT -10.1 License Fees -License Fees are described in The Qt Company’s standard price list, quote or -Purchase Order confirmation or in an appendix hereto, as the case may be. The -License Fees shall not be refunded or claimed as a credit in any event or for -any reason whatsoever. - -10.2 Ordering Licenses -Licensee may purchase Development Licenses and Distribution Licenses pursuant to -agreed pricing terms or, if no specific pricing terms have been agreed upon, at -The Qt Company's standard pricing terms applicable at the time of purchase. -Licensee shall submit all purchase orders for Development Licenses and -Distribution Licenses to The Qt Company by email or any other method acceptable -to The Qt Company (each such order is referred to herein as a “Purchase Order”) -for confirmation, whereupon the Purchase Order shall become binding between the -Parties. - -10.3 Distribution License Packs -Unless otherwise agreed, Distribution Licenses shall be purchased by way of -Distribution License Packs. Upon due payment of the ordered Distribution License -Pack(s), the Licensee will have an account of Distribution Licenses available -for installing, bundling or integrating (all jointly “installing”) the -Redistributables with the Devices or for otherwise distributing the -Redistributables in accordance with this Agreement. Each time Licensee -“installs” or distributes a copy of Redistributables, then one Distribution -License is used, and Licensee’s account of available Distribution Licenses is -decreased accordingly. Licensee may “install” copies of the Redistributables so -long as Licensee has Distribution Licenses remaining on its account. -Redistributables will be deemed to have been “installed” into a Device when one -of the following circumstances shall have occurred: a) the Redistributables have -been loaded onto the Device and used outside of the Licensee’s premises or b) -the Device has been fully tested and placed into Licensee's inventory (or sold) -for the first time (i.e., Licensee will not be required to use (or pay for) more -than one Distribution License for each individual Device, e.g. in a situation -where a Device is returned to Licensee's inventory after delivery to a -distributor or sale to a Customer). In addition, if Licensee includes a back-up -copy of the Redistributables on a CD-ROM or other storage medium along with the -product, that backup copy of the Redistributables will not be deemed to have -been “installed” and will not require an additional Distribution License. - -10.4 Payment Terms -License Fees and any other charges under this Agreement shall be paid by -Licensee no later than thirty (30) days from the date of the applicable invoice -from The Qt Company. The Qt Company will submit an invoice to Licensee after the -date of this Agreement and/or after The Qt Company receives a Purchase Order -from Licensee. A late payment charge of the lower of (a) one percent per month; -or (b) the interest rate stipulated by applicable law, shall be charged on any -unpaid balances that remain past due. The Qt Company shall have the right to -suspend, terminate or withhold grants of all rights to the Licensed Software -hereunder, including but not limited to the Developer License, Distribution -License, and Support, should Licensee fail to make payment in timely fashion. - -10.5 Taxes -All License Fees and other charges payable hereunder are gross amounts but -exclusive of any value added tax, use tax, sales tax and other taxes, duties or -tariffs (“Taxes”). Such applicable Taxes shall be paid by Licensee, or, where -applicable, in lieu of payment of such Taxes, Licensee shall provide an -exemption certificate to The Qt Company and any applicable authority. - -11 RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS -11.1 Licensee’s Record-keeping -Licensee shall at all times maintain accurate and up-to-date written records of -Licensee’s activities related to the use of Licensed Software and distribution -of Redistributables. The records shall be adequate to determine Licensee’s -compliance with the provisions of this Agreement and to demonstrate the number -of Designated Users and Redistributables distributed by Licensee. The records -shall conform to good accounting practices reasonably acceptable to The Qt -Company. Licensee shall, within thirty (30) days from receiving The Qt Company’s -request to that effect, deliver to The Qt Company a report on Licensee’s usage -of Licensed Software, such report to contain information, in sufficient detail, -on (i) amount of users working with Licensed Software, (ii) copies of -Redistributables distributed by Licensee during that calendar quarter, (iii) -number of undistributed copies of Redistributables and corresponding number of -unused Distribution Licenses remaining on Licensee’s account, and (iv) any other -information as The Qt Company may reasonably require from time to time. - -11.2. The Qt Company’s Audit Rights -The Qt Company or an independent auditor acting on behalf of The Qt Company’s, -may, upon at least five (5) business days’ prior written notice and at its -expense, audit Licensee with respect to the use of the Redistributables, but not -more frequently than once during each 6-month period. Such audit may be -conducted by mail, electronic means or through an in-person visit to Licensee’s -place of business. Any such in-person audit shall be conducted during regular -business hours at Licensee's facilities and shall not unreasonably interfere -with Licensee's business activities. The Qt Company or the independent auditor -acting on behalf of The Qt Company shall be entitled to inspect Licensee’s -Records. All such Licensee’s Records and use thereof shall be subject to an -obligation of confidentiality under this Agreement. If an audit reveals that -Licensee is using the Licensed Software beyond scope of the licenses Licensee -has paid for, Licensee agrees to immediately pay The Qt Company any amounts owed -for such unauthorized use. -In addition, in the event the audit reveals a material violation of the terms of -this Agreement (underpayment of more than 5% of License Fees shall always be -deemed a material violation for purposes of this section), then the Licensee -shall pay The Qt Company's reasonable cost of conducting such audit. - -12 TERM AND TERMINATION -12.1 Term -This Agreement shall enter into force upon due acceptance by both Parties and -remain in force for as long as there is any Development License(s) in force -(“Term”), unless and until terminated pursuant to the terms of this Section 12. - -12.2 Termination by The Qt Company -The Qt Company shall have the right to terminate this Agreement upon thirty (30) -days prior written notice if the Licensee is in material breach of any -obligation of this Agreement and fails to remedy such breach within such notice -period. - -12.3 Mutual Right to Terminate -Either Party shall have the right to terminate this Agreement immediately upon -written notice in the event that the other Party becomes insolvent, files for -any form of bankruptcy, makes any assignment for the benefit of creditors, has a -receiver, administrative receiver or officer appointed over the whole or a -substantial part of its assets, ceases to conduct business, or an act equivalent -to any of the above occurs under the laws of the jurisdiction of the other -Party. - -12.4 Parties´ Rights and Duties upon Termination -Upon expiry or termination of the Agreement Licensee shall cease and shall cause -all Designated Users (including those of its Affiliates’ and Contractors’) to -cease using the Licensed Software and distribution of the Redistributables under -this Agreement. -Notwithstanding the above, in the event the Agreement expires or is terminated: -(i) as a result of The Qt Company choosing not to renew the Development - License(s) as set forth in Section 3.1, then all valid licenses possessed - by the Licensee at such date shall be extended to be valid in perpetuity - under the terms of this Agreement and Licensee is entitled to purchase - additional licenses as set forth in Section 10.2; or -(ii) for reason other than by The Qt Company pursuant to item (i) above or - pursuant to Section 12.2, then the Licensee is entitled, for a period of - six (6) months after the effective date of termination, to continue - distribution of Devices under the Distribution Licenses paid but unused at - such effective date of termination. Upon any such termination the Licensee - shall destroy or return to The Qt Company all copies of the Licensed - Software and all related materials and will certify the same to The Qt - Company upon its request, provided however that Licensee may retain and - exploit such copies of the Licensed Software as it may reasonably require - in providing continued support to Customers. -Expiry or termination of this Agreement for any reason whatsoever shall not -relieve Licensee of its obligation to pay any License Fees accrued or payable to -The Qt Company prior to the effective date of termination, and Licensee shall -immediately pay to The Qt Company all such fees upon the effective date of -termination. Termination of this Agreement shall not affect any rights of -Customers to continue use of Applications and Devices (and therein incorporated -Redistributables). - -12.5 Extension in case of bankruptcy -In the event The Qt Company is declared bankrupt under a final, non-cancellable -decision by relevant court of law, and this Agreement is not, at the date of -expiry of the Development License(s) pursuant to Section 3.1, assigned to party, -who has assumed The Qt Company’s position as a legitimate licensor of Licensed -Software under this Agreement, then all valid licenses possessed by the Licensee -at such date of expiry, and which the Licensee has not notified for expiry, -shall be extended to be valid in perpetuity under the terms of this Agreement. - -13. GOVERNING LAW AND LEGAL VENUE -In the event this Agreement is in the name of The Qt Company Inc., a Delaware -Corporation, then: -(i) this Agreement shall be construed and interpreted in accordance with the - laws of the State of California, USA, excluding its choice of law - provisions; -(ii) the United Nations Convention on Contracts for the International Sale of - Goods will not apply to this Agreement; and -(iii) any dispute, claim or controversy arising out of or relating to this - Agreement or the breach, termination, enforcement, interpretation or - validity thereof, including the determination of the scope or - applicability of this Agreement to arbitrate, shall be determined by - arbitration in San Francisco, USA, before one arbitrator. The arbitration - shall be administered by JAMS pursuant to JAMS' Streamlined Arbitration - Rules and Procedures. Judgment on the Award may be entered in any court - having jurisdiction. This Section shall not preclude parties from seeking - provisional remedies in aid of arbitration from a court of appropriate - jurisdiction. -In the event this Agreement is in the name of The Qt Company Ltd., a Finnish -Company, then: -(i) this Agreement shall be construed and interpreted in accordance with the - laws of Finland, excluding its choice of law provisions; -(ii) the United Nations Convention on Contracts for the International Sale of - Goods will not apply to this Agreement; and -(iii) any disputes, controversy or claim arising out of or relating to this - Agreement, or the breach, termination or validity thereof shall be shall - be finally settled by arbitration in accordance with the Arbitration Rules - of Finland Chamber of Commerce. The arbitration tribunal shall consist of - one (1), or if either Party so requires, of three (3), arbitrators. The - award shall be final and binding and enforceable in any court of competent - jurisdiction. The arbitration shall be held in Helsinki, Finland and the - process shall be conducted in the English language. This Section shall not - preclude parties from seeking provisional remedies in aid of arbitration - from a court of appropriate jurisdiction. - -14. GENERAL PROVISIONS -14.1 No Assignment -Except in the case of a merger or sale of substantially all of its corporate -assets, Licensee shall not be entitled to assign or transfer all or any of its -rights, benefits and obligations under this Agreement without the prior written -consent of The Qt Company, which shall not be unreasonably withheld or delayed. -The Qt Company shall be entitled to freely assign or transfer any of its rights, -benefits or obligations under this Agreement. - -14.2 No Third Party Representations -Licensee shall make no representations or warranties concerning the Licensed -Software on behalf of The Qt Company. Any representation or warranty Licensee -makes or purports to make on The Qt Company’s behalf shall be void as to The Qt -Company. - -14.3 Surviving Sections -Any terms and conditions that by their nature or otherwise reasonably should -survive termination of this Agreement shall so be deemed to survive. - -14.4 Entire Agreement -This Agreement, the exhibits hereto, the License Certificate and any applicable -Purchase Order constitute the complete agreement between the Parties and -supersedes all prior or contemporaneous discussions, representations, and -proposals, written or oral, with respect to the subject matters discussed -herein. -In the event of any conflict or inconsistency between this Agreement and any -Purchase Order, the terms of this Agreement will prevail over the terms of the -Purchase Order with respect to such conflict or inconsistency. -Parties specifically acknowledge and agree that this Agreement prevails over any -click-to-accept or similar agreements the Designated Users may need to accept -online upon download of the Licensed Software, as may be required by The Qt -Company’s applicable processes relating to Licensed Software. - -14.5 Modifications -No modification of this Agreement shall be effective unless contained in a -writing executed by an authorized representative of each Party. No term or -condition contained in Licensee's Purchase Order shall apply unless expressly -accepted by The Qt Company in writing. - -14.6 Force Majeure -Except for the payment obligations hereunder, neither Party shall be liable to -the other for any delay or non-performance of its obligations hereunder in the -event and to the extent that such delay or non-performance is due to an event of -act of God, terrorist attack or other similar unforeseeable catastrophic event -that prevents either Party for fulfilling its obligations under this Agreement -and which such Party cannot avoid or circumvent (“Force Majeure Event”). If the -Force Majeure Event results in a delay or non-performance of a Party for a -period of three (3) months or longer, then either Party shall have the right to -terminate this Agreement with immediate effect without any liability (except for -the obligations of payment arising prior to the event of Force Majeure) towards -the other Party. - -14.7 Notices -Any notice given by one Party to the other shall be deemed properly given and -deemed received if specifically acknowledged by the receiving Party in writing -or when successfully delivered to the recipient by hand, fax, or special courier -during normal business hours on a business day to the addresses specified for -each Party on the signature page. Each communication and document made or -delivered by one Party to the other Party pursuant to this Agreement shall be in -the English language. - -14.8 Export Control -Licensee acknowledges that the Redistributables may be subject to export control -restrictions under the applicable laws of respective countries. Licensee shall -fully comply with all applicable export license restrictions and requirements as -well as with all laws and regulations relating to the Redistributables and -exercise of licenses hereunder and shall procure all necessary governmental -authorizations, including without limitation, all necessary licenses, approvals, -permissions or consents, where necessary for the re-exportation of the -Redistributables, Applications and/or Devices. - -14.9 No Implied License -There are no implied licenses or other implied rights granted under this -Agreement, and all rights, save for those expressly granted hereunder, shall -remain with The Qt Company and its licensors. In addition, no licenses or -immunities are granted to the combination of the Licensed Software with any -other software or hardware not delivered by The Qt Company under this Agreement. - -14.10 Attorney Fees -The prevailing Party in any action to enforce this Agreement shall be entitled -to recover its attorney’s fees and costs in connection with such action. - -14.11 Severability -If any provision of this Agreement shall be adjudged by any court of competent -jurisdiction to be unenforceable or invalid, that provision shall be limited or -eliminated to the minimum extent necessary so that this Agreement shall -otherwise remain in full force and effect and enforceable. - - - -APPENDICES -The Agreement includes Appendix 1 as shown below. In addition, the Agreement may -include one or more of the Appendices 3-5 listed below depending on the -product(s) purchased by the Licensee, what is stated in the quote or invoice, -and/or what is stated on the License Certificate. - -  -APPENDIX 1: LICENSED SOFTWARE -1a. Licensed Software - Qt Toolkit -Module Description -Qt Core Core non-graphical classes used by other modules. -Qt GUI Base classes for graphical user interface (GUI) - components. -Qt Multimedia Classes for audio, video and camera functionality. -Qt Multimedia Widgets Widget-based classes for implementing multimedia - functionality. -Qt Network Classes to make network programming easier and more - portable. -Qt QML Classes for QML and JavaScript languages. -Qt Quick A declarative framework for building highly dynamic - applications with custom user interfaces. -Qt Quick Controls 2 Provides lightweight QML types for creating - performant user interfaces for desktop, embedded, and - mobile devices. -Qt Quick Dialogs Types for creating and interacting with system - dialogs from a Qt Quick application. -Qt Quick Layouts Layouts are items that are used to arrange Qt Quick 2 - based items in the user interface. -Qt Quick Test A unit test framework for QML applications. -Qt SQL Classes for database integration using SQL. -Qt Test Classes for unit testing Qt applications and - libraries. -Qt Widgets Classes to extend Qt GUI with C++ widgets. -Active Qt Classes for applications which use ActiveX and COM -Qt 3D Functionality for near-realtime simulation systems - with support for 2D and 3D rendering. -Qt Android Extras Provides platform-specific APIs for Android. -Qt Bluetooth Provides access to Bluetooth hardware. -Qt Canvas 3D Enables OpenGL-like 3D drawing calls from Qt Quick - applications using JavaScript. -Qt Concurrent Classes for writing multi-threaded programs without - using low-level threading primitives. -Qt D-Bus Classes for inter-process communication over the - D-Bus protocol. -Qt Gamepad Enables Qt applications to support the use of gamepad - hardware. -Qt Graphical Effects Graphical effects for use with Qt Quick 2. -Qt Help Classes for integrating documentation into - applications, similar to Qt Assistant. -Qt Image Formats Plugins for additional image formats: TIFF, MNG, TGA, - WBMP. -Qt Location Displays map, navigation, and place content in a QML - application. -Qt Mac Extras Provides platform-specific APIs for macOS. -Qt Network Authorization Provides support for OAuth-based authorization to - online services. -Qt NFC Provides access to Near-Field communication (NFC) - hardware. -Qt Platform Headers Provides classes that encapsulate platform-specific - information. -Qt Positioning Provides access to position, satellite and area - monitoring classes. -Qt Print Support Classes to make printing easier and more portable. -Qt Purchasing Enables in-app purchase of products in Qt - applications. -Qt for Python Python bindings for Qt. -Qt Quick Controls Reusable Qt Quick based UI controls to create classic - desktop-style user interfaces. -Qt Quick Extras Provides a specialized set of controls that can be - used to build interfaces in Qt Quick. -Qt Quick Widgets Provides a C++ widget class for displaying a Qt - Quick user interface. -Qt SCXML Provides classes and tools for creating state - machines from SCXML files. -Qt Sensors Provides access to sensor hardware and motion gesture - recognition. -Qt Serial Bus Provides access to serial industrial bus interface. -Qt Serial Port Provides access to hardware and virtual serial ports. -Qt Speech Provides support for accessibility features such as - text-to-speech. -Qt SVG Classes for displaying the contents of SVG files. -Qt UI Tools Classes for loading QWidget based forms created in Qt - Designer dynamically, at runtime. -Qt WebChannel Provides access to QObject or QML objects from HTML - clients for seamless integration of Qt applications - with HTML/JavaScript clients. -Qt WebEngine Classes and functions for embedding web content in - applications using the Chromium browser project. -Qt WebSockets Provides WebSocket communication. -Qt WebView Displays web content in a QML application by using - APIs native to the platform. -Qt Windows Extras Provides platform-specific APIs for Windows. -Qt X11 Extras Provides platform-specific APIs for X11. -Qt XML C++ implementations of SAX and DOM. -Qt XML Patterns Support for XPath, XQuery, XSLT and XML schema - validation. -Qt Wayland Compositor Provides a framework to develop a Wayland compositor. -Qt Charts UI Components for displaying charts. -Qt Data Visualization UI Components for creating 3D data visualizations. -Qt Virtual Keyboard A framework for implementing different input methods - as well as a QML virtual keyboard. - -1b. Licensed software – Embedded software development libraries -Module Description -Boot 2 Qt stack Yocto based Embedded Linux stack for selected - target hardware -Qt OTA Client-side capability for device image - updates Over The Air. -Device Utilities Collection of API’s to manage the device; - E.g. display, WiFi and Bluetooth settings. -Qt Debugging Bridge (QDB) Daemon Enables host-target deployment, debugging, - profiling and other features over USB. Up to - developer to decide if this is left in the - final solution. - -1c. Licensed Software - Qt Tools/Applications -Tool Description -Qt Creator The integrated development environment for Qt. -Qt Designer Qt tool for designing and building graphical user interfaces. -Qt Linguist Tool used to add translations to Qt applications. -Qt Assistant Tool for viewing online documentation in Qt help-file format. -Qmake Utility tool used to automate the generation of make files. -uic User interface compiler for the Qt GUI toolkit. -rcc Resource compiler used for embedding resources into Qt - applications. -lupdate Tool that finds the translatable strings in the specified source, - header and Qt Designer interface files, and produces or updates - translation files. -lrelease Tool that produces translation files in the compact binary format - used by localized Qt applications. -qlalr Qt parser generator tool. -qdoc Configurable documentation generation tool. -qmlscene QML launcher tool -qmlviewer QML launcher tool - -1d. Licensed software –Qt Tools/Applications specific to embedded software -development -Tool Description -Target toolchains Cross compilation toolchains for - supported target devices and operating - systems -Qt Debugging Bridge (QDB) Host Tools Enables deployment, debugging, - profiling and other features over USB - from development host PC to target - device. -qtconfig-gui Qt Lite Configurator tool graphical - interface -Qt Emulator Qt emulator - -2. Parts of the Licensed Software that are permitted for distribution in -object-code form only (“Redistributables”) under this Agreement: - -2a. Qt for Application Development -(i) The Licensed Software's Qt Toolkit libraries defined in 1a -(ii) The Licensed Software's installer framework - -2b. Qt for Device Creation -(i) Qt for Application Development Redistributables defined in 2a -(ii) The Licensed Software’s Embedded software development libraries defined in - 1b - -2c. Qt 3D Studio -The Licensed Software’s Qt 3D Studio Runtime (“Qt53DStudioRuntime2”) - - -APPENDIX 3: ADDITIONS TO LICENSED SOFTWARE -In addition to what is provided under the definition of the Licensed Software, -Parties agree that Licensed Software shall also include the following additional -software products of The Qt Company if included in the quote / invoice: -Qt for Automation - - MQTT software protocol libraries - - KNX software protocol libraries - - OPCUA (open source backend) - - OPCUA (Unified Automation backend) -Qt Safe Renderer - - Qt Safe Renderer library -Qt Application Manager - - Qt Application Manager library with Qt Creator integration - -All the above is considered as Redistributables and subject to applicable -provisions and limitations including but not limited to what is defined in -Section 3. - - -APPENDIX 4: SMALL BUSINESS AND START-UP APPENDIX -The provisions of this Appendix 4 are applicable for Start-up Companies and for -the Evaluation Term. -For the purpose of this Appendix 4, the following additional definitions shall -be applicable: - “Trial Term” shall mean a period of twelve (12) months. - “Start-up Company” means a company with a maximum annual revenue, including - funding, equivalent to 100,000 USD (in applicable currency) during a respective - calendar year, as evidenced by duly audited records of the Licensee and - approved by The Qt Company. - -During the Trial Term, Section 3 shall apply with following modifications -(“Trial Term Modifications”): - - Licenses granted under Sections 3.1 and 3.2 shall be free of any charge. For - clarity, License for distribution of Devices pursuant to Section 3.3 is - subject to applicable License Fee for necessary Distribution Licenses; - - Development License under Section 3.1 is limited to a maximum of three (3) - Designated Users; and - - Support is available subject to availability, as judged by The Qt Company at - its free and absolute discretion. - -Upon expiry of the Trial Term: - a) This Appendix 4 is terminated, Trial Term Modifications cease to remain in - force, Licensee’s Development Licenses shall be automatically converted into - licenses subject to a License Fee (in the amount specified in the quote or - in Appendix 2 and payable with a 30-day payment term) and Licensee’s rights - and obligations under this Agreement shall continue to remain in force under - the standard provisions of the Agreement, unless the Licensee notifies The - Qt Company in writing no less than ninety (90) days before such expiry date - that Licensee does not agree to such continuance, in which event the - Agreement, and all rights of the Licensee thereunder, shall expire; provided - however that - b) in the event the Licensee still qualifies as a Start-up Company, the - Licensee has an option (“Option”), instead of what is stated in item a) - above, to extend the Trial Term renewal is limited to one time and total - duration of Trial Terms thus to 24 months after the effective date. Licensee - shall notify The Qt Company in writing no less than ninety (90) days before - the expiry date, if Licensee wish to exercise the Option. - - -APPENDIX 5: NON-COMMERCIAL USE APPENDIX -The provisions of this Appendix 5 are applicable for non-commercial use of the -Licensed Software by the Licensee. -For the purpose of this Appendix 5, the following additional definitions -(replacing the relevant definition of the Agreement, where applicable) shall be -applicable: - “Demo Units” shall mean (i) hardware development platform, which incorporates - the Licensed Software along with Licensee’s software and/or hardware, and - (ii) prototype versions of Applications or Devices. - “Designated User(s)” shall mean the employees and students of the Licensee. - “Licensee Products” shall mean Applications and/or Devices. - “Permitted Purpose” shall mean (i) Licensee’s internal evaluation and testing - of Licensed Software, (ii) building Demo Units as well as (iii) educational - use. - “Term” shall mean a period of twelve (12) months or any such other period as - may be agreed between the Parties. - -For the purpose of this Appendix 5, the following changes shall be agreed with -respect to relevant Sections of the Agreement: - I. Recital (A) shall be replaced in its entirety to read as follows: “(A) - Licensee wishes to use the Licensed Software for the Permitted Purpose.” - II. Section 3.1 shall be replaced in its entirety to read as follows: - “The Qt Company grants to Licensee a personal, non-exclusive, - non-transferable, revocable, royalty-free license, valid for the Term, to - use, modify and copy the Licensed Software solely for the Permitted - Purpose. Licensee may install copies of the Licensed Software on an - unlimited number of computers provided that only Designated Users may use - the Licensed Software. Licensee may demonstrate the Demo Units, provided - that such demonstrations must be conducted by Licensee, and the Demo Units - must remain in Licensee’s possession and under Licensee’s control at all - times. For clarity, this Agreement does not (i) entitle Licensee to use - Licensed Software to create Applications or Devices (other than prototypes - thereof) or (ii) carry any distribution rights to Licensee, but such - rights are subject to and conditional upon conclusion of a separate - license agreement with The Qt Company.” - III. Sections 3.2, 3.3, 8 and 10 shall be deleted. - IV. Section 3.4 shall be replaced in its entirety to read as follows: - “Licensee shall not: - - remove or alter any copyright, trademark or other proprietary rights - notice contained in any portion of the Licensed Software; - - transfer, publish, sublicense, disclose, display or otherwise make - the Licensed Software available to any third party (except that - Licensee may demonstrate the Demo Units pursuant to Section 3.1); - - in any way combine, incorporate or integrate Licensed Software with, or - use Licensed Software for creation of, any software created with or - incorporating Open Source Qt; - Licensee shall cause all Designated Users who make use of the licenses - granted under this Agreement, to be contractually bound to comply with - the relevant terms of this Agreement and not to use the Licensed - Software beyond the terms hereof. Licensee shall be responsible for any - and all actions and omissions of its Designated Users relating to the - Licensed Software and use thereof. Any use of Licensed Software beyond - the provisions of this Agreement is strictly prohibited and requires an - additional license from The Qt Company.” - V. Section 12 shall be replaced in its entirety to read as follows: - “This Agreement shall enter into force upon due acceptance by both Parties - and remain in force for the Term, unless and until terminated pursuant to - the terms of Section 12. Upon termination of the Agreement, Licensee shall - cease using the Licensed Software. All other copies of Licensed Software - in the possession or control of Licensee must be erased or destroyed. An - officer of Licensee must, upon request, promptly deliver to The Qt Company - a written confirmation that this has occurred.” - -Except for the modifications specified above, this Appendix carries no change to -the terms of the Agreement which shall remain in full force. diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/axisanimation_p.h qtcharts-opensource-src-5.9.5/src/charts/animations/axisanimation_p.h --- qtcharts-opensource-src-5.12.5/src/charts/animations/axisanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/axisanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,14 +40,13 @@ #define AXISANIMATION_H #include -#include #include QT_CHARTS_BEGIN_NAMESPACE class ChartAxisElement; -class QT_CHARTS_PRIVATE_EXPORT AxisAnimation: public ChartAnimation +class AxisAnimation: public ChartAnimation { public: enum Animation { DefaultAnimation, ZoomOutAnimation, ZoomInAnimation, MoveForwardAnimation, MoveBackwordAnimation}; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/baranimation.cpp qtcharts-opensource-src-5.9.5/src/charts/animations/baranimation.cpp --- qtcharts-opensource-src-5.12.5/src/charts/animations/baranimation.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/baranimation.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -85,7 +85,7 @@ setKeyValueAt(1.0, qVariantFromValue(newLayout)); } -QT_CHARTS_END_NAMESPACE - #include "moc_baranimation_p.cpp" +QT_CHARTS_END_NAMESPACE + diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/baranimation_p.h qtcharts-opensource-src-5.9.5/src/charts/animations/baranimation_p.h --- qtcharts-opensource-src-5.12.5/src/charts/animations/baranimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/baranimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define BARANIMATION_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class AbstractBarChartItem; -class QT_CHARTS_PRIVATE_EXPORT BarAnimation : public ChartAnimation +class BarAnimation : public ChartAnimation { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/boxplotanimation.cpp qtcharts-opensource-src-5.9.5/src/charts/animations/boxplotanimation.cpp --- qtcharts-opensource-src-5.12.5/src/charts/animations/boxplotanimation.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/boxplotanimation.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -104,6 +104,6 @@ m_animations.remove(box); } -QT_CHARTS_END_NAMESPACE - #include "moc_boxplotanimation_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/boxplotanimation_p.h qtcharts-opensource-src-5.9.5/src/charts/animations/boxplotanimation_p.h --- qtcharts-opensource-src-5.12.5/src/charts/animations/boxplotanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/boxplotanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,13 +43,12 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class BoxPlotChartItem; -class QT_CHARTS_PRIVATE_EXPORT BoxPlotAnimation : public QObject +class BoxPlotAnimation : public QObject { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/boxwhiskersanimation.cpp qtcharts-opensource-src-5.9.5/src/charts/animations/boxwhiskersanimation.cpp --- qtcharts-opensource-src-5.12.5/src/charts/animations/boxwhiskersanimation.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/boxwhiskersanimation.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -115,7 +115,7 @@ setStartValue(qVariantFromValue(endData)); } -QT_CHARTS_END_NAMESPACE - #include "moc_boxwhiskersanimation_p.cpp" +QT_CHARTS_END_NAMESPACE + diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/boxwhiskersanimation_p.h qtcharts-opensource-src-5.9.5/src/charts/animations/boxwhiskersanimation_p.h --- qtcharts-opensource-src-5.12.5/src/charts/animations/boxwhiskersanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/boxwhiskersanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -42,14 +42,13 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class BoxPlotChartItem; class BoxPlotAnimation; -class QT_CHARTS_PRIVATE_EXPORT BoxWhiskersAnimation : public ChartAnimation +class BoxWhiskersAnimation : public ChartAnimation { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/candlestickanimation.cpp qtcharts-opensource-src-5.9.5/src/charts/animations/candlestickanimation.cpp --- qtcharts-opensource-src-5.12.5/src/charts/animations/candlestickanimation.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/candlestickanimation.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -111,6 +111,6 @@ m_animations.remove(candlestick); } -QT_CHARTS_END_NAMESPACE - #include "moc_candlestickanimation_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/candlestickanimation_p.h qtcharts-opensource-src-5.9.5/src/charts/animations/candlestickanimation_p.h --- qtcharts-opensource-src-5.12.5/src/charts/animations/candlestickanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/candlestickanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,6 @@ #define CANDLESTICKANIMATION_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE @@ -48,7 +47,7 @@ class CandlestickChartItem; class CandlestickBodyWicksAnimation; -class QT_CHARTS_PRIVATE_EXPORT CandlestickAnimation : public QObject +class CandlestickAnimation : public QObject { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/candlestickbodywicksanimation.cpp qtcharts-opensource-src-5.9.5/src/charts/animations/candlestickbodywicksanimation.cpp --- qtcharts-opensource-src-5.12.5/src/charts/animations/candlestickbodywicksanimation.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/candlestickbodywicksanimation.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -107,6 +107,6 @@ return qVariantFromValue(result); } -QT_CHARTS_END_NAMESPACE - #include "moc_candlestickbodywicksanimation_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/candlestickbodywicksanimation_p.h qtcharts-opensource-src-5.9.5/src/charts/animations/candlestickbodywicksanimation_p.h --- qtcharts-opensource-src-5.12.5/src/charts/animations/candlestickbodywicksanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/candlestickbodywicksanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,14 +41,13 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class Candlestick; class CandlestickAnimation; -class QT_CHARTS_PRIVATE_EXPORT CandlestickBodyWicksAnimation : public ChartAnimation +class CandlestickBodyWicksAnimation : public ChartAnimation { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/chartanimation_p.h qtcharts-opensource-src-5.9.5/src/charts/animations/chartanimation_p.h --- qtcharts-opensource-src-5.12.5/src/charts/animations/chartanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/chartanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,13 +41,12 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE const static int ChartAnimationDuration = 1000; -class QT_CHARTS_PRIVATE_EXPORT ChartAnimation: public QVariantAnimation +class ChartAnimation: public QVariantAnimation { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/pieanimation.cpp qtcharts-opensource-src-5.9.5/src/charts/animations/pieanimation.cpp --- qtcharts-opensource-src-5.12.5/src/charts/animations/pieanimation.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/pieanimation.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -115,6 +115,6 @@ // nothing to do... } -QT_CHARTS_END_NAMESPACE - #include "moc_pieanimation_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/pieanimation_p.h qtcharts-opensource-src-5.9.5/src/charts/animations/pieanimation_p.h --- qtcharts-opensource-src-5.12.5/src/charts/animations/pieanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/pieanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -42,13 +42,12 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class PieChartItem; -class QT_CHARTS_PRIVATE_EXPORT PieAnimation : public ChartAnimation +class PieAnimation : public ChartAnimation { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/piesliceanimation_p.h qtcharts-opensource-src-5.9.5/src/charts/animations/piesliceanimation_p.h --- qtcharts-opensource-src-5.12.5/src/charts/animations/piesliceanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/piesliceanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,13 +41,12 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class PieChartItem; -class QT_CHARTS_PRIVATE_EXPORT PieSliceAnimation : public ChartAnimation +class PieSliceAnimation : public ChartAnimation { public: PieSliceAnimation(PieSliceItem *sliceItem); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/scatteranimation_p.h qtcharts-opensource-src-5.9.5/src/charts/animations/scatteranimation_p.h --- qtcharts-opensource-src-5.12.5/src/charts/animations/scatteranimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/scatteranimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -38,15 +38,13 @@ #ifndef SCATTERANIMATION_P_H #define SCATTERANIMATION_P_H - #include -#include QT_CHARTS_BEGIN_NAMESPACE class ScatterChartItem; -class QT_CHARTS_PRIVATE_EXPORT ScatterAnimation : public XYAnimation +class ScatterAnimation : public XYAnimation { public: ScatterAnimation(ScatterChartItem *item, int duration, QEasingCurve &curve); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/splineanimation_p.h qtcharts-opensource-src-5.9.5/src/charts/animations/splineanimation_p.h --- qtcharts-opensource-src-5.12.5/src/charts/animations/splineanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/splineanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -38,9 +38,7 @@ #ifndef SPLINEANIMATION_P_H #define SPLINEANIMATION_P_H - #include -#include #include typedef QPair, QVector > SplineVector; @@ -49,7 +47,7 @@ class SplineChartItem; -class QT_CHARTS_PRIVATE_EXPORT SplineAnimation : public XYAnimation +class SplineAnimation : public XYAnimation { public: SplineAnimation(SplineChartItem *item, int duration, QEasingCurve &curve); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/xyanimation.cpp qtcharts-opensource-src-5.9.5/src/charts/animations/xyanimation.cpp --- qtcharts-opensource-src-5.12.5/src/charts/animations/xyanimation.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/xyanimation.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -160,6 +160,5 @@ } } -QT_CHARTS_END_NAMESPACE - #include "moc_chartanimation_p.cpp" +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/animations/xyanimation_p.h qtcharts-opensource-src-5.9.5/src/charts/animations/xyanimation_p.h --- qtcharts-opensource-src-5.12.5/src/charts/animations/xyanimation_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/animations/xyanimation_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,14 +40,13 @@ #define XYANIMATION_P_H #include -#include #include QT_CHARTS_BEGIN_NAMESPACE class XYChart; -class QT_CHARTS_PRIVATE_EXPORT XYAnimation : public ChartAnimation +class XYAnimation : public ChartAnimation { protected: enum Animation { AddPointAnimation, RemovePointAnimation, ReplacePointAnimation, NewAnimation }; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/areachart/areachartitem.cpp qtcharts-opensource-src-5.9.5/src/charts/areachart/areachartitem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/areachart/areachartitem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/areachart/areachartitem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -198,13 +198,8 @@ m_pointLabelsVisible = m_series->pointLabelsVisible(); m_pointLabelsFont = m_series->pointLabelsFont(); m_pointLabelsColor = m_series->pointLabelsColor(); - bool labelClippingChanged = m_pointLabelsClipping != m_series->pointLabelsClipping(); m_pointLabelsClipping = m_series->pointLabelsClipping(); - // Update whole chart in case label clipping changed as labels can be outside series area - if (labelClippingChanged) - m_series->chart()->update(); - else - update(); + update(); } void AreaChartItem::handleDomainUpdated() @@ -266,9 +261,7 @@ else painter->setClipping(false); - QFont f(m_pointLabelsFont); - f.setPixelSize(QFontInfo(m_pointLabelsFont).pixelSize()); - painter->setFont(f); + painter->setFont(m_pointLabelsFont); painter->setPen(QPen(m_pointLabelsColor)); QFontMetrics fm(painter->font()); @@ -351,6 +344,6 @@ ChartItem::mouseDoubleClickEvent(event); } -QT_CHARTS_END_NAMESPACE - #include "moc_areachartitem_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/areachart/areachartitem_p.h qtcharts-opensource-src-5.9.5/src/charts/areachart/areachartitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/areachart/areachartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/areachart/areachartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,7 +41,6 @@ #include #include -#include #include #include @@ -49,7 +48,7 @@ class AreaChartItem; -class QT_CHARTS_PRIVATE_EXPORT AreaChartItem : public ChartItem +class AreaChartItem : public ChartItem { Q_OBJECT public: @@ -114,7 +113,7 @@ }; -class QT_CHARTS_PRIVATE_EXPORT AreaBoundItem : public LineChartItem +class AreaBoundItem : public LineChartItem { public: AreaBoundItem(AreaChartItem *area, QLineSeries *lineSeries,QGraphicsItem* item = 0) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/areachart/qareaseries.cpp qtcharts-opensource-src-5.9.5/src/charts/areachart/qareaseries.cpp --- qtcharts-opensource-src-5.12.5/src/charts/areachart/qareaseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/areachart/qareaseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -42,7 +42,7 @@ /*! \class QAreaSeries - \inmodule QtCharts + \inmodule Qt Charts \brief The QAreaSeries class presents data in area charts. An area series is used to show quantitative data. It is based on a line series, in the way that @@ -822,7 +822,8 @@ } } -QT_CHARTS_END_NAMESPACE #include "moc_qareaseries.cpp" #include "moc_qareaseries_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/areachart/qareaseries.h qtcharts-opensource-src-5.9.5/src/charts/areachart/qareaseries.h --- qtcharts-opensource-src-5.12.5/src/charts/areachart/qareaseries.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/areachart/qareaseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -42,8 +42,8 @@ class QT_CHARTS_EXPORT QAreaSeries : public QAbstractSeries { Q_OBJECT - Q_PROPERTY(QtCharts::QLineSeries *upperSeries READ upperSeries) - Q_PROPERTY(QtCharts::QLineSeries *lowerSeries READ lowerSeries) + Q_PROPERTY(QLineSeries *upperSeries READ upperSeries) + Q_PROPERTY(QLineSeries *lowerSeries READ lowerSeries) Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged) Q_PROPERTY(QString pointLabelsFormat READ pointLabelsFormat WRITE setPointLabelsFormat NOTIFY pointLabelsFormatChanged) @@ -53,8 +53,8 @@ Q_PROPERTY(bool pointLabelsClipping READ pointLabelsClipping WRITE setPointLabelsClipping NOTIFY pointLabelsClippingChanged) public: - explicit QAreaSeries(QObject *parent = nullptr); - explicit QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries = nullptr); + explicit QAreaSeries(QObject *parent = Q_NULLPTR); + explicit QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries = Q_NULLPTR); ~QAreaSeries(); public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/areachart/qareaseries_p.h qtcharts-opensource-src-5.9.5/src/charts/areachart/qareaseries_p.h --- qtcharts-opensource-src-5.12.5/src/charts/areachart/qareaseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/areachart/qareaseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,14 +40,13 @@ #define QAREASERIES_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QAreaSeries; class QLineSeries; -class QT_CHARTS_PRIVATE_EXPORT QAreaSeriesPrivate: public QAbstractSeriesPrivate +class QAreaSeriesPrivate: public QAbstractSeriesPrivate { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -144,6 +144,6 @@ return sh; } -QT_CHARTS_END_NAMESPACE - #include "moc_chartbarcategoryaxisx_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,14 +40,13 @@ #define CHARTBARCATEGORYAXISX_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class ChartPresenter; class QBarCategoryAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartBarCategoryAxisX : public HorizontalAxis +class ChartBarCategoryAxisX : public HorizontalAxis { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -146,6 +146,6 @@ return sh; } -QT_CHARTS_END_NAMESPACE - #include "moc_chartbarcategoryaxisy_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,14 +40,13 @@ #define CHARTBARCATEGORYAXISY_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QBarCategoryAxis; class ChartPresenter; -class QT_CHARTS_PRIVATE_EXPORT ChartBarCategoryAxisY : public VerticalAxis +class ChartBarCategoryAxisY : public VerticalAxis { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -38,7 +38,7 @@ QT_CHARTS_BEGIN_NAMESPACE /*! \class QBarCategoryAxis - \inmodule QtCharts + \inmodule Qt Charts \brief The QBarCategoryAxis class adds categories to a chart's axes. QBarCategoryAxis can be set up to show an axis line with tick marks, grid lines, and shades. @@ -628,7 +628,7 @@ } } -QT_CHARTS_END_NAMESPACE - #include "moc_qbarcategoryaxis.cpp" #include "moc_qbarcategoryaxis_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h qtcharts-opensource-src-5.9.5/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h 2018-03-19 05:05:55.000000000 +0000 @@ -45,11 +45,11 @@ Q_PROPERTY(int count READ count NOTIFY countChanged) public: - explicit QBarCategoryAxis(QObject *parent = nullptr); + explicit QBarCategoryAxis(QObject *parent = Q_NULLPTR); ~QBarCategoryAxis(); protected: - QBarCategoryAxis(QBarCategoryAxisPrivate &d, QObject *parent = nullptr); + QBarCategoryAxis(QBarCategoryAxisPrivate &d, QObject *parent = Q_NULLPTR); public: AxisType type() const; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,13 +41,12 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class AbstractDomain; -class QT_CHARTS_PRIVATE_EXPORT QBarCategoryAxisPrivate : public QAbstractAxisPrivate +class QBarCategoryAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/cartesianchartaxis.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/cartesianchartaxis.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/cartesianchartaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/cartesianchartaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -107,47 +107,8 @@ int expectedCount = 0; if (axis()->type() == QAbstractAxis::AxisTypeValue) { QValueAxis *valueAxis = qobject_cast(axis()); - if (valueAxis->tickType() == QValueAxis::TicksFixed) { - expectedCount = valueAxis->minorTickCount() * (valueAxis->tickCount() - 1); - expectedCount = qMax(expectedCount, 0); - } else { - const qreal interval = valueAxis->tickInterval(); - qreal firstMajorTick = valueAxis->tickAnchor(); - const qreal max = valueAxis->max(); - const qreal min = valueAxis->min(); - const int _minorTickCount = valueAxis->minorTickCount(); - - if (min < firstMajorTick) - firstMajorTick = firstMajorTick - qCeil((firstMajorTick - min) / interval) * interval; - else - firstMajorTick = firstMajorTick + int((min - firstMajorTick) / interval) * interval; - - const qreal deltaMinor = interval / qreal(_minorTickCount + 1); - qreal minorTick = firstMajorTick + deltaMinor; - int minorCounter = 0; - - while (minorTick < min) { - minorTick += deltaMinor; - minorCounter++; - } - - QVector points; - - // Calculate the points on axis value space. Conversion to graphical points - // will be done on axis specific geometry update function - while (minorTick <= max || qFuzzyCompare(minorTick, max)) { - if (minorCounter < _minorTickCount) { - expectedCount++; - minorCounter++; - points << (minorTick - min); - } else { - minorCounter = 0; - } - minorTick += deltaMinor; - } - - setDynamicMinorTickLayout(points); - } + expectedCount = valueAxis->minorTickCount() * (valueAxis->tickCount() - 1); + expectedCount = qMax(expectedCount, 0); } else if (axis()->type() == QAbstractAxis::AxisTypeLogValue) { QLogValueAxis *logValueAxis = qobject_cast(axis()); @@ -327,6 +288,6 @@ static_cast(item)->setPen(pen); } -QT_CHARTS_END_NAMESPACE - #include "moc_cartesianchartaxis_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/cartesianchartaxis_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/cartesianchartaxis_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/cartesianchartaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/cartesianchartaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,13 +41,12 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class QAbstractAxis; -class QT_CHARTS_PRIVATE_EXPORT CartesianChartAxis : public ChartAxisElement +class CartesianChartAxis : public ChartAxisElement { Q_OBJECT Q_INTERFACES(QGraphicsLayoutItem) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -123,6 +123,6 @@ presenter()->layout()->invalidate(); } -QT_CHARTS_END_NAMESPACE - #include "moc_chartcategoryaxisx_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define CHARTCATEGORYAXISX_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartCategoryAxisX : public HorizontalAxis +class ChartCategoryAxisX : public HorizontalAxis { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -123,6 +123,6 @@ presenter()->layout()->invalidate(); } -QT_CHARTS_END_NAMESPACE - #include "moc_chartcategoryaxisy_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define CHARTCATEGORYAXISY_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartCategoryAxisY : public VerticalAxis +class ChartCategoryAxisY : public VerticalAxis { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -84,6 +84,6 @@ } -QT_CHARTS_END_NAMESPACE - #include "moc_polarchartcategoryaxisangular_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define POLARCHARTCATEGORYAXISANGULAR_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxis; -class QT_CHARTS_PRIVATE_EXPORT PolarChartCategoryAxisAngular : public PolarChartAxisAngular +class PolarChartCategoryAxisAngular : public PolarChartAxisAngular { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -83,6 +83,6 @@ presenter()->layout()->invalidate(); } -QT_CHARTS_END_NAMESPACE - #include "moc_polarchartcategoryaxisradial_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define POLARCHARTCATEGORYAXISRADIAL_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxis; -class QT_CHARTS_PRIVATE_EXPORT PolarChartCategoryAxisRadial : public PolarChartAxisRadial +class PolarChartCategoryAxisRadial : public PolarChartAxisRadial { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/qcategoryaxis.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/qcategoryaxis.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/qcategoryaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/qcategoryaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,7 @@ QT_CHARTS_BEGIN_NAMESPACE /*! \class QCategoryAxis - \inmodule QtCharts + \inmodule Qt Charts \brief The QCategoryAxis class places named ranges on the axis. This class can be used to explain the underlying data by adding labeled categories. @@ -381,7 +381,7 @@ QAbstractAxisPrivate::initializeGraphics(parent); } -QT_CHARTS_END_NAMESPACE - #include "moc_qcategoryaxis.cpp" #include "moc_qcategoryaxis_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/qcategoryaxis.h qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/qcategoryaxis.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/qcategoryaxis.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/qcategoryaxis.h 2018-03-19 05:05:55.000000000 +0000 @@ -53,11 +53,11 @@ AxisLabelsPositionOnValue = 0x1 }; - explicit QCategoryAxis(QObject *parent = nullptr); + explicit QCategoryAxis(QObject *parent = Q_NULLPTR); ~QCategoryAxis(); protected: - QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent = nullptr); + QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent = Q_NULLPTR); public: AxisType type() const; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/qcategoryaxis_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/qcategoryaxis_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/categoryaxis/qcategoryaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/categoryaxis/qcategoryaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,13 +41,12 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE typedef QPair Range; -class QT_CHARTS_PRIVATE_EXPORT QCategoryAxisPrivate : public QValueAxisPrivate +class QCategoryAxisPrivate : public QValueAxisPrivate { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/chartaxiselement.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/chartaxiselement.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/chartaxiselement.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/chartaxiselement.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -42,8 +41,8 @@ static const char *labelFormatMatchString = "%[\\-\\+#\\s\\d\\.\\'lhjztL]*([dicuoxfegXFEG])"; static const char *labelFormatMatchLocalizedString = "^([^%]*)%\\.(\\d+)([defgiEG])(.*)$"; -static QRegularExpression *labelFormatMatcher = 0; -static QRegularExpression *labelFormatMatcherLocalized = 0; +static QRegExp *labelFormatMatcher = 0; +static QRegExp *labelFormatMatcherLocalized = 0; class StaticLabelFormatMatcherDeleter { public: @@ -298,24 +297,6 @@ return m_axis->d_ptr->max(); } -qreal ChartAxisElement::tickInterval() const -{ - QValueAxis *valueAxis = qobject_cast(m_axis); - if (valueAxis) - return valueAxis->tickInterval(); - else - return 0.0; -} - -qreal ChartAxisElement::tickAnchor() const -{ - QValueAxis *valueAxis = qobject_cast(m_axis); - if (valueAxis) - return valueAxis->tickAnchor(); - else - return 0.0; -} - QString ChartAxisElement::formatLabel(const QString &formatSpec, const QByteArray &array, qreal value, int precision, const QString &preStr, const QString &postStr) const @@ -355,8 +336,6 @@ } QStringList ChartAxisElement::createValueLabels(qreal min, qreal max, int ticks, - qreal tickInterval, qreal tickAnchor, - QValueAxis::TickType tickType, const QString &format) const { QStringList labels; @@ -366,22 +345,9 @@ if (format.isEmpty()) { int n = qMax(int(-qFloor(std::log10((max - min) / (ticks - 1)))), 0) + 1; - if (tickType == QValueAxis::TicksFixed) { - for (int i = 0; i < ticks; i++) { - qreal value = min + (i * (max - min) / (ticks - 1)); - labels << presenter()->numberToString(value, 'f', n); - } - } else { - qreal value = tickAnchor; - if (value > min) - value = value - int((value - min) / tickInterval) * tickInterval; - else - value = value + qCeil((min - value) / tickInterval) * tickInterval; - - while (value <= max || qFuzzyCompare(value, max)) { - labels << presenter()->numberToString(value, 'f', n); - value += tickInterval; - } + for (int i = 0; i < ticks; i++) { + qreal value = min + (i * (max - min) / (ticks - 1)); + labels << presenter()->numberToString(value, 'f', n); } } else { QByteArray array = format.toLatin1(); @@ -392,38 +358,23 @@ if (presenter()->localizeNumbers()) { if (!labelFormatMatcherLocalized) labelFormatMatcherLocalized - = new QRegularExpression(QString::fromLatin1(labelFormatMatchLocalizedString)); - QRegularExpressionMatch rmatch; - if (format.indexOf(*labelFormatMatcherLocalized, 0, &rmatch) != -1) { - preStr = rmatch.captured(1); - if (!rmatch.captured(2).isEmpty()) - precision = rmatch.captured(2).toInt(); - formatSpec = rmatch.captured(3); - postStr = rmatch.captured(4); + = new QRegExp(QString::fromLatin1(labelFormatMatchLocalizedString)); + if (labelFormatMatcherLocalized->indexIn(format, 0) != -1) { + preStr = labelFormatMatcherLocalized->cap(1); + if (!labelFormatMatcherLocalized->cap(2).isEmpty()) + precision = labelFormatMatcherLocalized->cap(2).toInt(); + formatSpec = labelFormatMatcherLocalized->cap(3); + postStr = labelFormatMatcherLocalized->cap(4); } } else { if (!labelFormatMatcher) - labelFormatMatcher = new QRegularExpression(QString::fromLatin1(labelFormatMatchString)); - QRegularExpressionMatch rmatch; - if (format.indexOf(*labelFormatMatcher, 0, &rmatch) != -1) - formatSpec = rmatch.captured(1); + labelFormatMatcher = new QRegExp(QString::fromLatin1(labelFormatMatchString)); + if (labelFormatMatcher->indexIn(format, 0) != -1) + formatSpec = labelFormatMatcher->cap(1); } - if (tickType == QValueAxis::TicksFixed) { - for (int i = 0; i < ticks; i++) { - qreal value = min + (i * (max - min) / (ticks - 1)); - labels << formatLabel(formatSpec, array, value, precision, preStr, postStr); - } - } else { - qreal value = tickAnchor; - if (value > min) - value = value - int((value - min) / tickInterval) * tickInterval; - else - value = value + qCeil((min - value) / tickInterval) * tickInterval; - - while (value <= max || qFuzzyCompare(value, max)) { - labels << formatLabel(formatSpec, array, value, precision, preStr, postStr); - value += tickInterval; - } + for (int i = 0; i < ticks; i++) { + qreal value = min + (i * (max - min) / (ticks - 1)); + labels << formatLabel(formatSpec, array, value, precision, preStr, postStr); } } @@ -462,21 +413,19 @@ if (presenter()->localizeNumbers()) { if (!labelFormatMatcherLocalized) labelFormatMatcherLocalized = - new QRegularExpression(QString::fromLatin1(labelFormatMatchLocalizedString)); - QRegularExpressionMatch rmatch; - if (format.indexOf(*labelFormatMatcherLocalized, 0, &rmatch) != -1) { - preStr = rmatch.captured(1); - if (!rmatch.captured(2).isEmpty()) - precision = rmatch.captured(2).toInt(); - formatSpec = rmatch.captured(3); - postStr = rmatch.captured(4); + new QRegExp(QString::fromLatin1(labelFormatMatchLocalizedString)); + if (labelFormatMatcherLocalized->indexIn(format, 0) != -1) { + preStr = labelFormatMatcherLocalized->cap(1); + if (!labelFormatMatcherLocalized->cap(2).isEmpty()) + precision = labelFormatMatcherLocalized->cap(2).toInt(); + formatSpec = labelFormatMatcherLocalized->cap(3); + postStr = labelFormatMatcherLocalized->cap(4); } } else { if (!labelFormatMatcher) - labelFormatMatcher = new QRegularExpression(QString::fromLatin1(labelFormatMatchString)); - QRegularExpressionMatch rmatch; - if (format.indexOf(*labelFormatMatcher, 0, &rmatch) != -1) - formatSpec = rmatch.captured(1); + labelFormatMatcher = new QRegExp(QString::fromLatin1(labelFormatMatchString)); + if (labelFormatMatcher->indexIn(format, 0) != -1) + formatSpec = labelFormatMatcher->cap(1); } for (int i = firstTick; i < ticks + firstTick; i++) { qreal value = qPow(base, i); @@ -495,6 +444,8 @@ if (max <= min || ticks < 1) return labels; + int n = qMax(int(-qFloor(std::log10((max - min) / (ticks - 1)))), 0); + n++; for (int i = 0; i < ticks; i++) { qreal value = min + (i * (max - min) / (ticks - 1)); labels << presenter()->locale().toString(QDateTime::fromMSecsSinceEpoch(value), format); @@ -507,6 +458,6 @@ emit clicked(); } -QT_CHARTS_END_NAMESPACE - #include "moc_chartaxiselement_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/chartaxiselement_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/chartaxiselement_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/chartaxiselement_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/chartaxiselement_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,12 +40,10 @@ #define CHARTAXISELEMENT_H #include -#include #include #include #include #include -#include #include QT_CHARTS_BEGIN_NAMESPACE @@ -53,7 +51,7 @@ class ChartPresenter; class QAbstractAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartAxisElement : public ChartElement, public QGraphicsLayoutItem +class ChartAxisElement : public ChartElement, public QGraphicsLayoutItem { Q_OBJECT @@ -72,8 +70,6 @@ QAbstractAxis *axis() const { return m_axis; } void setLayout(QVector &layout) { m_layout = layout; } QVector &layout() { return m_layout; } // Modifiable reference - void setDynamicMinorTickLayout(const QVector &layout) { m_dynamicMinorTickLayout = layout; } - QVector &dynamicMinorTicklayout() { return m_dynamicMinorTickLayout; } // Modifiable reference inline qreal labelPadding() const { return qreal(4.0); } inline qreal titlePadding() const { return qreal(2.0); } void setLabels(const QStringList &labels) { m_labelsList = labels; } @@ -82,9 +78,6 @@ qreal min() const; qreal max() const; - qreal tickInterval() const; - qreal tickAnchor() const; - QRectF axisGeometry() const { return m_axisRect; } void setAxisGeometry(const QRectF &axisGeometry) { m_axisRect = axisGeometry; } @@ -93,9 +86,7 @@ //this flag indicates that axis is used to show intervals it means labels are in between ticks bool intervalAxis() const { return m_intervalAxis; } - QStringList createValueLabels(qreal max, qreal min, int ticks, - qreal tickInterval, qreal tickAnchor, - QValueAxis::TickType tickType, const QString &format) const; + QStringList createValueLabels(qreal max, qreal min, int ticks, const QString &format) const; QStringList createLogValueLabels(qreal min, qreal max, qreal base, int ticks, const QString &format) const; QStringList createDateTimeLabels(qreal max, qreal min, int ticks, const QString &format) const; @@ -168,7 +159,6 @@ QAbstractAxis *m_axis; AxisAnimation *m_animation; QVector m_layout; - QVector m_dynamicMinorTickLayout; QStringList m_labelsList; QRectF m_axisRect; QScopedPointer m_grid; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -137,6 +137,6 @@ return sh; } -QT_CHARTS_END_NAMESPACE - #include "moc_chartdatetimeaxisx_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define CHARTDATETIMEAXISX_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartDateTimeAxisX : public HorizontalAxis +class ChartDateTimeAxisX : public HorizontalAxis { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -138,6 +138,6 @@ return sh; } -QT_CHARTS_END_NAMESPACE - #include "moc_chartdatetimeaxisy_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define CHARTDATETIMEAXISY_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartDateTimeAxisY : public VerticalAxis +class ChartDateTimeAxisY : public VerticalAxis { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -84,6 +84,6 @@ presenter()->layout()->invalidate(); } -QT_CHARTS_END_NAMESPACE - #include "moc_polarchartdatetimeaxisangular_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define POLARCHARTDATETIMEAXISANGULAR_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxis; -class QT_CHARTS_PRIVATE_EXPORT PolarChartDateTimeAxisAngular : public PolarChartAxisAngular +class PolarChartDateTimeAxisAngular : public PolarChartAxisAngular { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -83,6 +83,6 @@ presenter()->layout()->invalidate(); } -QT_CHARTS_END_NAMESPACE - #include "moc_polarchartdatetimeaxisradial_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define POLARCHARTDATETIMEAXISRADIAL_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxis; -class QT_CHARTS_PRIVATE_EXPORT PolarChartDateTimeAxisRadial : public PolarChartAxisRadial +class PolarChartDateTimeAxisRadial : public PolarChartAxisRadial { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -41,7 +41,7 @@ QT_CHARTS_BEGIN_NAMESPACE /*! \class QDateTimeAxis - \inmodule QtCharts + \inmodule Qt Charts \brief The QDateTimeAxis class adds dates and times to a chart's axis. QDateTimeAxis can be set up to show an axis line with tick marks, grid lines, and shades. @@ -399,7 +399,7 @@ } } -QT_CHARTS_END_NAMESPACE - #include "moc_qdatetimeaxis.cpp" #include "moc_qdatetimeaxis_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/qdatetimeaxis.h qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/qdatetimeaxis.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/qdatetimeaxis.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/qdatetimeaxis.h 2018-03-19 05:05:55.000000000 +0000 @@ -49,11 +49,11 @@ Q_PROPERTY(QString format READ format WRITE setFormat NOTIFY formatChanged) public: - explicit QDateTimeAxis(QObject *parent = nullptr); + explicit QDateTimeAxis(QObject *parent = Q_NULLPTR); ~QDateTimeAxis(); protected: - QDateTimeAxis(QDateTimeAxisPrivate &d, QObject *parent = nullptr); + QDateTimeAxis(QDateTimeAxisPrivate &d, QObject *parent = Q_NULLPTR); public: AxisType type() const; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define QDATETIMEAXIS_P_H #include -#include #include #include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QDateTimeAxisPrivate : public QAbstractAxisPrivate +class QDateTimeAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/horizontalaxis.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/horizontalaxis.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/horizontalaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/horizontalaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -75,12 +75,9 @@ void HorizontalAxis::updateGeometry() { const QVector &layout = ChartAxisElement::layout(); - const QVector &dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout(); - if (layout.isEmpty() && dynamicMinorTicklayout.isEmpty() - && axis()->type() != QAbstractAxis::AxisTypeLogValue) { + if (layout.isEmpty() && axis()->type() != QAbstractAxis::AxisTypeLogValue) return; - } QStringList labelList = labels(); @@ -346,14 +343,12 @@ minorTickCount = valueAxis->minorTickCount(); - if (valueAxis->tickType() == QValueAxis::TicksFixed) { - if (valueAxis->tickCount() >= 2) - tickSpacing = layout.at(0) - layout.at(1); - - for (int i = 0; i < minorTickCount; ++i) { - const qreal ratio = (1.0 / qreal(minorTickCount + 1)) * qreal(i + 1); - minorTickSpacings.append(tickSpacing * ratio); - } + if (valueAxis->tickCount() >= 2) + tickSpacing = layout.at(0) - layout.at(1); + + for (int i = 0; i < minorTickCount; ++i) { + const qreal ratio = (1.0 / qreal(minorTickCount + 1)) * qreal(i + 1); + minorTickSpacings.append(tickSpacing * ratio); } break; } @@ -407,27 +402,28 @@ break; } - const QValueAxis *valueAxis = qobject_cast(axis()); - if (valueAxis && valueAxis->tickType() == QValueAxis::TicksDynamic) { - const QVector dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout(); - const QRectF &gridRect = gridGeometry(); - const qreal deltaX = gridRect.width() / (valueAxis->max() - valueAxis->min()); - const qreal leftPos = gridRect.left(); - const qreal rightPos = gridRect.right(); + if (minorTickCount < 1 || tickSpacing == 0.0 || minorTickSpacings.count() != minorTickCount) + return; - for (int i = 0; i < dynamicMinorTicklayout.size(); i++) { + for (int i = 0; i < layout.size() - 1; ++i) { + for (int j = 0; j < minorTickCount; ++j) { + const int minorItemIndex = i * minorTickCount + j; QGraphicsLineItem *minorGridLineItem = - static_cast(minorGridItems().value(i)); + static_cast(minorGridItems().value(minorItemIndex)); QGraphicsLineItem *minorArrowLineItem = - static_cast(minorArrowItems().value(i)); + static_cast(minorArrowItems().value(minorItemIndex)); if (!minorGridLineItem || !minorArrowLineItem) continue; + const qreal minorTickSpacing = minorTickSpacings.value(j, 0.0); + qreal minorGridLineItemX = 0.0; - if (axis()->isReverse()) - minorGridLineItemX = rightPos - dynamicMinorTicklayout.at(i) * deltaX; - else - minorGridLineItemX = dynamicMinorTicklayout.at(i) * deltaX + leftPos; + if (axis()->isReverse()) { + minorGridLineItemX = qFloor(gridGeometry().left() + gridGeometry().right() + - layout.at(i) + minorTickSpacing); + } else { + minorGridLineItemX = qCeil(layout.at(i) - minorTickSpacing); + } qreal minorArrowLineItemY1; qreal minorArrowLineItemY2; @@ -457,59 +453,6 @@ minorGridLineItem->setVisible(minorGridLineVisible); minorArrowLineItem->setVisible(minorGridLineVisible); } - } else { - if (minorTickCount < 1 || tickSpacing == 0.0 || minorTickSpacings.count() != minorTickCount) - return; - - for (int i = 0; i < layout.size() - 1; ++i) { - for (int j = 0; j < minorTickCount; ++j) { - const int minorItemIndex = i * minorTickCount + j; - QGraphicsLineItem *minorGridLineItem = - static_cast(minorGridItems().value(minorItemIndex)); - QGraphicsLineItem *minorArrowLineItem = - static_cast(minorArrowItems().value(minorItemIndex)); - if (!minorGridLineItem || !minorArrowLineItem) - continue; - - const qreal minorTickSpacing = minorTickSpacings.value(j, 0.0); - - qreal minorGridLineItemX = 0.0; - if (axis()->isReverse()) { - minorGridLineItemX = qFloor(gridGeometry().left() + gridGeometry().right() - - layout.at(i) + minorTickSpacing); - } else { - minorGridLineItemX = qCeil(layout.at(i) - minorTickSpacing); - } - - qreal minorArrowLineItemY1; - qreal minorArrowLineItemY2; - switch (axis()->alignment()) { - case Qt::AlignTop: - minorArrowLineItemY1 = gridGeometry().bottom(); - minorArrowLineItemY2 = gridGeometry().bottom() - labelPadding() / 2.0; - break; - case Qt::AlignBottom: - minorArrowLineItemY1 = gridGeometry().top(); - minorArrowLineItemY2 = gridGeometry().top() + labelPadding() / 2.0; - break; - default: - minorArrowLineItemY1 = 0.0; - minorArrowLineItemY2 = 0.0; - break; - } - - minorGridLineItem->setLine(minorGridLineItemX, gridGeometry().top(), - minorGridLineItemX, gridGeometry().bottom()); - minorArrowLineItem->setLine(minorGridLineItemX, minorArrowLineItemY1, - minorGridLineItemX, minorArrowLineItemY2); - - // check if the minor grid line and the minor axis arrow should be shown - bool minorGridLineVisible = (minorGridLineItemX >= gridGeometry().left() - && minorGridLineItemX <= gridGeometry().right()); - minorGridLineItem->setVisible(minorGridLineVisible); - minorArrowLineItem->setVisible(minorGridLineVisible); - } - } } } diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/horizontalaxis_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/horizontalaxis_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/horizontalaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/horizontalaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,20 +40,19 @@ #define HORIZONTALAXIS_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT HorizontalAxis : public CartesianChartAxis +class HorizontalAxis : public CartesianChartAxis { public: HorizontalAxis(QAbstractAxis *axis, QGraphicsItem *item = nullptr, bool intervalAxis = false); ~HorizontalAxis(); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; protected: - void updateGeometry() override; + void updateGeometry() Q_DECL_OVERRIDE; private: void updateMinorTickGeometry(); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/linearrowitem_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/linearrowitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/linearrowitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/linearrowitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -42,11 +42,10 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT LineArrowItem: public QGraphicsLineItem +class LineArrowItem: public QGraphicsLineItem { public: explicit LineArrowItem(ChartAxisElement *axis, QGraphicsItem *parent = 0) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -145,6 +145,6 @@ return sh; } -QT_CHARTS_END_NAMESPACE - #include "moc_chartlogvalueaxisx_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define CHARTLOGVALUEAXISX_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartLogValueAxisX : public HorizontalAxis +class ChartLogValueAxisX : public HorizontalAxis { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -146,6 +146,6 @@ return sh; } -QT_CHARTS_END_NAMESPACE - #include "moc_chartlogvalueaxisy_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define CHARTLOGVALUEAXISY_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartLogValueAxisY : public VerticalAxis +class ChartLogValueAxisY : public VerticalAxis { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -93,6 +93,6 @@ presenter()->layout()->invalidate(); } -QT_CHARTS_END_NAMESPACE - #include "moc_polarchartlogvalueaxisangular_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define POLARCHARTLOGVALUEAXISANGULAR_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxis; -class QT_CHARTS_PRIVATE_EXPORT PolarChartLogValueAxisAngular : public PolarChartAxisAngular +class PolarChartLogValueAxisAngular : public PolarChartAxisAngular { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -92,6 +92,6 @@ presenter()->layout()->invalidate(); } -QT_CHARTS_END_NAMESPACE - #include "moc_polarchartlogvalueaxisradial_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define POLARCHARTLOGVALUEAXISRADIAL_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxis; -class QT_CHARTS_PRIVATE_EXPORT PolarChartLogValueAxisRadial : public PolarChartAxisRadial +class PolarChartLogValueAxisRadial : public PolarChartAxisRadial { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -39,7 +39,7 @@ /*! \class QLogValueAxis - \inmodule QtCharts + \inmodule Qt Charts \brief The QLogValueAxis class adds a logarithmic scale to a chart's axis. A logarithmic scale is a nonlinear scale that is based on orders of magnitude, @@ -518,7 +518,7 @@ } } -QT_CHARTS_END_NAMESPACE - #include "moc_qlogvalueaxis.cpp" #include "moc_qlogvalueaxis_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/qlogvalueaxis.h qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/qlogvalueaxis.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/qlogvalueaxis.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/qlogvalueaxis.h 2018-03-19 05:05:55.000000000 +0000 @@ -51,11 +51,11 @@ Q_PROPERTY(int minorTickCount READ minorTickCount WRITE setMinorTickCount NOTIFY minorTickCountChanged) public: - explicit QLogValueAxis(QObject *parent = nullptr); + explicit QLogValueAxis(QObject *parent = Q_NULLPTR); ~QLogValueAxis(); protected: - QLogValueAxis(QLogValueAxisPrivate &d, QObject *parent = nullptr); + QLogValueAxis(QLogValueAxisPrivate &d, QObject *parent = Q_NULLPTR); public: AxisType type() const; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,11 +41,10 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QLogValueAxisPrivate : public QAbstractAxisPrivate +class QLogValueAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/polarchartaxisangular.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/polarchartaxisangular.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/polarchartaxisangular.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/polarchartaxisangular.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -643,6 +643,7 @@ } } -QT_CHARTS_END_NAMESPACE #include "moc_polarchartaxisangular_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/polarchartaxisangular_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/polarchartaxisangular_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/polarchartaxisangular_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/polarchartaxisangular_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,11 +41,10 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT PolarChartAxisAngular : public PolarChartAxis +class PolarChartAxisAngular : public PolarChartAxis { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/polarchartaxis.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/polarchartaxis.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/polarchartaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/polarchartaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -136,6 +136,6 @@ static_cast(item)->setPen(pen); } -QT_CHARTS_END_NAMESPACE - #include "moc_polarchartaxis_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/polarchartaxis_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/polarchartaxis_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/polarchartaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/polarchartaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,11 +40,10 @@ #define POLARCHARTAXIS_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT PolarChartAxis : public ChartAxisElement +class PolarChartAxis : public ChartAxisElement { Q_OBJECT Q_INTERFACES(QGraphicsLayoutItem) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/polarchartaxisradial.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/polarchartaxisradial.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/polarchartaxisradial.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/polarchartaxisradial.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -505,6 +505,6 @@ } } -QT_CHARTS_END_NAMESPACE - #include "moc_polarchartaxisradial_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/polarchartaxisradial_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/polarchartaxisradial_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/polarchartaxisradial_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/polarchartaxisradial_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,11 +41,10 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT PolarChartAxisRadial : public PolarChartAxis +class PolarChartAxisRadial : public PolarChartAxis { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/qabstractaxis.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/qabstractaxis.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/qabstractaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/qabstractaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -37,7 +37,7 @@ /*! \class QAbstractAxis - \inmodule QtCharts + \inmodule Qt Charts \brief The QAbstractAxis class is a base class used for specialized axis classes. Each series can be bound to one or more horizontal and vertical axes, but mixing axis types @@ -1071,7 +1071,9 @@ axis->setAnimation(0); } -QT_CHARTS_END_NAMESPACE + #include "moc_qabstractaxis.cpp" #include "moc_qabstractaxis_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/qabstractaxis.h qtcharts-opensource-src-5.9.5/src/charts/axis/qabstractaxis.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/qabstractaxis.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/qabstractaxis.h 2018-03-19 05:05:55.000000000 +0000 @@ -92,7 +92,7 @@ Q_DECLARE_FLAGS(AxisTypes, AxisType) protected: - explicit QAbstractAxis(QAbstractAxisPrivate &d, QObject *parent = nullptr); + explicit QAbstractAxis(QAbstractAxisPrivate &d, QObject *parent = Q_NULLPTR); public: ~QAbstractAxis(); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/qabstractaxis_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/qabstractaxis_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/qabstractaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/qabstractaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -42,7 +42,6 @@ #include #include #include -#include #include QT_BEGIN_NAMESPACE @@ -58,7 +57,7 @@ class ChartTheme; class ChartElement; -class QT_CHARTS_PRIVATE_EXPORT QAbstractAxisPrivate : public QObject +class Q_AUTOTEST_EXPORT QAbstractAxisPrivate : public QObject { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/chartvalueaxisx.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/chartvalueaxisx.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/chartvalueaxisx.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/chartvalueaxisx.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -47,10 +47,6 @@ QObject::connect(m_axis, SIGNAL(minorTickCountChanged(int)), this, SLOT(handleMinorTickCountChanged(int))); QObject::connect(m_axis, SIGNAL(labelFormatChanged(QString)), this, SLOT(handleLabelFormatChanged(QString))); - QObject::connect(m_axis, SIGNAL(tickIntervalChanged(qreal)), this, SLOT(handleTickIntervalChanged(qreal))); - QObject::connect(m_axis, SIGNAL(tickAnchorChanged(qreal)), this, SLOT(handleTickAnchorChanged(qreal))); - QObject::connect(m_axis, SIGNAL(tickTypeChanged(QValueAxis::TickType)), this, - SLOT(handleTickTypeChanged(QValueAxis::TickType))); } ChartValueAxisX::~ChartValueAxisX() @@ -59,53 +55,26 @@ QVector ChartValueAxisX::calculateLayout() const { - if (m_axis->tickType() == QValueAxis::TicksFixed) { - int tickCount = m_axis->tickCount(); + int tickCount = m_axis->tickCount(); - Q_ASSERT(tickCount >= 2); + Q_ASSERT(tickCount >= 2); - QVector points; - points.resize(tickCount); + QVector points; + points.resize(tickCount); - const QRectF &gridRect = gridGeometry(); - const qreal deltaX = gridRect.width() / (qreal(tickCount) - 1.0); - for (int i = 0; i < tickCount; ++i) - points[i] = qreal(i) * deltaX + gridRect.left(); - return points; - } else { // QValueAxis::TicksDynamic - const qreal interval = m_axis->tickInterval(); - qreal value = m_axis->tickAnchor(); - const qreal maxValue = max(); - const qreal minValue = min(); - - // Find the first major tick right after the min of range - if (value > minValue) - value = value - int((value - minValue) / interval) * interval; - else - value = value + qCeil((minValue - value) / interval) * interval; - - const QRectF &gridRect = gridGeometry(); - const qreal deltaX = gridRect.width() / (maxValue - minValue); - - QVector points; - const qreal leftPos = gridRect.left(); - while (value <= maxValue || qFuzzyCompare(value, maxValue)) { - points << (value - minValue) * deltaX + leftPos; - value += interval; - } - - return points; - } + const QRectF &gridRect = gridGeometry(); + const qreal deltaX = gridRect.width() / (qreal(tickCount) - 1.0); + for (int i = 0; i < tickCount; ++i) + points[i] = qreal(i) * deltaX + gridRect.left(); + return points; } void ChartValueAxisX::updateGeometry() { const QVector& layout = ChartAxisElement::layout(); - const QVector& dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout(); - if (layout.isEmpty() && dynamicMinorTicklayout.isEmpty()) + if (layout.isEmpty()) return; - setLabels(createValueLabels(min(), max(), layout.size(), m_axis->tickInterval(), - m_axis->tickAnchor(), m_axis->tickType(), m_axis->labelFormat())); + setLabels(createValueLabels(min(), max(), layout.size(), m_axis->labelFormat())); HorizontalAxis::updateGeometry(); } @@ -113,7 +82,7 @@ { Q_UNUSED(tick); QGraphicsLayoutItem::updateGeometry(); - if (presenter()) presenter()->layout()->invalidate(); + if(presenter()) presenter()->layout()->invalidate(); } void ChartValueAxisX::handleMinorTickCountChanged(int tick) @@ -128,28 +97,7 @@ { Q_UNUSED(format); QGraphicsLayoutItem::updateGeometry(); - if (presenter()) presenter()->layout()->invalidate(); -} - -void ChartValueAxisX::handleTickIntervalChanged(qreal interval) -{ - Q_UNUSED(interval) - QGraphicsLayoutItem::updateGeometry(); - if (presenter()) presenter()->layout()->invalidate(); -} - -void ChartValueAxisX::handleTickAnchorChanged(qreal anchor) -{ - Q_UNUSED(anchor) - QGraphicsLayoutItem::updateGeometry(); - if (presenter()) presenter()->layout()->invalidate(); -} - -void ChartValueAxisX::handleTickTypeChanged(QValueAxis::TickType type) -{ - Q_UNUSED(type) - QGraphicsLayoutItem::updateGeometry(); - if (presenter()) presenter()->layout()->invalidate(); + if(presenter()) presenter()->layout()->invalidate(); } QSizeF ChartValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const @@ -159,9 +107,7 @@ QSizeF sh; QSizeF base = HorizontalAxis::sizeHint(which, constraint); - QStringList ticksList = createValueLabels(min(), max(), m_axis->tickCount(), - m_axis->tickInterval(), m_axis->tickAnchor(), - m_axis->tickType(), m_axis->labelFormat()); + QStringList ticksList = createValueLabels(min(),max(),m_axis->tickCount(),m_axis->labelFormat()); // Width of horizontal axis sizeHint indicates the maximum distance labels can extend past // first and last ticks. Base width is irrelevant. qreal width = 0; @@ -198,6 +144,6 @@ return sh; } -QT_CHARTS_END_NAMESPACE - #include "moc_chartvalueaxisx_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/chartvalueaxisx_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/chartvalueaxisx_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/chartvalueaxisx_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/chartvalueaxisx_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define CHARTVALUEAXISX_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QValueAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartValueAxisX : public HorizontalAxis +class ChartValueAxisX : public HorizontalAxis { Q_OBJECT public: @@ -61,9 +60,6 @@ void handleTickCountChanged(int tick); void handleMinorTickCountChanged(int tick); void handleLabelFormatChanged(const QString &format); - void handleTickIntervalChanged(qreal interval); - void handleTickAnchorChanged(qreal anchor); - void handleTickTypeChanged(QValueAxis::TickType type); private: QValueAxis *m_axis; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/chartvalueaxisy.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/chartvalueaxisy.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/chartvalueaxisy.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/chartvalueaxisy.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -46,10 +46,6 @@ QObject::connect(m_axis, SIGNAL(minorTickCountChanged(int)), this, SLOT(handleMinorTickCountChanged(int))); QObject::connect(m_axis, SIGNAL(labelFormatChanged(QString)), this, SLOT(handleLabelFormatChanged(QString))); - QObject::connect(m_axis, SIGNAL(tickIntervalChanged(qreal)), this, SLOT(handleTickIntervalChanged(qreal))); - QObject::connect(m_axis, SIGNAL(tickAnchorChanged(qreal)), this, SLOT(handleTickAnchorChanged(qreal))); - QObject::connect(m_axis, SIGNAL(tickTypeChanged(QValueAxis::TickType)), this, - SLOT(handleTickTypeChanged(QValueAxis::TickType))); } ChartValueAxisY::~ChartValueAxisY() @@ -58,55 +54,28 @@ QVector ChartValueAxisY::calculateLayout() const { - if (m_axis->tickType() == QValueAxis::TicksFixed) { - int tickCount = m_axis->tickCount(); + int tickCount = m_axis->tickCount(); - Q_ASSERT(tickCount >= 2); + Q_ASSERT(tickCount >= 2); - QVector points; - points.resize(tickCount); + QVector points; + points.resize(tickCount); - const QRectF &gridRect = gridGeometry(); - - const qreal deltaY = gridRect.height() / (qreal(tickCount) - 1.0); - for (int i = 0; i < tickCount; ++i) - points[i] = qreal(i) * -deltaY + gridRect.bottom(); - - return points; - } else { - const qreal interval = m_axis->tickInterval(); - qreal value = m_axis->tickAnchor(); - const qreal maxValue = max(); - const qreal minValue = min(); - - // Find the first major tick right after the min of range - if (value > minValue) - value = value - int((value - minValue) / interval) * interval; - else - value = value + qCeil((minValue - value) / interval) * interval; - - const QRectF &gridRect = gridGeometry(); - const qreal deltaY = gridRect.height() / (maxValue - minValue); - - QVector points; - const qreal bottomPos = gridRect.bottom(); - while (value <= maxValue || qFuzzyCompare(value, maxValue)) { - points << (value - minValue) * -deltaY + bottomPos; - value += interval; - } + const QRectF &gridRect = gridGeometry(); - return points; - } + const qreal deltaY = gridRect.height() / (qreal(tickCount) - 1.0); + for (int i = 0; i < tickCount; ++i) + points[i] = qreal(i) * -deltaY + gridRect.bottom(); + + return points; } void ChartValueAxisY::updateGeometry() { const QVector &layout = ChartAxisElement::layout(); - const QVector& dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout(); - if (layout.isEmpty() && dynamicMinorTicklayout.isEmpty()) + if (layout.isEmpty()) return; - setLabels(createValueLabels(min(), max(), layout.size(), m_axis->tickInterval(), - m_axis->tickAnchor(), m_axis->tickType(), m_axis->labelFormat())); + setLabels(createValueLabels(min(),max(),layout.size(),m_axis->labelFormat())); VerticalAxis::updateGeometry(); } @@ -129,28 +98,7 @@ { Q_UNUSED(format); QGraphicsLayoutItem::updateGeometry(); - if (presenter()) presenter()->layout()->invalidate(); -} - -void ChartValueAxisY::handleTickIntervalChanged(qreal interval) -{ - Q_UNUSED(interval) - QGraphicsLayoutItem::updateGeometry(); - if (presenter()) presenter()->layout()->invalidate(); -} - -void ChartValueAxisY::handleTickAnchorChanged(qreal anchor) -{ - Q_UNUSED(anchor) - QGraphicsLayoutItem::updateGeometry(); - if (presenter()) presenter()->layout()->invalidate(); -} - -void ChartValueAxisY::handleTickTypeChanged(QValueAxis::TickType type) -{ - Q_UNUSED(type) - QGraphicsLayoutItem::updateGeometry(); - if (presenter()) presenter()->layout()->invalidate(); + if(presenter()) presenter()->layout()->invalidate(); } QSizeF ChartValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const @@ -159,9 +107,7 @@ QSizeF sh; QSizeF base = VerticalAxis::sizeHint(which, constraint); - QStringList ticksList = createValueLabels(min(), max(), m_axis->tickCount(), - m_axis->tickInterval(), m_axis->tickAnchor(), - m_axis->tickType(), m_axis->labelFormat()); + QStringList ticksList = createValueLabels(min(),max(),m_axis->tickCount(),m_axis->labelFormat()); qreal width = 0; // Height of vertical axis sizeHint indicates the maximum distance labels can extend past // first and last ticks. Base height is irrelevant. @@ -198,6 +144,6 @@ return sh; } -QT_CHARTS_END_NAMESPACE - #include "moc_chartvalueaxisy_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/chartvalueaxisy_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/chartvalueaxisy_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/chartvalueaxisy_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/chartvalueaxisy_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define CHARTVALUEAXISY_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QValueAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartValueAxisY : public VerticalAxis +class ChartValueAxisY : public VerticalAxis { Q_OBJECT public: @@ -61,9 +60,6 @@ void handleTickCountChanged(int tick); void handleMinorTickCountChanged(int tick); void handleLabelFormatChanged(const QString &format); - void handleTickIntervalChanged(qreal interval); - void handleTickAnchorChanged(qreal anchor); - void handleTickTypeChanged(QValueAxis::TickType type); private: QValueAxis *m_axis; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -66,9 +66,7 @@ void PolarChartValueAxisAngular::createAxisLabels(const QVector &layout) { - QStringList labelList = createValueLabels(min(), max(), layout.size(), 0.0, 0.0, - QValueAxis::TicksFixed, - static_cast(axis())->labelFormat()); + QStringList labelList = createValueLabels(min(), max(), layout.size(), static_cast(axis())->labelFormat()); setLabels(labelList); } @@ -96,6 +94,6 @@ presenter()->layout()->invalidate(); } -QT_CHARTS_END_NAMESPACE - #include "moc_polarchartvalueaxisangular_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,13 +41,12 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class QValueAxis; -class QT_CHARTS_PRIVATE_EXPORT PolarChartValueAxisAngular : public PolarChartAxisAngular +class PolarChartValueAxisAngular : public PolarChartAxisAngular { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -66,9 +66,7 @@ void PolarChartValueAxisRadial::createAxisLabels(const QVector &layout) { - setLabels(createValueLabels(min(), max(), layout.size(), 0.0, 0.0, - QValueAxis::TicksFixed, - static_cast(axis())->labelFormat())); + setLabels(createValueLabels(min(), max(), layout.size(), static_cast(axis())->labelFormat())); } void PolarChartValueAxisRadial::handleTickCountChanged(int tick) @@ -95,6 +93,6 @@ presenter()->layout()->invalidate(); } -QT_CHARTS_END_NAMESPACE - #include "moc_polarchartvalueaxisradial_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,13 +40,12 @@ #define POLARCHARTVALUEAXISRADIAL_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QValueAxis; -class QT_CHARTS_PRIVATE_EXPORT PolarChartValueAxisRadial : public PolarChartAxisRadial +class PolarChartValueAxisRadial : public PolarChartAxisRadial { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/qvalueaxis.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/qvalueaxis.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/qvalueaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/qvalueaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -42,7 +42,7 @@ QT_CHARTS_BEGIN_NAMESPACE /*! \class QValueAxis - \inmodule QtCharts + \inmodule Qt Charts \brief The QValueAxis class adds values to a chart's axes. A value axis can be set up to show an axis line with tick marks, grid lines, and shades. @@ -139,54 +139,6 @@ */ /*! - \property QValueAxis::tickAnchor - \since 5.12 - \brief The base value where the dynamically placed tick marks and labels are started from. -*/ -/*! - \qmlproperty real ValueAxis::tickAnchor - \since QtCharts 2.3 - The base value where the dynamically placed tick marks and labels are started from. -*/ - -/*! - \property QValueAxis::tickInterval - \since 5.12 - \brief The interval between dynamically placed tick marks and labels. -*/ -/*! - \qmlproperty real ValueAxis::tickInterval - \since QtCharts 2.3 - The interval between dynamically placed tick marks and labels. -*/ - -/*! - \enum QValueAxis::TickType - - This enum describes how the ticks and labels are positioned on the axis. - - \value TicksDynamic Ticks are placed according to tickAnchor and tickInterval values. - \value TicksFixed Ticks are placed evenly across the axis range. The tickCount value - specifies the number of ticks. - */ -/*! - \property QValueAxis::tickType - \since 5.12 - \brief The positioning method of tick and labels. -*/ -/*! - \qmlproperty enumeration ValueAxis::tickType - \since QtCharts 2.3 - - The positioning method of tick and labels. - - \value ValueAxis.TicksDynamic - Ticks are placed according to tickAnchor and tickInterval values. - \value ValueAxis.TicksFixed - Ticks are placed evenly across the axis range. The tickCount value specifies the number of ticks. -*/ - -/*! \property QValueAxis::labelFormat \brief The label format of the axis. @@ -344,52 +296,6 @@ return d->m_minorTickCount; } - -void QValueAxis::setTickInterval(qreal interval) -{ - Q_D(QValueAxis); - if (d->m_tickInterval != interval) { - d->m_tickInterval = interval; - emit tickIntervalChanged(interval); - } -} - -qreal QValueAxis::tickInterval() const -{ - Q_D(const QValueAxis); - return d->m_tickInterval; -} - -void QValueAxis::setTickAnchor(qreal anchor) -{ - Q_D(QValueAxis); - if (d->m_tickAnchor != anchor) { - d->m_tickAnchor = anchor; - emit tickAnchorChanged(anchor); - } -} - -qreal QValueAxis::tickAnchor() const -{ - Q_D(const QValueAxis); - return d->m_tickAnchor; -} - -void QValueAxis::setTickType(QValueAxis::TickType type) -{ - Q_D(QValueAxis); - if (d->m_tickType != type) { - d->m_tickType = type; - emit tickTypeChanged(type); - } -} - -QValueAxis::TickType QValueAxis::tickType() const -{ - Q_D(const QValueAxis); - return d->m_tickType; -} - void QValueAxis::setLabelFormat(const QString &format) { Q_D(QValueAxis); @@ -449,10 +355,7 @@ m_tickCount(5), m_minorTickCount(0), m_format(), - m_applying(false), - m_tickInterval(0.0), - m_tickAnchor(0.0), - m_tickType(QValueAxis::TicksFixed) + m_applying(false) { } @@ -563,7 +466,7 @@ } } -QT_CHARTS_END_NAMESPACE - #include "moc_qvalueaxis.cpp" #include "moc_qvalueaxis_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/qvalueaxis.h qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/qvalueaxis.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/qvalueaxis.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/qvalueaxis.h 2018-03-19 05:05:55.000000000 +0000 @@ -44,23 +44,13 @@ Q_PROPERTY(qreal max READ max WRITE setMax NOTIFY maxChanged) Q_PROPERTY(QString labelFormat READ labelFormat WRITE setLabelFormat NOTIFY labelFormatChanged) Q_PROPERTY(int minorTickCount READ minorTickCount WRITE setMinorTickCount NOTIFY minorTickCountChanged) - Q_PROPERTY(qreal tickAnchor READ tickAnchor WRITE setTickAnchor NOTIFY tickAnchorChanged REVISION 1) - Q_PROPERTY(qreal tickInterval READ tickInterval WRITE setTickInterval NOTIFY tickIntervalChanged REVISION 1) - Q_PROPERTY(TickType tickType READ tickType WRITE setTickType NOTIFY tickTypeChanged REVISION 1) - Q_ENUMS(TickType) public: - enum TickType { - TicksDynamic = 0, - TicksFixed - }; - -public: - explicit QValueAxis(QObject *parent = nullptr); + explicit QValueAxis(QObject *parent = Q_NULLPTR); ~QValueAxis(); protected: - QValueAxis(QValueAxisPrivate &d, QObject *parent = nullptr); + QValueAxis(QValueAxisPrivate &d, QObject *parent = Q_NULLPTR); public: AxisType type() const; @@ -77,12 +67,6 @@ int tickCount() const; void setMinorTickCount(int count); int minorTickCount() const; - void setTickAnchor(qreal anchor); - qreal tickAnchor() const; - void setTickInterval(qreal insterval); - qreal tickInterval() const; - void setTickType(QValueAxis::TickType type); - QValueAxis::TickType tickType() const; void setLabelFormat(const QString &format); QString labelFormat() const; @@ -97,9 +81,6 @@ void tickCountChanged(int tickCount); void minorTickCountChanged(int tickCount); void labelFormatChanged(const QString &format); - Q_REVISION(1) void tickIntervalChanged(qreal interval); - Q_REVISION(1) void tickAnchorChanged(qreal anchor); - Q_REVISION(1) void tickTypeChanged(QValueAxis::TickType type); private: Q_DECLARE_PRIVATE(QValueAxis) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/qvalueaxis_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/qvalueaxis_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/valueaxis/qvalueaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/valueaxis/qvalueaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,11 +41,10 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QValueAxisPrivate : public QAbstractAxisPrivate +class QValueAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT public: @@ -60,9 +59,6 @@ qreal max() { return m_max; } void setRange(qreal min,qreal max); - qreal tickInterval() { return m_tickInterval; } - qreal tickAnchor() { return m_tickAnchor; } - protected: void setMin(const QVariant &min); void setMax(const QVariant &max); @@ -75,9 +71,6 @@ int m_minorTickCount; QString m_format; bool m_applying; - qreal m_tickInterval; - qreal m_tickAnchor; - QValueAxis::TickType m_tickType; Q_DECLARE_PUBLIC(QValueAxis) }; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/verticalaxis.cpp qtcharts-opensource-src-5.9.5/src/charts/axis/verticalaxis.cpp --- qtcharts-opensource-src-5.12.5/src/charts/axis/verticalaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/verticalaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -75,12 +75,9 @@ void VerticalAxis::updateGeometry() { const QVector &layout = ChartAxisElement::layout(); - const QVector &dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout(); - if (layout.isEmpty() && dynamicMinorTicklayout.isEmpty() - && axis()->type() != QAbstractAxis::AxisTypeLogValue) { + if (layout.isEmpty() && axis()->type() != QAbstractAxis::AxisTypeLogValue) return; - } QStringList labelList = labels(); @@ -365,14 +362,12 @@ minorTickCount = valueAxis->minorTickCount(); - if (valueAxis->tickType() == QValueAxis::TicksFixed) { - if (valueAxis->tickCount() >= 2) - tickSpacing = layout.at(0) - layout.at(1); - - for (int i = 0; i < minorTickCount; ++i) { - const qreal ratio = (1.0 / qreal(minorTickCount + 1)) * qreal(i + 1); - minorTickSpacings.append(tickSpacing * ratio); - } + if (valueAxis->tickCount() >= 2) + tickSpacing = layout.at(0) - layout.at(1); + + for (int i = 0; i < minorTickCount; ++i) { + const qreal ratio = (1.0 / qreal(minorTickCount + 1)) * qreal(i + 1); + minorTickSpacings.append(tickSpacing * ratio); } break; } @@ -426,27 +421,28 @@ break; } - const QValueAxis *valueAxis = qobject_cast(axis()); - if (valueAxis && valueAxis->tickType() == QValueAxis::TicksDynamic) { - const QVector dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout(); - const QRectF &gridRect = gridGeometry(); - const qreal deltaY = gridRect.height() / (valueAxis->max() - valueAxis->min()); - const qreal bottomPos = gridRect.bottom(); - const qreal topPos = gridRect.top(); + if (minorTickCount < 1 || tickSpacing == 0.0 || minorTickSpacings.count() != minorTickCount) + return; - for (int i = 0; i < dynamicMinorTicklayout.size(); i++) { + for (int i = 0; i < layout.size() - 1; ++i) { + for (int j = 0; j < minorTickCount; ++j) { + const int minorItemIndex = i * minorTickCount + j; QGraphicsLineItem *minorGridLineItem = - static_cast(minorGridItems().value(i)); + static_cast(minorGridItems().value(minorItemIndex)); QGraphicsLineItem *minorArrowLineItem = - static_cast(minorArrowItems().value(i)); + static_cast(minorArrowItems().value(minorItemIndex)); if (!minorGridLineItem || !minorArrowLineItem) continue; + const qreal minorTickSpacing = minorTickSpacings.value(j, 0.0); + qreal minorGridLineItemY = 0.0; - if (axis()->isReverse()) - minorGridLineItemY = topPos + dynamicMinorTicklayout.at(i) * deltaY; - else - minorGridLineItemY = bottomPos - dynamicMinorTicklayout.at(i) * deltaY; + if (axis()->isReverse()) { + minorGridLineItemY = qFloor(gridGeometry().top() + gridGeometry().bottom() + - layout.at(i) + minorTickSpacing); + } else { + minorGridLineItemY = qCeil(layout.at(i) - minorTickSpacing); + } qreal minorArrowLineItemX1; qreal minorArrowLineItemX2; @@ -476,59 +472,6 @@ minorGridLineItem->setVisible(minorGridLineVisible); minorArrowLineItem->setVisible(minorGridLineVisible); } - } else { - if (minorTickCount < 1 || tickSpacing == 0.0 || minorTickSpacings.count() != minorTickCount) - return; - - for (int i = 0; i < layout.size() - 1; ++i) { - for (int j = 0; j < minorTickCount; ++j) { - const int minorItemIndex = i * minorTickCount + j; - QGraphicsLineItem *minorGridLineItem = - static_cast(minorGridItems().value(minorItemIndex)); - QGraphicsLineItem *minorArrowLineItem = - static_cast(minorArrowItems().value(minorItemIndex)); - if (!minorGridLineItem || !minorArrowLineItem) - continue; - - const qreal minorTickSpacing = minorTickSpacings.value(j, 0.0); - - qreal minorGridLineItemY = 0.0; - if (axis()->isReverse()) { - minorGridLineItemY = qFloor(gridGeometry().top() + gridGeometry().bottom() - - layout.at(i) + minorTickSpacing); - } else { - minorGridLineItemY = qCeil(layout.at(i) - minorTickSpacing); - } - - qreal minorArrowLineItemX1; - qreal minorArrowLineItemX2; - switch (axis()->alignment()) { - case Qt::AlignLeft: - minorArrowLineItemX1 = gridGeometry().left() - labelPadding() / 2.0; - minorArrowLineItemX2 = gridGeometry().left(); - break; - case Qt::AlignRight: - minorArrowLineItemX1 = gridGeometry().right(); - minorArrowLineItemX2 = gridGeometry().right() + labelPadding() / 2.0; - break; - default: - minorArrowLineItemX1 = 0.0; - minorArrowLineItemX2 = 0.0; - break; - } - - minorGridLineItem->setLine(gridGeometry().left(), minorGridLineItemY, - gridGeometry().right(), minorGridLineItemY); - minorArrowLineItem->setLine(minorArrowLineItemX1, minorGridLineItemY, - minorArrowLineItemX2, minorGridLineItemY); - - // check if the minor grid line and the minor axis arrow should be shown - bool minorGridLineVisible = (minorGridLineItemY >= gridGeometry().top() - && minorGridLineItemY <= gridGeometry().bottom()); - minorGridLineItem->setVisible(minorGridLineVisible); - minorArrowLineItem->setVisible(minorGridLineVisible); - } - } } } diff -Nru qtcharts-opensource-src-5.12.5/src/charts/axis/verticalaxis_p.h qtcharts-opensource-src-5.9.5/src/charts/axis/verticalaxis_p.h --- qtcharts-opensource-src-5.12.5/src/charts/axis/verticalaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/axis/verticalaxis_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,20 +40,19 @@ #define VERTICALAXIS_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT VerticalAxis : public CartesianChartAxis +class VerticalAxis : public CartesianChartAxis { public: VerticalAxis(QAbstractAxis *axis, QGraphicsItem *item = nullptr, bool intervalAxis = false); ~VerticalAxis(); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; protected: - void updateGeometry() override; + void updateGeometry() Q_DECL_OVERRIDE; private: void updateMinorTickGeometry(); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/abstractbarchartitem.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/abstractbarchartitem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/abstractbarchartitem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/abstractbarchartitem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -75,10 +75,6 @@ connect(series, SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)), this, SLOT(handleLabelsPositionChanged())); connect(series, SIGNAL(labelsAngleChanged(qreal)), this, SLOT(positionLabels())); - connect(series, &QAbstractBarSeries::labelsPrecisionChanged, - this, &AbstractBarChartItem::handleUpdatedBars); - connect(series, &QAbstractBarSeries::labelsPrecisionChanged, - this, &AbstractBarChartItem::positionLabels); connect(series->chart()->d_ptr->m_dataset, &ChartDataSet::seriesAdded, this, &AbstractBarChartItem::handleSeriesAdded); connect(series->chart()->d_ptr->m_dataset, &ChartDataSet::seriesRemoved, @@ -556,15 +552,13 @@ Q_UNUSED(set); Q_UNUSED(category); static const QString valueTag(QLatin1String("@value")); - QString valueString = presenter()->numberToString(value, 'g', m_series->labelsPrecision()); QString valueLabel; if (m_series->labelsFormat().isEmpty()) { - valueLabel = valueString; + valueLabel = presenter()->numberToString(value); } else { valueLabel = m_series->labelsFormat(); - valueLabel.replace(valueTag, valueString); + valueLabel.replace(valueTag, presenter()->numberToString(value)); } - return valueLabel; } @@ -726,11 +720,6 @@ } } -ChartAnimation *AbstractBarChartItem::animation() const -{ - return m_animation; -} +#include "moc_abstractbarchartitem_p.cpp" QT_CHARTS_END_NAMESPACE - -#include "moc_abstractbarchartitem_p.cpp" diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/abstractbarchartitem_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/abstractbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/abstractbarchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/abstractbarchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -42,7 +42,6 @@ #include #include -#include #include #include @@ -55,7 +54,7 @@ class QBarSetPrivate; class QAbstractAxis; -class QT_CHARTS_PRIVATE_EXPORT AbstractBarChartItem : public ChartItem +class AbstractBarChartItem : public ChartItem { Q_OBJECT public: @@ -71,7 +70,6 @@ virtual void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) = 0; virtual void applyLayout(const QVector &layout); virtual void setAnimation(BarAnimation *animation); - virtual ChartAnimation *animation() const; void setLayout(const QVector &layout); QRectF geometry() const { return m_rect;} void resetAnimation(); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/bar.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/bar.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/bar.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/bar.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -103,6 +103,6 @@ QGraphicsRectItem::paint(painter, &barOption, widget); } -QT_CHARTS_END_NAMESPACE - #include "moc_bar_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/bar_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/bar_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/bar_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/bar_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,6 @@ #define BAR_H #include -#include #include #include @@ -49,7 +48,7 @@ class QBarSet; // Single visual bar item of chart -class QT_CHARTS_PRIVATE_EXPORT Bar : public QObject, public QGraphicsRectItem +class Bar : public QObject, public QGraphicsRectItem { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -126,6 +126,6 @@ return layout; } -QT_CHARTS_END_NAMESPACE - #include "moc_horizontalbarchartitem_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,11 +41,10 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT HorizontalBarChartItem : public AbstractBarChartItem +class HorizontalBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,7 @@ /*! \class QHorizontalBarSeries - \inmodule QtCharts + \inmodule Qt Charts \brief The QHorizontalBarSeries class presents a series of data as horizontal bars grouped by category. @@ -130,6 +130,6 @@ QAbstractSeriesPrivate::initializeGraphics(parent); } -QT_CHARTS_END_NAMESPACE - #include "moc_qhorizontalbarseries.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,7 @@ { Q_OBJECT public: - explicit QHorizontalBarSeries(QObject *parent = nullptr); + explicit QHorizontalBarSeries(QObject *parent = Q_NULLPTR); ~QHorizontalBarSeries(); QAbstractSeries::SeriesType type() const; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,11 +41,10 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QHorizontalBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QHorizontalBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QHorizontalBarSeriesPrivate(QHorizontalBarSeries *q); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -163,6 +163,7 @@ return layout; } +#include "moc_horizontalpercentbarchartitem_p.cpp" + QT_CHARTS_END_NAMESPACE -#include "moc_horizontalpercentbarchartitem_p.cpp" diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,11 +41,10 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT HorizontalPercentBarChartItem : public AbstractBarChartItem +class HorizontalPercentBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -37,7 +37,7 @@ /*! \class QHorizontalPercentBarSeries - \inmodule QtCharts + \inmodule Qt Charts \brief The QHorizontalPercentBarSeries class presents a series of categorized data as a percentage of each category. @@ -135,6 +135,6 @@ QAbstractSeriesPrivate::initializeGraphics(parent); } -QT_CHARTS_END_NAMESPACE - #include "moc_qhorizontalpercentbarseries.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,7 @@ { Q_OBJECT public: - explicit QHorizontalPercentBarSeries(QObject *parent = nullptr); + explicit QHorizontalPercentBarSeries(QObject *parent = Q_NULLPTR); ~QHorizontalPercentBarSeries(); QAbstractSeries::SeriesType type() const; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,11 +41,10 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QHorizontalPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QHorizontalPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QHorizontalPercentBarSeriesPrivate(QHorizontalPercentBarSeries *q); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -175,6 +175,7 @@ return layout; } +#include "moc_horizontalstackedbarchartitem_p.cpp" + QT_CHARTS_END_NAMESPACE -#include "moc_horizontalstackedbarchartitem_p.cpp" diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,12 +40,11 @@ #define HORIZONTALSTACKEDBARCHARTITEM_P_H #include -#include #include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT HorizontalStackedBarChartItem : public AbstractBarChartItem +class HorizontalStackedBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -36,7 +36,7 @@ QT_CHARTS_BEGIN_NAMESPACE /*! \class QHorizontalStackedBarSeries - \inmodule QtCharts + \inmodule Qt Charts \brief The QHorizontalStackedBarSeries class presents a series of data as horizontally stacked bars, with one bar per category. @@ -123,6 +123,6 @@ QAbstractSeriesPrivate::initializeGraphics(parent); } -QT_CHARTS_END_NAMESPACE - #include "moc_qhorizontalstackedbarseries.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,7 @@ { Q_OBJECT public: - explicit QHorizontalStackedBarSeries(QObject *parent = nullptr); + explicit QHorizontalStackedBarSeries(QObject *parent = Q_NULLPTR); ~QHorizontalStackedBarSeries(); QAbstractSeries::SeriesType type() const; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,11 +41,10 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QHorizontalStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QHorizontalStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries *q); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/qabstractbarseries.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/qabstractbarseries.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/qabstractbarseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/qabstractbarseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -45,7 +45,7 @@ /*! \class QAbstractBarSeries - \inmodule QtCharts + \inmodule Qt Charts \brief The QAbstractBarSeries class is an abstract parent class for all bar series classes. In bar charts, bars are defined as bar sets that contain one data value for each category. @@ -185,7 +185,7 @@ after the value. The labels are shown on the plot area, whereas labels on the edge of the plot area are cut. If the bars are close to each other, the labels may overlap. - \sa labelsVisible, labelsPosition, labelsPrecision + \sa labelsVisible, labelsPosition */ /*! \qmlproperty string AbstractBarSeries::labelsFormat @@ -250,23 +250,6 @@ */ /*! - \property QAbstractBarSeries::labelsPrecision - \brief The maximum amount of significant digits shown in value labels. - - Default value is 6. -*/ -/*! - \qmlproperty real AbstractBarSeries::labelsPrecision - The maximum amount of significant digits shown in value labels. - - Default value is 6. -*/ -/*! - \fn void QAbstractBarSeries::labelsPrecisionChanged(int precision) - This signal is emitted when the \a precision of the value labels changes. -*/ - -/*! \fn void QAbstractBarSeries::clicked(int index, QBarSet *barset) This signal is emitted when the user clicks the bar specified by \a index in the bar set specified by \a barset. @@ -646,22 +629,6 @@ return d->m_labelsPosition; } -void QAbstractBarSeries::setLabelsPrecision(int precision) -{ - Q_D(QAbstractBarSeries); - if (d->m_labelsPrecision != precision) { - d->m_labelsPrecision = precision; - d->setLabelsDirty(true); - emit labelsPrecisionChanged(precision); - } -} - -int QAbstractBarSeries::labelsPrecision() const -{ - Q_D(const QAbstractBarSeries); - return d->m_labelsPrecision; -} - /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// QAbstractBarSeriesPrivate::QAbstractBarSeriesPrivate(QAbstractBarSeries *q) : @@ -673,7 +640,6 @@ m_labelsFormat(), m_labelsPosition(QAbstractBarSeries::LabelsCenter), m_labelsAngle(0), - m_labelsPrecision(6), m_visualsDirty(true), m_labelsDirty(true) { @@ -1260,7 +1226,7 @@ QAbstractSeriesPrivate::initializeAnimations(options, duration, curve); } -QT_CHARTS_END_NAMESPACE - #include "moc_qabstractbarseries.cpp" #include "moc_qabstractbarseries_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/qabstractbarseries.h qtcharts-opensource-src-5.9.5/src/charts/barchart/qabstractbarseries.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/qabstractbarseries.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/qabstractbarseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -48,7 +48,6 @@ Q_PROPERTY(QString labelsFormat READ labelsFormat WRITE setLabelsFormat NOTIFY labelsFormatChanged) Q_PROPERTY(LabelsPosition labelsPosition READ labelsPosition WRITE setLabelsPosition NOTIFY labelsPositionChanged) Q_PROPERTY(qreal labelsAngle READ labelsAngle WRITE setLabelsAngle NOTIFY labelsAngleChanged) - Q_PROPERTY(int labelsPrecision READ labelsPrecision WRITE setLabelsPrecision NOTIFY labelsPrecisionChanged) Q_ENUMS(LabelsPosition) public: @@ -86,11 +85,8 @@ void setLabelsPosition(QAbstractBarSeries::LabelsPosition position); QAbstractBarSeries::LabelsPosition labelsPosition() const; - void setLabelsPrecision(int precision); - int labelsPrecision() const; - protected: - explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent = nullptr); + explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent = Q_NULLPTR); Q_SIGNALS: void clicked(int index, QBarSet *barset); @@ -103,7 +99,6 @@ void labelsFormatChanged(const QString &format); void labelsPositionChanged(QAbstractBarSeries::LabelsPosition position); void labelsAngleChanged(qreal angle); - void labelsPrecisionChanged(int precision); void barsetsAdded(QList sets); void barsetsRemoved(QList sets); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/qabstractbarseries_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/qabstractbarseries_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/qabstractbarseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/qabstractbarseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,7 +43,6 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE @@ -51,7 +50,7 @@ class QBarCategoryAxis; class QLegendMarker; -class QT_CHARTS_PRIVATE_EXPORT QAbstractBarSeriesPrivate : public QAbstractSeriesPrivate +class QAbstractBarSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT public: @@ -134,7 +133,6 @@ QString m_labelsFormat; QAbstractBarSeries::LabelsPosition m_labelsPosition; qreal m_labelsAngle; - int m_labelsPrecision; bool m_visualsDirty; bool m_labelsDirty; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/qbarmodelmapper.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/qbarmodelmapper.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/qbarmodelmapper.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/qbarmodelmapper.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -38,7 +38,7 @@ /*! \class QBarModelMapper - \inmodule QtCharts + \inmodule Qt Charts \brief The QBarModelMapper class is the base class for model mapper classes. \internal @@ -540,13 +540,6 @@ initializeBarFromModel(); } -QBarSet *qt_allocate_bar_set_cpp(const QString &label) -{ - return new QBarSet(label); -} - -QT_CHARTS_EXPORT QBarSet *(*qt_allocate_bar_set)(const QString &label) = &qt_allocate_bar_set_cpp; - void QBarModelMapperPrivate::initializeBarFromModel() { if (m_model == 0 || m_series == 0) @@ -563,7 +556,7 @@ QModelIndex barIndex = barModelIndex(i, posInBar); // check if there is such model index if (barIndex.isValid()) { - QBarSet *barSet = qt_allocate_bar_set(m_model->headerData(i, m_orientation == Qt::Vertical ? Qt::Horizontal : Qt::Vertical).toString()); + QBarSet *barSet = new QBarSet(m_model->headerData(i, m_orientation == Qt::Vertical ? Qt::Horizontal : Qt::Vertical).toString()); while (barIndex.isValid()) { barSet->append(m_model->data(barIndex, Qt::DisplayRole).toDouble()); posInBar++; @@ -582,7 +575,7 @@ blockSeriesSignals(false); } -QT_CHARTS_END_NAMESPACE - #include "moc_qbarmodelmapper.cpp" #include "moc_qbarmodelmapper_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/qbarmodelmapper.h qtcharts-opensource-src-5.9.5/src/charts/barchart/qbarmodelmapper.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/qbarmodelmapper.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/qbarmodelmapper.h 2018-03-19 05:05:55.000000000 +0000 @@ -47,7 +47,7 @@ Q_OBJECT protected: - explicit QBarModelMapper(QObject *parent = nullptr); + explicit QBarModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/qbarmodelmapper_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/qbarmodelmapper_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/qbarmodelmapper_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/qbarmodelmapper_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,7 +41,6 @@ #include #include -#include QT_BEGIN_NAMESPACE class QModelIndex; @@ -51,7 +50,7 @@ class QBarSet; -class QT_CHARTS_PRIVATE_EXPORT QBarModelMapperPrivate : public QObject +class QBarModelMapperPrivate : public QObject { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/qbarset.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/qbarset.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/qbarset.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/qbarset.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -36,7 +36,7 @@ /*! \class QBarSet - \inmodule QtCharts + \inmodule Qt Charts \brief The QBarSet class represents one set of bars in a bar chart. A bar set contains one data value for each category. The first value of a set is assumed to @@ -756,7 +756,7 @@ return m_values.at(index).y(); } -QT_CHARTS_END_NAMESPACE - #include "moc_qbarset.cpp" #include "moc_qbarset_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/qbarset.h qtcharts-opensource-src-5.9.5/src/charts/barchart/qbarset.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/qbarset.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/qbarset.h 2018-03-19 05:05:55.000000000 +0000 @@ -51,7 +51,7 @@ Q_PROPERTY(QColor labelColor READ labelColor WRITE setLabelColor NOTIFY labelColorChanged) public: - explicit QBarSet(const QString label, QObject *parent = nullptr); + explicit QBarSet(const QString label, QObject *parent = Q_NULLPTR); virtual ~QBarSet(); void setLabel(const QString label); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/qbarset_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/qbarset_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/qbarset_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/qbarset_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,6 @@ #define QBARSET_P_H #include -#include #include #include #include @@ -48,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QBarSetPrivate : public QObject +class QBarSetPrivate : public QObject { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/qhbarmodelmapper.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/qhbarmodelmapper.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/qhbarmodelmapper.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/qhbarmodelmapper.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -33,7 +33,7 @@ /*! \class QHBarModelMapper - \inmodule QtCharts + \inmodule Qt Charts \brief The QHBarModelMapper class is a horizontal model mapper for bar series. Model mappers enable using a data model derived from the QAbstractItemModel class @@ -282,6 +282,6 @@ } } -QT_CHARTS_END_NAMESPACE - #include "moc_qhbarmodelmapper.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/qhbarmodelmapper.h qtcharts-opensource-src-5.9.5/src/charts/barchart/qhbarmodelmapper.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/qhbarmodelmapper.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/qhbarmodelmapper.h 2018-03-19 05:05:55.000000000 +0000 @@ -37,7 +37,7 @@ class QT_CHARTS_EXPORT QHBarModelMapper : public QBarModelMapper { Q_OBJECT - Q_PROPERTY(QtCharts::QAbstractBarSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) + Q_PROPERTY(QAbstractBarSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced) Q_PROPERTY(int firstBarSetRow READ firstBarSetRow WRITE setFirstBarSetRow NOTIFY firstBarSetRowChanged) Q_PROPERTY(int lastBarSetRow READ lastBarSetRow WRITE setLastBarSetRow NOTIFY lastBarSetRowChanged) @@ -45,7 +45,7 @@ Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount NOTIFY columnCountChanged) public: - explicit QHBarModelMapper(QObject *parent = nullptr); + explicit QHBarModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/qvbarmodelmapper.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/qvbarmodelmapper.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/qvbarmodelmapper.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/qvbarmodelmapper.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -33,7 +33,7 @@ /*! \class QVBarModelMapper - \inmodule QtCharts + \inmodule Qt Charts \brief The QVBarModelMapper class is a vertical model mapper for bar series. Model mappers enable using a data model derived from the QAbstractItemModel class @@ -284,6 +284,6 @@ } } -QT_CHARTS_END_NAMESPACE - #include "moc_qvbarmodelmapper.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/qvbarmodelmapper.h qtcharts-opensource-src-5.9.5/src/charts/barchart/qvbarmodelmapper.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/qvbarmodelmapper.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/qvbarmodelmapper.h 2018-03-19 05:05:55.000000000 +0000 @@ -37,7 +37,7 @@ class QT_CHARTS_EXPORT QVBarModelMapper : public QBarModelMapper { Q_OBJECT - Q_PROPERTY(QtCharts::QAbstractBarSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) + Q_PROPERTY(QAbstractBarSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced) Q_PROPERTY(int firstBarSetColumn READ firstBarSetColumn WRITE setFirstBarSetColumn NOTIFY firstBarSetColumnChanged) Q_PROPERTY(int lastBarSetColumn READ lastBarSetColumn WRITE setLastBarSetColumn NOTIFY lastBarSetColumnChanged) @@ -45,7 +45,7 @@ Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged) public: - explicit QVBarModelMapper(QObject *parent = nullptr); + explicit QVBarModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/bar/barchartitem.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/bar/barchartitem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/bar/barchartitem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/bar/barchartitem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -141,6 +141,6 @@ positionLabelsVertical(); } -QT_CHARTS_END_NAMESPACE - #include "moc_barchartitem_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/bar/barchartitem_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/bar/barchartitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/bar/barchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/bar/barchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,11 +43,10 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT BarChartItem : public AbstractBarChartItem +class BarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/bar/qbarseries.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/bar/qbarseries.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/bar/qbarseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/bar/qbarseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -39,7 +39,7 @@ /*! \class QBarSeries - \inmodule QtCharts + \inmodule Qt Charts \brief The QBarSeries class presents a series of data as vertical bars grouped by category. This class draws data as a series of vertical bars grouped by category, with one bar per @@ -128,6 +128,7 @@ QAbstractSeriesPrivate::initializeGraphics(parent); } +#include "moc_qbarseries.cpp" + QT_CHARTS_END_NAMESPACE -#include "moc_qbarseries.cpp" diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/bar/qbarseries.h qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/bar/qbarseries.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/bar/qbarseries.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/bar/qbarseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,7 @@ { Q_OBJECT public: - explicit QBarSeries(QObject *parent = nullptr); + explicit QBarSeries(QObject *parent = Q_NULLPTR); ~QBarSeries(); QAbstractSeries::SeriesType type() const; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/bar/qbarseries_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/bar/qbarseries_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/bar/qbarseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/bar/qbarseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,12 +41,11 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QBarSeriesPrivate(QBarSeries *q); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/percent/percentbarchartitem.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/percent/percentbarchartitem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/percent/percentbarchartitem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/percent/percentbarchartitem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -180,6 +180,6 @@ positionLabelsVertical(); } -QT_CHARTS_END_NAMESPACE - #include "moc_percentbarchartitem_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/percent/percentbarchartitem_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/percent/percentbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/percent/percentbarchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/percent/percentbarchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -42,13 +42,12 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class QAbstractBarSeries; -class QT_CHARTS_PRIVATE_EXPORT PercentBarChartItem : public AbstractBarChartItem +class PercentBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/percent/qpercentbarseries.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/percent/qpercentbarseries.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/percent/qpercentbarseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/percent/qpercentbarseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -38,7 +38,7 @@ /*! \class QPercentBarSeries - \inmodule QtCharts + \inmodule Qt Charts \brief The QPercentBarSeries class presents a series of categorized data as a percentage of each category. @@ -135,6 +135,7 @@ QAbstractSeriesPrivate::initializeGraphics(parent); } +#include "moc_qpercentbarseries.cpp" + QT_CHARTS_END_NAMESPACE -#include "moc_qpercentbarseries.cpp" diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/percent/qpercentbarseries.h qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/percent/qpercentbarseries.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/percent/qpercentbarseries.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/percent/qpercentbarseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,7 +41,7 @@ { Q_OBJECT public: - explicit QPercentBarSeries(QObject *parent = nullptr); + explicit QPercentBarSeries(QObject *parent = Q_NULLPTR); ~QPercentBarSeries(); QAbstractSeries::SeriesType type() const; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/percent/qpercentbarseries_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/percent/qpercentbarseries_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/percent/qpercentbarseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/percent/qpercentbarseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,12 +41,11 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QPercentBarSeriesPrivate(QPercentBarSeries *q); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/stacked/qstackedbarseries.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/stacked/qstackedbarseries.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/stacked/qstackedbarseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/stacked/qstackedbarseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -38,7 +38,7 @@ /*! \class QStackedBarSeries - \inmodule QtCharts + \inmodule Qt Charts \brief The QStackedBarSeries class presents a series of data as vertically stacked bars, with one bar per category. @@ -125,6 +125,7 @@ QAbstractSeriesPrivate::initializeGraphics(parent); } +#include "moc_qstackedbarseries.cpp" + QT_CHARTS_END_NAMESPACE -#include "moc_qstackedbarseries.cpp" diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/stacked/qstackedbarseries.h qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/stacked/qstackedbarseries.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/stacked/qstackedbarseries.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/stacked/qstackedbarseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,7 +41,7 @@ { Q_OBJECT public: - explicit QStackedBarSeries(QObject *parent = nullptr); + explicit QStackedBarSeries(QObject *parent = Q_NULLPTR); ~QStackedBarSeries(); QAbstractSeries::SeriesType type() const; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,12 +41,11 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QStackedBarSeriesPrivate(QStackedBarSeries *q); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -189,6 +189,6 @@ positionLabelsVertical(); } -QT_CHARTS_END_NAMESPACE - #include "moc_stackedbarchartitem_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,11 +43,10 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT StackedBarChartItem : public AbstractBarChartItem +class StackedBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/boxplotchartitem.cpp qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/boxplotchartitem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/boxplotchartitem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/boxplotchartitem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -239,6 +239,6 @@ return changed; } -QT_CHARTS_END_NAMESPACE - #include "moc_boxplotchartitem_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/boxplotchartitem_p.h qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/boxplotchartitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/boxplotchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/boxplotchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -42,7 +42,6 @@ #include #include -#include #include #include #include @@ -52,7 +51,7 @@ class BoxPlotSeriesPrivate; -class QT_CHARTS_PRIVATE_EXPORT BoxPlotChartItem : public ChartItem +class BoxPlotChartItem : public ChartItem { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/boxwhiskers.cpp qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/boxwhiskers.cpp --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/boxwhiskers.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/boxwhiskers.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -218,6 +218,6 @@ m_boundingRect.adjust(-extra, -extra, extra, extra); } -QT_CHARTS_END_NAMESPACE - #include "moc_boxwhiskers_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/boxwhiskersdata_p.h qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/boxwhiskersdata_p.h --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/boxwhiskersdata_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/boxwhiskersdata_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,12 +40,11 @@ #define BOXWHISKERSDATA_P_H #include -#include #include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT BoxWhiskersData +class BoxWhiskersData { public: BoxWhiskersData() : diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/boxwhiskers_p.h qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/boxwhiskers_p.h --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/boxwhiskers_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/boxwhiskers_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,7 +41,6 @@ #include #include -#include #include #include #include @@ -53,7 +52,7 @@ class QBarSet; -class QT_CHARTS_PRIVATE_EXPORT BoxWhiskers : public QGraphicsObject +class BoxWhiskers : public QGraphicsObject { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxplotmodelmapper.cpp qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxplotmodelmapper.cpp --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxplotmodelmapper.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxplotmodelmapper.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -38,7 +38,7 @@ /*! \class QBoxPlotModelMapper - \inmodule QtCharts + \inmodule Qt Charts \brief The QBoxPlotModelMapper class is the base class for box plot model mapper classes. \internal @@ -503,7 +503,8 @@ blockSeriesSignals(false); } -QT_CHARTS_END_NAMESPACE - #include "moc_qboxplotmodelmapper.cpp" #include "moc_qboxplotmodelmapper_p.cpp" + +QT_CHARTS_END_NAMESPACE + diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxplotmodelmapper.h qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxplotmodelmapper.h --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxplotmodelmapper.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxplotmodelmapper.h 2018-03-19 05:05:55.000000000 +0000 @@ -47,7 +47,7 @@ Q_OBJECT protected: - explicit QBoxPlotModelMapper(QObject *parent = nullptr); + explicit QBoxPlotModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxplotmodelmapper_p.h qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxplotmodelmapper_p.h --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxplotmodelmapper_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxplotmodelmapper_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,7 +41,6 @@ #include #include -#include QT_BEGIN_NAMESPACE class QModelIndex; @@ -49,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QBoxSet; +class QBoxSet; class QBoxPlotModelMapperPrivate : public QObject { diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxplotseries.cpp qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxplotseries.cpp --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxplotseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxplotseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -45,7 +45,7 @@ /*! \class QBoxPlotSeries - \inmodule QtCharts + \inmodule Qt Charts \brief The QBoxPlotSeries class presents data in box-and-whiskers charts. A box plot series acts as a container for box-and-whiskers items. Items from multiple series @@ -718,7 +718,8 @@ return max; } -QT_CHARTS_END_NAMESPACE - #include "moc_qboxplotseries.cpp" #include "moc_qboxplotseries_p.cpp" + +QT_CHARTS_END_NAMESPACE + diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxplotseries.h qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxplotseries.h --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxplotseries.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxplotseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -47,7 +47,7 @@ Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged) Q_PROPERTY(int count READ count NOTIFY countChanged REVISION 1) public: - explicit QBoxPlotSeries(QObject *parent = nullptr); + explicit QBoxPlotSeries(QObject *parent = Q_NULLPTR); ~QBoxPlotSeries(); bool append(QBoxSet *box); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxplotseries_p.h qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxplotseries_p.h --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxplotseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxplotseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,13 +43,12 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class BoxPlotAnimation; -class QT_CHARTS_PRIVATE_EXPORT QBoxPlotSeriesPrivate : public QAbstractSeriesPrivate +class QBoxPlotSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxset.cpp qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxset.cpp --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxset.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxset.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -35,7 +35,7 @@ /*! \class QBoxSet - \inmodule QtCharts + \inmodule Qt Charts \brief The QBoxSet class represents one item in a box-and-whiskers chart. A box-and-whiskers item is a graphical representation of a range and three median values @@ -368,7 +368,7 @@ return m_values[index]; } -QT_CHARTS_END_NAMESPACE - #include "moc_qboxset.cpp" #include "moc_qboxset_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxset.h qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxset.h --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxset.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxset.h 2018-03-19 05:05:55.000000000 +0000 @@ -54,8 +54,8 @@ }; public: - explicit QBoxSet(const QString label = QString(), QObject *parent = nullptr); - explicit QBoxSet(const qreal le, const qreal lq, const qreal m, const qreal uq, const qreal ue, const QString label = QString(), QObject *parent = nullptr); + explicit QBoxSet(const QString label = QString(), QObject *parent = Q_NULLPTR); + explicit QBoxSet(const qreal le, const qreal lq, const qreal m, const qreal uq, const qreal ue, const QString label = QString(), QObject *parent = Q_NULLPTR); virtual ~QBoxSet(); void append(const qreal value); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxset_p.h qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxset_p.h --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qboxset_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qboxset_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,6 @@ #define QBOXSET_P_H #include -#include #include #include #include @@ -50,7 +49,7 @@ class QBoxPlotSeriesPrivate; -class QT_CHARTS_PRIVATE_EXPORT QBoxSetPrivate : public QObject +class QBoxSetPrivate : public QObject { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qhboxplotmodelmapper.cpp qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qhboxplotmodelmapper.cpp --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qhboxplotmodelmapper.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qhboxplotmodelmapper.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -34,7 +34,7 @@ /*! \class QHBoxPlotModelMapper - \inmodule QtCharts + \inmodule Qt Charts \brief The QHBoxPlotModelMapper class is a horizontal model mapper for box plot series. @@ -298,6 +298,7 @@ } } +#include "moc_qhboxplotmodelmapper.cpp" + QT_CHARTS_END_NAMESPACE -#include "moc_qhboxplotmodelmapper.cpp" diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qhboxplotmodelmapper.h qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qhboxplotmodelmapper.h --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qhboxplotmodelmapper.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qhboxplotmodelmapper.h 2018-03-19 05:05:55.000000000 +0000 @@ -38,7 +38,7 @@ class QT_CHARTS_EXPORT QHBoxPlotModelMapper : public QBoxPlotModelMapper { Q_OBJECT - Q_PROPERTY(QtCharts::QBoxPlotSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) + Q_PROPERTY(QBoxPlotSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced) Q_PROPERTY(int firstBoxSetRow READ firstBoxSetRow WRITE setFirstBoxSetRow NOTIFY firstBoxSetRowChanged) Q_PROPERTY(int lastBoxSetRow READ lastBoxSetRow WRITE setLastBoxSetRow NOTIFY lastBoxSetRowChanged) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qvboxplotmodelmapper.cpp qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qvboxplotmodelmapper.cpp --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qvboxplotmodelmapper.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qvboxplotmodelmapper.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -33,7 +33,7 @@ /*! \class QVBoxPlotModelMapper - \inmodule QtCharts + \inmodule Qt Charts \brief The QVBoxPlotModelMapper is a vertical model mapper for box plot series. @@ -300,6 +300,7 @@ } } +#include "moc_qvboxplotmodelmapper.cpp" + QT_CHARTS_END_NAMESPACE -#include "moc_qvboxplotmodelmapper.cpp" diff -Nru qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qvboxplotmodelmapper.h qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qvboxplotmodelmapper.h --- qtcharts-opensource-src-5.12.5/src/charts/boxplotchart/qvboxplotmodelmapper.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/boxplotchart/qvboxplotmodelmapper.h 2018-03-19 05:05:55.000000000 +0000 @@ -37,7 +37,7 @@ class QT_CHARTS_EXPORT QVBoxPlotModelMapper : public QBoxPlotModelMapper { Q_OBJECT - Q_PROPERTY(QtCharts::QBoxPlotSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) + Q_PROPERTY(QBoxPlotSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced) Q_PROPERTY(int firstBoxSetColumn READ firstBoxSetColumn WRITE setFirstBoxSetColumn NOTIFY firstBoxSetColumnChanged) Q_PROPERTY(int lastBoxSetColumn READ lastBoxSetColumn WRITE setLastBoxSetColumn NOTIFY lastBoxSetColumnChanged) @@ -45,7 +45,7 @@ Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged) public: - explicit QVBoxPlotModelMapper(QObject *parent = nullptr); + explicit QVBoxPlotModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/candlestickchartitem.cpp qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/candlestickchartitem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/candlestickchartitem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/candlestickchartitem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -343,6 +343,6 @@ m_timePeriod = timePeriod; } -QT_CHARTS_END_NAMESPACE - #include "moc_candlestickchartitem_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/candlestickchartitem_p.h qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/candlestickchartitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/candlestickchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/candlestickchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,6 @@ #define CANDLESTICKCHARTITEM_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE @@ -49,7 +48,7 @@ class QCandlestickSeries; class QCandlestickSet; -class QT_CHARTS_PRIVATE_EXPORT CandlestickChartItem : public ChartItem +class CandlestickChartItem : public ChartItem { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/candlestick.cpp qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/candlestick.cpp --- qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/candlestick.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/candlestick.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -346,6 +346,6 @@ m_boundingRect.adjust(-extra, -extra, extra, extra); } -QT_CHARTS_END_NAMESPACE - #include "moc_candlestick_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/candlestickdata_p.h qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/candlestickdata_p.h --- qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/candlestickdata_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/candlestickdata_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,11 +40,10 @@ #define CANDLESTICKDATA_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT CandlestickData +class CandlestickData { public: CandlestickData() : diff -Nru qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/candlestick_p.h qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/candlestick_p.h --- qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/candlestick_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/candlestick_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -44,14 +44,13 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class AbstractDomain; class QCandlestickSet; -class QT_CHARTS_PRIVATE_EXPORT Candlestick : public QGraphicsObject +class Candlestick : public QGraphicsObject { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qcandlestickmodelmapper.cpp qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qcandlestickmodelmapper.cpp --- qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qcandlestickmodelmapper.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qcandlestickmodelmapper.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -38,7 +38,7 @@ /*! \class QCandlestickModelMapper \since 5.8 - \inmodule QtCharts + \inmodule Qt Charts \brief Abstract model mapper class for candlestick series. Model mappers allow the use of a QAbstractItemModel-derived model as a data source for a chart @@ -700,7 +700,7 @@ m_seriesSignalsBlock = block; } -QT_CHARTS_END_NAMESPACE - #include "moc_qcandlestickmodelmapper.cpp" #include "moc_qcandlestickmodelmapper_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qcandlestickmodelmapper.h qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qcandlestickmodelmapper.h --- qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qcandlestickmodelmapper.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qcandlestickmodelmapper.h 2018-03-19 05:05:55.000000000 +0000 @@ -46,7 +46,7 @@ { Q_OBJECT Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced) - Q_PROPERTY(QtCharts::QCandlestickSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) + Q_PROPERTY(QCandlestickSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) public: explicit QCandlestickModelMapper(QObject *parent = nullptr); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qcandlestickmodelmapper_p.h qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qcandlestickmodelmapper_p.h --- qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qcandlestickmodelmapper_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qcandlestickmodelmapper_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,6 @@ #define QCANDLESTICKMODELMAPPER_P_H #include -#include #include QT_BEGIN_NAMESPACE @@ -51,7 +50,7 @@ class QCandlestickSet; -class QT_CHARTS_PRIVATE_EXPORT QCandlestickModelMapperPrivate : public QObject +class QCandlestickModelMapperPrivate : public QObject { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qcandlestickseries.cpp qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qcandlestickseries.cpp --- qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qcandlestickseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qcandlestickseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -46,7 +46,7 @@ /*! \class QCandlestickSeries \since 5.8 - \inmodule QtCharts + \inmodule Qt Charts \brief The QCandlestickSeries class presents data as candlesticks. This class acts as a container for single candlestick items. Each item is drawn to its own category @@ -553,7 +553,7 @@ emit candlestickSetsRemoved(sets); emit countChanged(); foreach (QCandlestickSet *set, sets) - delete set; + set->deleteLater(); } return success; @@ -630,7 +630,7 @@ emit candlestickSetsRemoved(sets); emit countChanged(); foreach (QCandlestickSet *set, sets) - delete set; + set->deleteLater(); } } @@ -931,7 +931,6 @@ QCandlestickSeriesPrivate::~QCandlestickSeriesPrivate() { disconnect(this, 0, 0, 0); - qDeleteAll(m_sets); } void QCandlestickSeriesPrivate::initializeDomain() @@ -1155,7 +1154,7 @@ } } -QT_CHARTS_END_NAMESPACE - #include "moc_qcandlestickseries.cpp" #include "moc_qcandlestickseries_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qcandlestickseries_p.h qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qcandlestickseries_p.h --- qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qcandlestickseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qcandlestickseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,6 @@ #define QCANDLESTICKSERIES_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE @@ -50,7 +49,7 @@ class QCandlestickSet; class QDateTimeAxis; -class QT_CHARTS_PRIVATE_EXPORT QCandlestickSeriesPrivate : public QAbstractSeriesPrivate +class QCandlestickSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qcandlestickset.cpp qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qcandlestickset.cpp --- qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qcandlestickset.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qcandlestickset.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -35,7 +35,7 @@ /*! \class QCandlestickSet \since 5.8 - \inmodule QtCharts + \inmodule Qt Charts \brief The QCandlestickSet class represents a single candlestick item in a candlestick chart. @@ -447,7 +447,7 @@ return true; } -QT_CHARTS_END_NAMESPACE - #include "moc_qcandlestickset.cpp" #include "moc_qcandlestickset_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qcandlestickset_p.h qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qcandlestickset_p.h --- qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qcandlestickset_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qcandlestickset_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,6 @@ #define QCANDLESTICKSET_P_H #include -#include #include #include @@ -49,7 +48,7 @@ class QCandlestickSeriesPrivate; class QCandlestickSet; -class QT_CHARTS_PRIVATE_EXPORT QCandlestickSetPrivate : public QObject +class QCandlestickSetPrivate : public QObject { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qhcandlestickmodelmapper.cpp qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qhcandlestickmodelmapper.cpp --- qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qhcandlestickmodelmapper.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qhcandlestickmodelmapper.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -35,7 +35,7 @@ /*! \class QHCandlestickModelMapper \since 5.8 - \inmodule QtCharts + \inmodule Qt Charts \brief The QHCandlestickModelMapper class is a horizontal model mapper for a candlestick series. Model mappers enable using a data model derived from the QAbstractItemModel class @@ -348,6 +348,6 @@ return QCandlestickModelMapper::lastSetSection(); } -QT_CHARTS_END_NAMESPACE - #include "moc_qhcandlestickmodelmapper.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qvcandlestickmodelmapper.cpp qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qvcandlestickmodelmapper.cpp --- qtcharts-opensource-src-5.12.5/src/charts/candlestickchart/qvcandlestickmodelmapper.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/candlestickchart/qvcandlestickmodelmapper.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -35,7 +35,7 @@ /*! \class QVCandlestickModelMapper \since 5.8 - \inmodule QtCharts + \inmodule Qt Charts \brief The QVCandlestickModelMapper class is a vertical model mapper for a candlestick series. Model mappers enable using a data model derived from the QAbstractItemModel class @@ -349,6 +349,6 @@ return QCandlestickModelMapper::lastSetSection(); } -QT_CHARTS_END_NAMESPACE - #include "moc_qvcandlestickmodelmapper.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/chartbackground_p.h qtcharts-opensource-src-5.9.5/src/charts/chartbackground_p.h --- qtcharts-opensource-src-5.12.5/src/charts/chartbackground_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/chartbackground_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,7 +41,6 @@ #include #include -#include QT_BEGIN_NAMESPACE class QGraphicsDropShadowEffect; @@ -49,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartBackground: public QGraphicsRectItem +class ChartBackground: public QGraphicsRectItem { public: ChartBackground(QGraphicsItem *parent = 0); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/chartconfig_p.h qtcharts-opensource-src-5.9.5/src/charts/chartconfig_p.h --- qtcharts-opensource-src-5.12.5/src/charts/chartconfig_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/chartconfig_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,11 +40,10 @@ #define CHARTCONFIG_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartConfig +class ChartConfig { private: ChartConfig() { diff -Nru qtcharts-opensource-src-5.12.5/src/charts/chartdataset.cpp qtcharts-opensource-src-5.9.5/src/charts/chartdataset.cpp --- qtcharts-opensource-src-5.12.5/src/charts/chartdataset.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/chartdataset.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -421,7 +421,7 @@ { foreach (QAbstractSeries *s , m_seriesList){ removeSeries(s); - delete s; + s->deleteLater(); } Q_ASSERT(m_seriesList.count() == 0); } @@ -430,7 +430,7 @@ { foreach (QAbstractAxis *a , m_axisList){ removeAxis(a); - delete a; + a->deleteLater(); } Q_ASSERT(m_axisList.count() == 0); } @@ -661,6 +661,6 @@ m_glXYSeriesDataManager->handleAxisReverseChanged(axis->d_ptr->m_series); } -QT_CHARTS_END_NAMESPACE - #include "moc_chartdataset_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/chartdataset_p.h qtcharts-opensource-src-5.9.5/src/charts/chartdataset_p.h --- qtcharts-opensource-src-5.12.5/src/charts/chartdataset_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/chartdataset_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -42,7 +42,6 @@ #include #include #include -#include #include QT_CHARTS_BEGIN_NAMESPACE @@ -51,7 +50,7 @@ class ChartPresenter; class GLXYSeriesDataManager; -class QT_CHARTS_PRIVATE_EXPORT ChartDataSet : public QObject +class Q_AUTOTEST_EXPORT ChartDataSet : public QObject { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/chartelement_p.h qtcharts-opensource-src-5.9.5/src/charts/chartelement_p.h --- qtcharts-opensource-src-5.12.5/src/charts/chartelement_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/chartelement_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,7 +43,6 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE @@ -54,7 +53,7 @@ class AbstractDomain; class ChartDataSet; -class QT_CHARTS_PRIVATE_EXPORT ChartElement: public QGraphicsObject +class ChartElement: public QGraphicsObject { public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/chartitem.cpp qtcharts-opensource-src-5.9.5/src/charts/chartitem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/chartitem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/chartitem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -57,6 +57,6 @@ qWarning() << __FUNCTION__<< "Slot not implemented"; } -QT_CHARTS_END_NAMESPACE - #include "moc_chartitem_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/chartitem_p.h qtcharts-opensource-src-5.9.5/src/charts/chartitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/chartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/chartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,12 +41,11 @@ #include #include -#include #include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartItem : public ChartElement +class ChartItem : public ChartElement { Q_OBJECT enum ChartItemTypes { AXIS_ITEM = UserType + 1, XYLINE_ITEM }; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/chartpresenter.cpp qtcharts-opensource-src-5.9.5/src/charts/chartpresenter.cpp --- qtcharts-opensource-src-5.12.5/src/charts/chartpresenter.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/chartpresenter.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -79,49 +78,25 @@ #endif } -void ChartPresenter::setFixedGeometry(const QRectF &rect) -{ - if (rect == m_fixedRect) - return; - const bool isSame = m_fixedRect == m_rect; - m_fixedRect = rect; - if (m_fixedRect.isNull()) { - // Update to the latest geometry properly if changed - if (!isSame) { - updateGeometry(m_rect); - m_layout->updateGeometry(); - } - } else { - updateGeometry(m_fixedRect); - } -} - void ChartPresenter::setGeometry(const QRectF rect) { if (m_rect != rect) { m_rect = rect; - if (!m_fixedRect.isNull()) - return; - updateGeometry(rect); - } -} - -void ChartPresenter::updateGeometry(const QRectF &rect) -{ - foreach (ChartItem *chart, m_chartItems) { - chart->domain()->setSize(rect.size()); - chart->setPos(rect.topLeft()); - } + foreach (ChartItem *chart, m_chartItems) { + chart->domain()->setSize(rect.size()); + chart->setPos(rect.topLeft()); + } #ifndef QT_NO_OPENGL - if (!m_glWidget.isNull()) - m_glWidget->setGeometry(rect.toRect()); + if (!m_glWidget.isNull()) + m_glWidget->setGeometry(m_rect.toRect()); #endif - emit plotAreaChanged(rect); + emit plotAreaChanged(m_rect); + } } QRectF ChartPresenter::geometry() const { - return m_fixedRect.isNull() ? m_rect : m_fixedRect; + return m_rect; } void ChartPresenter::handleAxisAdded(QAbstractAxis *axis) @@ -159,8 +134,8 @@ chart->setPresenter(this); chart->setThemeManager(m_chart->d_ptr->m_themeManager); chart->setDataSet(m_chart->d_ptr->m_dataset); - chart->domain()->setSize(geometry().size()); - chart->setPos(geometry().topLeft()); + chart->domain()->setSize(m_rect.size()); + chart->setPos(m_rect.topLeft()); chart->handleDomainUpdated(); //this could be moved to intializeGraphics when animator is refactored m_chartItems< testStrings(text.length()); int count(0); @@ -527,7 +502,7 @@ if (lastChar == closeTag) chopIndex = truncatedString.lastIndexOf(openTag); else if (lastChar == semiColon) - chopIndex = truncatedString.indexOf(truncateMatcher); + chopIndex = truncateMatcher.indexIn(truncatedString, 0); if (chopIndex != -1) chopCount = truncatedString.length() - chopIndex; @@ -601,7 +576,7 @@ QGraphicsView *firstView = views.at(0); m_glWidget = new GLWidget(m_chart->d_ptr->m_dataset->glXYSeriesDataManager(), m_chart, firstView); - m_glWidget->setGeometry(geometry().toRect()); + m_glWidget->setGeometry(m_rect.toRect()); m_glWidget->show(); } } @@ -611,6 +586,6 @@ #endif } -QT_CHARTS_END_NAMESPACE - #include "moc_chartpresenter_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/chartpresenter_p.h qtcharts-opensource-src-5.9.5/src/charts/chartpresenter_p.h --- qtcharts-opensource-src-5.12.5/src/charts/chartpresenter_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/chartpresenter_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,7 +41,6 @@ #include #include //because of QChart::ChartThemeId -#include #include #include #include @@ -63,7 +62,7 @@ class ChartAnimation; class AbstractChartLayout; -class QT_CHARTS_PRIVATE_EXPORT ChartPresenter: public QObject +class ChartPresenter: public QObject { Q_OBJECT public: @@ -98,11 +97,9 @@ ChartPresenter(QChart *chart, QChart::ChartType type); virtual ~ChartPresenter(); - bool isFixedGeometry() const { return !m_fixedRect.isNull(); } - void setFixedGeometry(const QRectF &rect); + void setGeometry(QRectF rect); QRectF geometry() const; - void updateGeometry(const QRectF &rect); QGraphicsItem *rootItem(){ return m_chart; } ChartBackground *backgroundElement(); @@ -217,7 +214,6 @@ QPointer m_glWidget; #endif bool m_glUseWidget; - QRectF m_fixedRect; }; QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/charts.pro qtcharts-opensource-src-5.9.5/src/charts/charts.pro --- qtcharts-opensource-src-5.12.5/src/charts/charts.pro 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/charts.pro 2018-03-19 05:05:55.000000000 +0000 @@ -41,8 +41,7 @@ $$PWD/scroller_p.h \ $$PWD/qabstractseries_p.h \ $$PWD/charttitle_p.h \ - $$PWD/charthelpers_p.h \ - $$PWD/qchartglobal_p.h + $$PWD/charthelpers_p.h contains(QT_CONFIG, opengl): PRIVATE_HEADERS += $$PWD/glwidget_p.h @@ -84,7 +83,7 @@ QMAKE_CXXFLAGS_WARN_ON += -wd4267 } -win32:!winrt { +win32:!winrt:!wince { # ChartThemeSystem uses Windows native API LIBS += -luser32 } diff -Nru qtcharts-opensource-src-5.12.5/src/charts/chartthememanager.cpp qtcharts-opensource-src-5.9.5/src/charts/chartthememanager.cpp --- qtcharts-opensource-src-5.12.5/src/charts/chartthememanager.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/chartthememanager.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -28,6 +28,7 @@ ****************************************************************************/ #include #include +#include //themes #include #include @@ -44,6 +45,7 @@ ChartThemeManager::ChartThemeManager(QChart* chart) : m_chart(chart) { + qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); } @@ -251,6 +253,6 @@ return colorAt(prev.second, next.second, relativePos); } -QT_CHARTS_END_NAMESPACE - #include "moc_chartthememanager_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/chartthememanager_p.h qtcharts-opensource-src-5.9.5/src/charts/chartthememanager_p.h --- qtcharts-opensource-src-5.12.5/src/charts/chartthememanager_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/chartthememanager_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,12 +43,11 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class ChartTheme; -class QT_CHARTS_PRIVATE_EXPORT ChartThemeManager: public QObject +class ChartThemeManager: public QObject { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/charttitle_p.h qtcharts-opensource-src-5.9.5/src/charts/charttitle_p.h --- qtcharts-opensource-src-5.12.5/src/charts/charttitle_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/charttitle_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,11 +41,10 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartTitle : public QGraphicsTextItem +class ChartTitle : public QGraphicsTextItem { public: ChartTitle(QGraphicsItem *parent = 0); Binary files /tmp/tmppAbbJ4/lMlNW70gkb/qtcharts-opensource-src-5.12.5/src/charts/doc/images/examples_chartthemes_blue_cerulean.png and /tmp/tmppAbbJ4/PxGBf8QezN/qtcharts-opensource-src-5.9.5/src/charts/doc/images/examples_chartthemes_blue_cerulean.png differ Binary files /tmp/tmppAbbJ4/lMlNW70gkb/qtcharts-opensource-src-5.12.5/src/charts/doc/images/examples_chartthemes_brown_sand.png and /tmp/tmppAbbJ4/PxGBf8QezN/qtcharts-opensource-src-5.9.5/src/charts/doc/images/examples_chartthemes_brown_sand.png differ Binary files /tmp/tmppAbbJ4/lMlNW70gkb/qtcharts-opensource-src-5.12.5/src/charts/doc/images/examples_chartthemes_light.png and /tmp/tmppAbbJ4/PxGBf8QezN/qtcharts-opensource-src-5.9.5/src/charts/doc/images/examples_chartthemes_light.png differ Binary files /tmp/tmppAbbJ4/lMlNW70gkb/qtcharts-opensource-src-5.12.5/src/charts/doc/images/examples_qmlchart10.png and /tmp/tmppAbbJ4/PxGBf8QezN/qtcharts-opensource-src-5.9.5/src/charts/doc/images/examples_qmlchart10.png differ Binary files /tmp/tmppAbbJ4/lMlNW70gkb/qtcharts-opensource-src-5.12.5/src/charts/doc/images/examples_qmlchart11.png and /tmp/tmppAbbJ4/PxGBf8QezN/qtcharts-opensource-src-5.9.5/src/charts/doc/images/examples_qmlchart11.png differ Binary files /tmp/tmppAbbJ4/lMlNW70gkb/qtcharts-opensource-src-5.12.5/src/charts/doc/images/examples_qmlchart12.png and /tmp/tmppAbbJ4/PxGBf8QezN/qtcharts-opensource-src-5.9.5/src/charts/doc/images/examples_qmlchart12.png differ Binary files /tmp/tmppAbbJ4/lMlNW70gkb/qtcharts-opensource-src-5.12.5/src/charts/doc/images/examples_qmlchart1.png and /tmp/tmppAbbJ4/PxGBf8QezN/qtcharts-opensource-src-5.9.5/src/charts/doc/images/examples_qmlchart1.png differ Binary files /tmp/tmppAbbJ4/lMlNW70gkb/qtcharts-opensource-src-5.12.5/src/charts/doc/images/examples_qmlchart2.png and /tmp/tmppAbbJ4/PxGBf8QezN/qtcharts-opensource-src-5.9.5/src/charts/doc/images/examples_qmlchart2.png differ Binary files /tmp/tmppAbbJ4/lMlNW70gkb/qtcharts-opensource-src-5.12.5/src/charts/doc/images/examples_qmlchart3.png and /tmp/tmppAbbJ4/PxGBf8QezN/qtcharts-opensource-src-5.9.5/src/charts/doc/images/examples_qmlchart3.png differ Binary files /tmp/tmppAbbJ4/lMlNW70gkb/qtcharts-opensource-src-5.12.5/src/charts/doc/images/examples_qmlchart4.png and /tmp/tmppAbbJ4/PxGBf8QezN/qtcharts-opensource-src-5.9.5/src/charts/doc/images/examples_qmlchart4.png differ Binary files /tmp/tmppAbbJ4/lMlNW70gkb/qtcharts-opensource-src-5.12.5/src/charts/doc/images/examples_qmlchart5.png and /tmp/tmppAbbJ4/PxGBf8QezN/qtcharts-opensource-src-5.9.5/src/charts/doc/images/examples_qmlchart5.png differ Binary files /tmp/tmppAbbJ4/lMlNW70gkb/qtcharts-opensource-src-5.12.5/src/charts/doc/images/examples_qmlchart6.png and /tmp/tmppAbbJ4/PxGBf8QezN/qtcharts-opensource-src-5.9.5/src/charts/doc/images/examples_qmlchart6.png differ Binary files /tmp/tmppAbbJ4/lMlNW70gkb/qtcharts-opensource-src-5.12.5/src/charts/doc/images/examples_qmlchart7.png and /tmp/tmppAbbJ4/PxGBf8QezN/qtcharts-opensource-src-5.9.5/src/charts/doc/images/examples_qmlchart7.png differ Binary files /tmp/tmppAbbJ4/lMlNW70gkb/qtcharts-opensource-src-5.12.5/src/charts/doc/images/examples_qmlchart8.png and /tmp/tmppAbbJ4/PxGBf8QezN/qtcharts-opensource-src-5.9.5/src/charts/doc/images/examples_qmlchart8.png differ Binary files /tmp/tmppAbbJ4/lMlNW70gkb/qtcharts-opensource-src-5.12.5/src/charts/doc/images/examples_qmlchart9.png and /tmp/tmppAbbJ4/PxGBf8QezN/qtcharts-opensource-src-5.9.5/src/charts/doc/images/examples_qmlchart9.png differ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/qtcharts.qdocconf qtcharts-opensource-src-5.9.5/src/charts/doc/qtcharts.qdocconf --- qtcharts-opensource-src-5.12.5/src/charts/doc/qtcharts.qdocconf 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/qtcharts.qdocconf 2018-03-19 05:05:55.000000000 +0000 @@ -3,7 +3,6 @@ project = QtCharts description = Qt Charts Reference Documentation version = $QT_VERSION -buildversion = Qt Charts | Commercial or GPLv3 sourcedirs += .. \ ../../chartsqml2 @@ -34,7 +33,12 @@ qhp.QtCharts.customFilters.Qt.name = QtCharts $QT_VERSION qhp.QtCharts.customFilters.Qt.filterAttributes = qtcharts $QT_VERSION -qhp.QtCharts.subprojects = classes types examples +qhp.QtCharts.subprojects = gettingstarted classes types examples + +qhp.QtCharts.subprojects.gettingstarted.title = Getting Started +qhp.QtCharts.subprojects.gettingstarted.indexTitle = Qt Charts Getting Started +qhp.QtCharts.subprojects.gettingstarted.selectors = fake:page +qhp.QtCharts.subprojects.gettingstarted.sortPages = true qhp.QtCharts.subprojects.classes.title = C++ Classes qhp.QtCharts.subprojects.classes.indexTitle = Qt Charts C++ Classes @@ -55,5 +59,4 @@ navigation.cppclassespage = Qt Charts C++ Classes navigation.qmltypespage = Qt Charts QML Types -manifestmeta.highlighted.names = "QtCharts/Chart Themes Example" \ - "QtCharts/Qml Charts Example" +manifestmeta.highlighted.names += "QtCharts/Chart Themes Example" diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/snippets/doc_src_qmlcharts.cpp qtcharts-opensource-src-5.9.5/src/charts/doc/snippets/doc_src_qmlcharts.cpp --- qtcharts-opensource-src-5.12.5/src/charts/doc/snippets/doc_src_qmlcharts.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/snippets/doc_src_qmlcharts.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -28,5 +28,5 @@ ****************************************************************************/ //! [0] -import QtCharts 2.3 +import QtCharts 2.2 //! [0] diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/snippets/doc_src_qtcharts.cpp qtcharts-opensource-src-5.9.5/src/charts/doc/snippets/doc_src_qtcharts.cpp --- qtcharts-opensource-src-5.12.5/src/charts/doc/snippets/doc_src_qtcharts.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/snippets/doc_src_qtcharts.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -44,12 +44,3 @@ make ./qmlpolarchart //! [2] - -//! [3] -QLineSeries* series = new QLineSeries(); -series->append(0, 6); -series->append(2, 4); -... -chartView->chart()->addSeries(series); -chartView->chart()->createDefaultAxes(); -//! [3] diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-areachart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-areachart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-areachart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-areachart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-audio.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-audio.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-audio.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-audio.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-barchart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-barchart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-barchart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-barchart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -57,11 +59,10 @@ \snippet barchart/main.cpp 3 - To have categories displayed on axis, we need to create a QBarCategoryAxis - for that. Here we create a category axis with a list of categories and - set it to be aligned to the bottom, acting as the x-axis, and attach it to - the series. The chart takes ownership of the axis. For y-axis we use a - value axis, aligned to the left-hand side. + To have categories displayed on axis, we need to create a QBarCategoryAxis for that. Here we create a category axis with a list of categories and + set it to be the x-axis of the chart. The chart takes ownership of axis. For y-axis we use default axis, which is created and scaled to series data + by calling createDefaultAxes of the chart. Note that the call for createDefaultAxes must be before we set the category axis. Otherwise the default axis will + override the category axis. \snippet barchart/main.cpp 4 diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-barmodelmapper.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-barmodelmapper.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-barmodelmapper.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-barmodelmapper.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-boxplotchart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-boxplotchart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-boxplotchart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-boxplotchart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-callout.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-callout.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-callout.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-callout.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-candlestickchart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-candlestickchart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-candlestickchart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-candlestickchart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-chartthemes.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-chartthemes.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-chartthemes.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-chartthemes.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -32,76 +34,13 @@ \brief The example shows the look and feel of the different built-in themes. - This example shows the look and feel of the different built-in themes for some of the supported - chart types. + This example shows the look and feel of the different built-in themes for all supported chart + types. In order to give the result a more harmonious look, the background palette of the + application is customized to the theme selected. \image examples_chartthemes_light.png \image examples_chartthemes_brown_sand.png \image examples_chartthemes_blue_cerulean.png \include examples-run.qdocinc - - \section1 Creating Charts - - The charts of different types are generated and added to the layout separately. For example, the - line chart is created as follows. The creation of other chart types is similar. - - First a chart is created. - - \snippet chartthemes/themewidget.cpp 1 - - A common set of random data is generated and placed in a list. This list is used in each chart - type to add data to the series of the chart. For the line series, QLineSeries instances are - created and added to the chart. - - \snippet chartthemes/themewidget.cpp 2 - - Default axes are created for the line series. We also specify ranges for the axes based on the - range of the data used for the series. - - \snippet chartthemes/themewidget.cpp 3 - - We also want to add more space between the labels and the y-axes. For this we specify a label - format that adds space characters to the labels. - - \snippet chartthemes/themewidget.cpp 4 - - Finally the line chart is added to the grid layout. - - \snippet chartthemes/themewidget.cpp 5 - - \section1 Changing Theme - - The user can select a built-in theme to be used in the example. This theme is then applied to - all charts in the layout. - - \snippet chartthemes/themewidget.cpp 6 - - \snippet chartthemes/themewidget.cpp 7 - - In order to give the result a more harmonious look, the background palette of the application is - customized to match the selected theme. The QPalette::Window and QPalette::WindowText roles are - set based on the selected theme. - - \snippet chartthemes/themewidget.cpp 8 - - \section1 Changing Animation, Legend and Anti-Aliasing - - In this example, it is also possible to see how changing animation, legend and anti-aliasing - affects the appearance of the chart. - - Based on the user's selection, the used animation type is set on each chart. It is possible to have - no animations in the chart, or have animations for grid axis or series, or both. - - \snippet chartthemes/themewidget.cpp 9 - - The chart can be shown with a legend. The legend can be aligned to different sides of the chart. - - \snippet chartthemes/themewidget.cpp 10 - - The user can also see how changing anti-aliasing option changes the appearance of the chart. - Anti-aliasing is updated based on the user's selection. - - \snippet chartthemes/themewidget.cpp 11 - */ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-customchart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-customchart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-customchart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-customchart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-datetimeaxis.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-datetimeaxis.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-datetimeaxis.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-datetimeaxis.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-donutbreakdown.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-donutbreakdown.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-donutbreakdown.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-donutbreakdown.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-donutchart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-donutchart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-donutchart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-donutchart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-dynamicspline.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-dynamicspline.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-dynamicspline.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-dynamicspline.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-horizontalbarchart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-horizontalbarchart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-horizontalbarchart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-horizontalbarchart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -58,11 +60,10 @@ \snippet horizontalbarchart/main.cpp 3 - To have categories displayed on axis, we need to create a QBarCategoryAxis - for that. Here we create a category axis with a list of categories and - set it to be aligned to the left-hand side, acting as the y-axis, and - attach it to the series. The chart takes ownership of the axis. For x-axis - we use a value axis, aligned to the bottom. + To have the categories displayed on axis, we need to create a QBarCategoryAxis. Here we create a category axis with a list of categories and + set it to be the y-axis of the chart. The chart takes ownership of axis. For the x-axis we use the default axis, which is created and scaled to series data + by calling createDefaultAxes of the chart. Note that the call for createDefaultAxes must be done before we set the category axis. Otherwise the default axis will + override the category axis. \snippet horizontalbarchart/main.cpp 4 diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-horizontalpercentbarchart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-horizontalpercentbarchart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-horizontalpercentbarchart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-horizontalpercentbarchart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -63,11 +65,10 @@ \snippet horizontalpercentbarchart/main.cpp 3 - To have the categories displayed on an axis, we need to create a - QBarCategoryAxis first. Here we create a category axis with a list of - categories and add it to the chart on the left-hand side, acting as the - y-axis. The chart takes ownership of the axis. For x-axis we use a value - axis, aligned to the bottom. + To have the categories displayed on an axis, we need to create a QBarCategoryAxis first. Here we create a category axis with a list of categories and + set it to be the y-axis of the chart. The chart takes ownership of the axis. For the x-axis we use the default axis, which is created and scaled to series data + by calling createDefaultAxes of the chart. Note that createDefaultAxes must be called before we set the category axis. Otherwise the default axis will + override the category axis. \snippet horizontalpercentbarchart/main.cpp 4 diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-horizontalstackedbarchart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-horizontalstackedbarchart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-horizontalstackedbarchart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-horizontalstackedbarchart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -60,11 +62,10 @@ \snippet horizontalstackedbarchart/main.cpp 3 - To have the categories displayed on an axis, we need to create a - QBarCategoryAxis first. Here we create a category axis with a list of - categories and add it to the chart on the left-hand side, acting as the - y-axis. The chart takes ownership of the axis. For x-axis we use a value - axis, aligned to the bottom. + To have categories displayed on an axis, we need to create a QBarCategoryAxis. Here we create a category axis with a list of categories and + set it to be the y-axis of the chart. The chart takes ownership of the axis. For the x-axis we use the default axis, which is created and scaled to series data + by calling createDefaultAxes of the chart. Note that the call for createDefaultAxes must be before we set the category axis. Otherwise the default axis will + override the category axis. \snippet horizontalstackedbarchart/main.cpp 4 diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-legendmarkers.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-legendmarkers.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-legendmarkers.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-legendmarkers.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-legend.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-legend.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-legend.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-legend.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-lineandbarchart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-lineandbarchart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-lineandbarchart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-lineandbarchart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-linechart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-linechart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-linechart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-linechart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-logvalueaxis.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-logvalueaxis.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-logvalueaxis.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-logvalueaxis.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-modeldata.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-modeldata.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-modeldata.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-modeldata.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-multiaxis.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-multiaxis.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-multiaxis.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-multiaxis.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-nesteddonuts.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-nesteddonuts.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-nesteddonuts.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-nesteddonuts.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-openglseries.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-openglseries.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-openglseries.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-openglseries.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-percentbarchart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-percentbarchart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-percentbarchart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-percentbarchart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -63,11 +65,10 @@ \snippet percentbarchart/main.cpp 3 - To have the categories displayed on an axis, we need to create a - QBarCategoryAxis first. Here we create a category axis with a list of - categories and add it to the chart aligned to the bottom, acting as the - x-axis. The chart takes ownership of the axis. For y-axis we use a value - axis, aligned to the left-hand side. + To have categories displayed on axis, we need to create a QBarCategoryAxis for that. Here we create a category axis with a list of categories and + set it to be the x-axis of the chart. The chart takes ownership of the axis. For the y-axis we use the default axis, which is created and scaled + to series data by calling createDefaultAxes of the chart. Note that createDefaultAxes must be called before we set the category axis. + Otherwise the default axis will override the category axis. \snippet percentbarchart/main.cpp 4 diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-piechartcustomization.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-piechartcustomization.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-piechartcustomization.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-piechartcustomization.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-piechartdrilldown.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-piechartdrilldown.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-piechartdrilldown.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-piechartdrilldown.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-piechart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-piechart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-piechart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-piechart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-polarchart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-polarchart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-polarchart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-polarchart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-qmlaxes.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-qmlaxes.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-qmlaxes.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-qmlaxes.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-qmlchart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-qmlchart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-qmlchart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-qmlchart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-qmlcustomizations.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-qmlcustomizations.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-qmlcustomizations.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-qmlcustomizations.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-qmlcustomlegend.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-qmlcustomlegend.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-qmlcustomlegend.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-qmlcustomlegend.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-qmlf1legends.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-qmlf1legends.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-qmlf1legends.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-qmlf1legends.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-qmloscilloscope.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-qmloscilloscope.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-qmloscilloscope.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-qmloscilloscope.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-qmlpolarchart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-qmlpolarchart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-qmlpolarchart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-qmlpolarchart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-qmlweather.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-qmlweather.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-qmlweather.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-qmlweather.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-scatterchart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-scatterchart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-scatterchart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-scatterchart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-scatterinteractions.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-scatterinteractions.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-scatterinteractions.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-scatterinteractions.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-splinechart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-splinechart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-splinechart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-splinechart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-stackedbarchartdrilldown.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-stackedbarchartdrilldown.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-stackedbarchartdrilldown.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-stackedbarchartdrilldown.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-stackedbarchart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-stackedbarchart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-stackedbarchart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-stackedbarchart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -62,11 +64,10 @@ \snippet stackedbarchart/main.cpp 3 - To have the categories displayed on an axis, we need to create a - QBarCategoryAxis first. Here we create a category axis with a list of - categories and add it to the chart aligned to bottom, acting as the - x-axis. The chart takes ownership of the axis. For the y-axis we use a - value axis, aligned to the left-hand side. + To have categories displayed on the axis, we need to create a QBarCategoryAxis. Here we create a category axis with list of categories and + set it to be the x-axis of the chart. The chart takes ownership of the axis. For the y-axis we use default axis, which is created and scaled to series data + by calling createDefaultAxes of the chart. Note that the call for createDefaultAxes must be before we set the category axis. Otherwise the default axis will + override the category axis. \snippet stackedbarchart/main.cpp 4 diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-temperaturerecords.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-temperaturerecords.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-temperaturerecords.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-temperaturerecords.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -53,12 +55,11 @@ \snippet temperaturerecords/main.cpp 3 - To have the categories displayed on an axis, we need to create a - QBarCategoryAxis. Here we create a category axis with a list of - categories and add it to the chart aligned to bottom, acting as the - x-axis. The chart takes ownership of the axis. For y-axis we use a value - axis, aligned to the left-hand side. We change the range for the y-axis, - as this gives nicer results than with autoscaling. + To have categories displayed on an axis, we need to create a QBarCategoryAxis. Here we create a category axis with a list of categories and + set it to be the x-axis of the chart. The chart takes ownership of the axis. For y-axis we use the default axis, which is created and scaled to the series data + by calling createDefaultAxes of the chart. We change the range for the y-axis, since this gives nicer result than with autoscaling. + + Note that the call for createDefaultAxes must be before we set the category axis. Otherwise the default axis will override the category axis. \snippet temperaturerecords/main.cpp 4 diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-zoomlinechart.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-zoomlinechart.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/examples-zoomlinechart.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/examples-zoomlinechart.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -30,7 +32,7 @@ \title Zoom Line Example \ingroup qtcharts_examples - \brief The example shows how to create your own custom zooming effect. + \brief The example shows how to create your own custom zooming effect The example shows how to create your own custom zooming effect with QRubberBand by using a mouse and how to use touch gestures for paning and zooming. diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/index.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/index.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/index.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/index.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -45,9 +47,8 @@ \snippet doc_src_qtcharts.cpp 0 - \if !defined(qtforpython) - \note Projects created with Qt Creator's Qt Quick Application - wizard are based on the Qt Quick 2 template that uses QGuiApplication by default. + \note Since Qt Creator 3.0, projects created with Qt Quick Application + wizard based on the Qt Quick 2 template uses QGuiApplication by default. All such QGuiApplication instances in the project must be replaced with QApplication as the module depends on Qt's \l{Graphics View Framework} for rendering. @@ -55,13 +56,6 @@ To link against the Qt Charts module, add this line to your \c qmake project file: \snippet doc_src_qtcharts.pro 0 - \endif - - \section1 Licenses - - Qt Charts is available under commercial licenses from \l{The Qt Company}. - In addition, it is available under the \l{GNU General Public License, version 3}. - See \l{Qt Licensing} for further details. \section1 Articles and Guides \list diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/qtcharts-overview.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/qtcharts-overview.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/qtcharts-overview.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/qtcharts-overview.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,13 +14,15 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff -Nru qtcharts-opensource-src-5.12.5/src/charts/doc/src/qtcharts.qdoc qtcharts-opensource-src-5.9.5/src/charts/doc/src/qtcharts.qdoc --- qtcharts-opensource-src-5.12.5/src/charts/doc/src/qtcharts.qdoc 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/doc/src/qtcharts.qdoc 2018-03-19 05:05:55.000000000 +0000 @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the Qt Charts module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL$ +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,19 +14,21 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ /*! - \module QtCharts + \module Qt Charts \title Qt Charts C++ Classes \ingroup modules @@ -35,31 +37,20 @@ Charts API is built on top of Qt Graphics View Framework. Charts can be displayed as QGraphicsWidget using the QChart class. However there is also the convenience class QChartView, which is QWidget based. These enable us to quickly use Qt Charts as a normal Qt widget. - If you intend to use Qt Charts C++ classes in your application, use the - following include and using directives: - - \snippet doc_src_qtcharts.cpp 0 - - \if !defined(qtforpython) - \note Projects created with Qt Creator's Qt Quick Application - wizard are based on the Qt Quick 2 template that uses QGuiApplication by default. - All such QGuiApplication instances in the project must be replaced with - QApplication as the module depends on Qt's \l{Graphics View Framework} - for rendering. - - To link against the Qt Charts module, add this line to your \c qmake project file: - - \snippet doc_src_qtcharts.pro 0 - \endif - Each chart type is represented by the QAbstractSeries derived class. To create charts, the users have to use an instance of the related series class and add it to a QChart instance. - - \snippet doc_src_qtcharts.cpp 3 + \code + QLineSeries* series = new QLineSeries(); + series->add(0, 6); + series->add(2, 4); + ... + chartView->chart()->addSeries(series); + chartView->chart()->createDefaultAxes(); + \endcode */ /*! - \qmlmodule QtCharts 2.3 + \qmlmodule QtCharts 2.2 \title Qt Charts QML Types \ingroup qmlmodules diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/abstractdomain.cpp qtcharts-opensource-src-5.9.5/src/charts/domain/abstractdomain.cpp --- qtcharts-opensource-src-5.12.5/src/charts/domain/abstractdomain.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/abstractdomain.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -300,6 +300,7 @@ return fixRect; } -QT_CHARTS_END_NAMESPACE #include "moc_abstractdomain_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/abstractdomain_p.h qtcharts-opensource-src-5.9.5/src/charts/domain/abstractdomain_p.h --- qtcharts-opensource-src-5.12.5/src/charts/domain/abstractdomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/abstractdomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -39,7 +39,6 @@ #ifndef ABSTRACTDOMAIN_H #define ABSTRACTDOMAIN_H #include -#include #include #include #include @@ -48,7 +47,7 @@ class QAbstractAxis; -class QT_CHARTS_PRIVATE_EXPORT AbstractDomain: public QObject +class Q_AUTOTEST_EXPORT AbstractDomain: public QObject { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/logxlogydomain.cpp qtcharts-opensource-src-5.9.5/src/charts/domain/logxlogydomain.cpp --- qtcharts-opensource-src-5.12.5/src/charts/domain/logxlogydomain.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/logxlogydomain.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -298,6 +298,6 @@ return dbg.maybeSpace(); } -QT_CHARTS_END_NAMESPACE - #include "moc_logxlogydomain_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/logxlogydomain_p.h qtcharts-opensource-src-5.9.5/src/charts/domain/logxlogydomain_p.h --- qtcharts-opensource-src-5.12.5/src/charts/domain/logxlogydomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/logxlogydomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -39,13 +39,12 @@ #ifndef LOGXLOGYDOMAIN_H #define LOGXLOGYDOMAIN_H #include -#include #include #include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT LogXLogYDomain: public AbstractDomain +class Q_AUTOTEST_EXPORT LogXLogYDomain: public AbstractDomain { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/logxlogypolardomain.cpp qtcharts-opensource-src-5.9.5/src/charts/domain/logxlogypolardomain.cpp --- qtcharts-opensource-src-5.12.5/src/charts/domain/logxlogypolardomain.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/logxlogypolardomain.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -278,6 +278,6 @@ return dbg.maybeSpace(); } -QT_CHARTS_END_NAMESPACE - #include "moc_logxlogypolardomain_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/logxlogypolardomain_p.h qtcharts-opensource-src-5.9.5/src/charts/domain/logxlogypolardomain_p.h --- qtcharts-opensource-src-5.12.5/src/charts/domain/logxlogypolardomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/logxlogypolardomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -39,13 +39,12 @@ #ifndef LOGXLOGYPOLARDOMAIN_H #define LOGXLOGYPOLARDOMAIN_H #include -#include #include #include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT LogXLogYPolarDomain: public PolarDomain +class Q_AUTOTEST_EXPORT LogXLogYPolarDomain: public PolarDomain { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/logxydomain.cpp qtcharts-opensource-src-5.9.5/src/charts/domain/logxydomain.cpp --- qtcharts-opensource-src-5.12.5/src/charts/domain/logxydomain.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/logxydomain.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -268,6 +268,6 @@ return dbg.maybeSpace(); } -QT_CHARTS_END_NAMESPACE - #include "moc_logxydomain_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/logxydomain_p.h qtcharts-opensource-src-5.9.5/src/charts/domain/logxydomain_p.h --- qtcharts-opensource-src-5.12.5/src/charts/domain/logxydomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/logxydomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -39,13 +39,12 @@ #ifndef LOGXYDOMAIN_H #define LOGXYDOMAIN_H #include -#include #include #include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT LogXYDomain: public AbstractDomain +class Q_AUTOTEST_EXPORT LogXYDomain: public AbstractDomain { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/logxypolardomain.cpp qtcharts-opensource-src-5.9.5/src/charts/domain/logxypolardomain.cpp --- qtcharts-opensource-src-5.12.5/src/charts/domain/logxypolardomain.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/logxypolardomain.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -247,6 +247,6 @@ return dbg.maybeSpace(); } -QT_CHARTS_END_NAMESPACE - #include "moc_logxypolardomain_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/logxypolardomain_p.h qtcharts-opensource-src-5.9.5/src/charts/domain/logxypolardomain_p.h --- qtcharts-opensource-src-5.12.5/src/charts/domain/logxypolardomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/logxypolardomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -39,13 +39,12 @@ #ifndef LOGXYPOLARDOMAIN_H #define LOGXYPOLARDOMAIN_H #include -#include #include #include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT LogXYPolarDomain: public PolarDomain +class Q_AUTOTEST_EXPORT LogXYPolarDomain: public PolarDomain { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/polardomain.cpp qtcharts-opensource-src-5.9.5/src/charts/domain/polardomain.cpp --- qtcharts-opensource-src-5.12.5/src/charts/domain/polardomain.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/polardomain.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -89,12 +89,12 @@ QPointF PolarDomain::polarCoordinateToPoint(qreal angularCoordinate, qreal radialCoordinate) const { - qreal dx = qSin(qDegreesToRadians(angularCoordinate)) * radialCoordinate; - qreal dy = qCos(qDegreesToRadians(angularCoordinate)) * radialCoordinate; + qreal dx = qSin(angularCoordinate * (M_PI / 180)) * radialCoordinate; + qreal dy = qCos(angularCoordinate * (M_PI / 180)) * radialCoordinate; return QPointF(dx, -dy); } -QT_CHARTS_END_NAMESPACE - #include "moc_polardomain_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/polardomain_p.h qtcharts-opensource-src-5.9.5/src/charts/domain/polardomain_p.h --- qtcharts-opensource-src-5.12.5/src/charts/domain/polardomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/polardomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -39,13 +39,12 @@ #ifndef POLARDOMAIN_H #define POLARDOMAIN_H #include -#include #include #include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT PolarDomain: public AbstractDomain +class Q_AUTOTEST_EXPORT PolarDomain: public AbstractDomain { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/xlogydomain.cpp qtcharts-opensource-src-5.9.5/src/charts/domain/xlogydomain.cpp --- qtcharts-opensource-src-5.12.5/src/charts/domain/xlogydomain.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/xlogydomain.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -264,6 +264,6 @@ return dbg.maybeSpace(); } -QT_CHARTS_END_NAMESPACE - #include "moc_xlogydomain_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/xlogydomain_p.h qtcharts-opensource-src-5.9.5/src/charts/domain/xlogydomain_p.h --- qtcharts-opensource-src-5.12.5/src/charts/domain/xlogydomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/xlogydomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -39,13 +39,12 @@ #ifndef XLOGYDOMAIN_H #define XLOGYDOMAIN_H #include -#include #include #include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT XLogYDomain: public AbstractDomain +class Q_AUTOTEST_EXPORT XLogYDomain: public AbstractDomain { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/xlogypolardomain.cpp qtcharts-opensource-src-5.9.5/src/charts/domain/xlogypolardomain.cpp --- qtcharts-opensource-src-5.12.5/src/charts/domain/xlogypolardomain.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/xlogypolardomain.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -242,6 +242,6 @@ return dbg.maybeSpace(); } -QT_CHARTS_END_NAMESPACE - #include "moc_xlogypolardomain_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/xlogypolardomain_p.h qtcharts-opensource-src-5.9.5/src/charts/domain/xlogypolardomain_p.h --- qtcharts-opensource-src-5.12.5/src/charts/domain/xlogypolardomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/xlogypolardomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -39,13 +39,12 @@ #ifndef XLOGYPOLARDOMAIN_H #define XLOGYPOLARDOMAIN_H #include -#include #include #include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT XLogYPolarDomain: public PolarDomain +class Q_AUTOTEST_EXPORT XLogYPolarDomain: public PolarDomain { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/xydomain.cpp qtcharts-opensource-src-5.9.5/src/charts/domain/xydomain.cpp --- qtcharts-opensource-src-5.12.5/src/charts/domain/xydomain.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/xydomain.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -154,12 +154,8 @@ QPointF XYDomain::calculateGeometryPoint(const QPointF &point, bool &ok) const { - const qreal xd = m_maxX - m_minX; - const qreal yd = m_maxY - m_minY; - if (qFuzzyIsNull(xd) || qFuzzyIsNull(yd)) - return QPointF(); - const qreal deltaX = m_size.width() / xd; - const qreal deltaY = m_size.height() / yd; + const qreal deltaX = m_size.width() / (m_maxX - m_minX); + const qreal deltaY = m_size.height() / (m_maxY - m_minY); qreal x = (point.x() - m_minX) * deltaX; if (m_reverseX) x = m_size.width() - x; @@ -172,12 +168,8 @@ QVector XYDomain::calculateGeometryPoints(const QVector &vector) const { - const qreal xd = m_maxX - m_minX; - const qreal yd = m_maxY - m_minY; - if (qFuzzyIsNull(xd) || qFuzzyIsNull(yd)) - return QVector(); - const qreal deltaX = m_size.width() / xd; - const qreal deltaY = m_size.height() / yd; + const qreal deltaX = m_size.width() / (m_maxX - m_minX); + const qreal deltaY = m_size.height() / (m_maxY - m_minY); QVector result; result.resize(vector.count()); @@ -197,12 +189,8 @@ QPointF XYDomain::calculateDomainPoint(const QPointF &point) const { - const qreal xd = m_maxX - m_minX; - const qreal yd = m_maxY - m_minY; - if (qFuzzyIsNull(xd) || qFuzzyIsNull(yd)) - return QPointF(); - const qreal deltaX = m_size.width() / xd; - const qreal deltaY = m_size.height() / yd; + const qreal deltaX = m_size.width() / (m_maxX - m_minX); + const qreal deltaY = m_size.height() / (m_maxY - m_minY); qreal x = m_reverseX ? (m_size.width() - point.x()) : point.x(); x /= deltaX; x += m_minX; @@ -239,6 +227,6 @@ return dbg.maybeSpace(); } -QT_CHARTS_END_NAMESPACE - #include "moc_xydomain_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/xydomain_p.h qtcharts-opensource-src-5.9.5/src/charts/domain/xydomain_p.h --- qtcharts-opensource-src-5.12.5/src/charts/domain/xydomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/xydomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -39,13 +39,12 @@ #ifndef XYDOMAIN_H #define XYDOMAIN_H #include -#include #include #include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT XYDomain: public AbstractDomain +class Q_AUTOTEST_EXPORT XYDomain: public AbstractDomain { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/xypolardomain.cpp qtcharts-opensource-src-5.9.5/src/charts/domain/xypolardomain.cpp --- qtcharts-opensource-src-5.12.5/src/charts/domain/xypolardomain.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/xypolardomain.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -188,6 +188,6 @@ return dbg.maybeSpace(); } -QT_CHARTS_END_NAMESPACE - #include "moc_xypolardomain_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/domain/xypolardomain_p.h qtcharts-opensource-src-5.9.5/src/charts/domain/xypolardomain_p.h --- qtcharts-opensource-src-5.12.5/src/charts/domain/xypolardomain_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/domain/xypolardomain_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -39,12 +39,11 @@ #ifndef XYPOLARDOMAIN_H #define XYPOLARDOMAIN_H #include -#include #include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT XYPolarDomain: public PolarDomain +class Q_AUTOTEST_EXPORT XYPolarDomain: public PolarDomain { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/glwidget_p.h qtcharts-opensource-src-5.9.5/src/charts/glwidget_p.h --- qtcharts-opensource-src-5.12.5/src/charts/glwidget_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/glwidget_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -73,13 +73,13 @@ void cleanXYSeriesResources(const QXYSeries *series); protected: - void initializeGL() override; - void paintGL() override; - void resizeGL(int width, int height) override; - void mouseDoubleClickEvent(QMouseEvent *event) override; - void mouseMoveEvent(QMouseEvent *event) override; - void mousePressEvent(QMouseEvent *event) override; - void mouseReleaseEvent(QMouseEvent *event) override; + void initializeGL() Q_DECL_OVERRIDE; + void paintGL() Q_DECL_OVERRIDE; + void resizeGL(int width, int height) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; private: QXYSeries *findSeriesAtEvent(QMouseEvent *event); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/layout/abstractchartlayout.cpp qtcharts-opensource-src-5.9.5/src/charts/layout/abstractchartlayout.cpp --- qtcharts-opensource-src-5.12.5/src/charts/layout/abstractchartlayout.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/layout/abstractchartlayout.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -53,33 +53,30 @@ { if (!rect.isValid()) return; - // If the chart has a fixed geometry then don't update visually - const bool updateLayout = (!m_presenter->isFixedGeometry() || m_presenter->geometry() == rect); + if (m_presenter->chart()->isVisible()) { QList axes = m_presenter->axisItems(); ChartTitle *title = m_presenter->titleElement(); QLegend *legend = m_presenter->legend(); ChartBackground *background = m_presenter->backgroundElement(); - QRectF contentGeometry = calculateBackgroundGeometry(rect, background, updateLayout); + QRectF contentGeometry = calculateBackgroundGeometry(rect, background); contentGeometry = calculateContentGeometry(contentGeometry); if (title && title->isVisible()) - contentGeometry = calculateTitleGeometry(contentGeometry, title, updateLayout); + contentGeometry = calculateTitleGeometry(contentGeometry, title); if (legend->isAttachedToChart() && legend->isVisible()) - contentGeometry = calculateLegendGeometry(contentGeometry, legend, updateLayout); + contentGeometry = calculateLegendGeometry(contentGeometry, legend); - contentGeometry = calculateAxisGeometry(contentGeometry, axes, updateLayout); + contentGeometry = calculateAxisGeometry(contentGeometry, axes); m_presenter->setGeometry(contentGeometry); - if (updateLayout) { - if (m_presenter->chart()->chartType() == QChart::ChartTypeCartesian) - static_cast(m_presenter->plotAreaElement())->setRect(contentGeometry); - else - static_cast(m_presenter->plotAreaElement())->setRect(contentGeometry); - } + if (m_presenter->chart()->chartType() == QChart::ChartTypeCartesian) + static_cast(m_presenter->plotAreaElement())->setRect(contentGeometry); + else + static_cast(m_presenter->plotAreaElement())->setRect(contentGeometry); } QGraphicsLayout::setGeometry(rect); @@ -96,9 +93,7 @@ } -QRectF AbstractChartLayout::calculateBackgroundGeometry(const QRectF &geometry, - ChartBackground *background, - bool update) const +QRectF AbstractChartLayout::calculateBackgroundGeometry(const QRectF &geometry, ChartBackground *background) const { qreal left; qreal top; @@ -106,7 +101,7 @@ qreal bottom; getContentsMargins(&left, &top, &right, &bottom); QRectF backgroundGeometry = geometry.adjusted(left, top, -right, -bottom); - if (background && update) + if (background) background->setRect(backgroundGeometry); return backgroundGeometry; } @@ -121,8 +116,7 @@ return minimum.adjusted(0, 0, left + right, top + bottom); } -QRectF AbstractChartLayout::calculateLegendGeometry(const QRectF &geometry, QLegend *legend, - bool update) const +QRectF AbstractChartLayout::calculateLegendGeometry(const QRectF &geometry, QLegend *legend) const { QSizeF size = legend->effectiveSizeHint(Qt::PreferredSize, QSizeF(-1, -1)); QRectF legendRect; @@ -157,8 +151,8 @@ break; } } - if (update) - legend->setGeometry(legendRect); + + legend->setGeometry(legendRect); return result; } @@ -173,18 +167,16 @@ } } -QRectF AbstractChartLayout::calculateTitleGeometry(const QRectF &geometry, ChartTitle *title, - bool update) const +QRectF AbstractChartLayout::calculateTitleGeometry(const QRectF &geometry, ChartTitle *title) const { - if (update) - title->setGeometry(geometry); + title->setGeometry(geometry); if (title->text().isEmpty()) { return geometry; } else { // Round to full pixel via QPoint to avoid one pixel clipping on the edge in some cases QPointF center((geometry.center() - title->boundingRect().center()).toPoint()); - if (update) - title->setPos(center.x(), title->pos().y()); + + title->setPos(center.x(), title->pos().y()); return geometry.adjusted(0, title->boundingRect().height() + 1, 0, 0); } } diff -Nru qtcharts-opensource-src-5.12.5/src/charts/layout/abstractchartlayout_p.h qtcharts-opensource-src-5.9.5/src/charts/layout/abstractchartlayout_p.h --- qtcharts-opensource-src-5.12.5/src/charts/layout/abstractchartlayout_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/layout/abstractchartlayout_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -42,7 +42,6 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE @@ -52,7 +51,7 @@ class QLegend; class ChartBackground; -class QT_CHARTS_PRIVATE_EXPORT AbstractChartLayout : public QGraphicsLayout +class AbstractChartLayout : public QGraphicsLayout { public: AbstractChartLayout(ChartPresenter *presenter); @@ -63,23 +62,17 @@ virtual void setGeometry(const QRectF &rect); protected: - virtual QRectF calculateBackgroundGeometry(const QRectF &geometry, ChartBackground *background, - bool update = true) const; + virtual QRectF calculateBackgroundGeometry(const QRectF &geometry, ChartBackground *background) const; virtual QRectF calculateBackgroundMinimum(const QRectF &minimum) const; virtual QRectF calculateContentGeometry(const QRectF &geometry) const; virtual QRectF calculateContentMinimum(const QRectF &minimum) const; - virtual QRectF calculateTitleGeometry(const QRectF &geometry, ChartTitle *title, - bool update = true) const; + virtual QRectF calculateTitleGeometry(const QRectF &geometry, ChartTitle *title) const; virtual QRectF calculateTitleMinimum(const QRectF &minimum, ChartTitle *title) const; - virtual QRectF calculateLegendGeometry(const QRectF &geometry, QLegend *legend, - bool update = true) const; + virtual QRectF calculateLegendGeometry(const QRectF &geometry, QLegend *legend) const; virtual QRectF calculateLegendMinimum(const QRectF &minimum, QLegend *legend) const; - virtual QRectF calculateAxisGeometry(const QRectF &geometry, - const QList& axes, - bool update = true) const = 0; - virtual QRectF calculateAxisMinimum(const QRectF &minimum, - const QList& axes) const = 0; + virtual QRectF calculateAxisGeometry(const QRectF &geometry, const QList& axes) const = 0; + virtual QRectF calculateAxisMinimum(const QRectF &minimum, const QList& axes) const = 0; // from QGraphicsLayout QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/layout/cartesianchartlayout.cpp qtcharts-opensource-src-5.9.5/src/charts/layout/cartesianchartlayout.cpp --- qtcharts-opensource-src-5.12.5/src/charts/layout/cartesianchartlayout.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/layout/cartesianchartlayout.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -45,11 +45,8 @@ { } -QRectF CartesianChartLayout::calculateAxisGeometry(const QRectF &geometry, - const QList &axes, - bool update) const +QRectF CartesianChartLayout::calculateAxisGeometry(const QRectF &geometry, const QList &axes) const { - Q_UNUSED(update) QSizeF left(0,0); QSizeF minLeft(0,0); QSizeF right(0,0); @@ -175,11 +172,6 @@ qreal topOffset = 0; qreal bottomOffset = 0; - // The axes are positioned here for the first time, so we need to catch any possible resizing - // of the chart when in fixed geometry to prevent them being moved out of place. - if (m_presenter->isFixedGeometry()) - chartRect = m_presenter->geometry(); - foreach (ChartAxisElement *axis , axes) { if (!axis->isVisible()) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/layout/cartesianchartlayout_p.h qtcharts-opensource-src-5.9.5/src/charts/layout/cartesianchartlayout_p.h --- qtcharts-opensource-src-5.12.5/src/charts/layout/cartesianchartlayout_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/layout/cartesianchartlayout_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,11 +40,10 @@ #define CARTESIANCHARTLAYOUT_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT CartesianChartLayout : public AbstractChartLayout +class CartesianChartLayout : public AbstractChartLayout { public: CartesianChartLayout(ChartPresenter *presenter); @@ -52,8 +51,7 @@ // from AbstractChartLayout QRectF calculateAxisMinimum(const QRectF &minimum, const QList &axes) const; - QRectF calculateAxisGeometry(const QRectF &geometry, const QList &axes, - bool update = true) const; + QRectF calculateAxisGeometry(const QRectF &geometry, const QList &axes) const; }; QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/layout/polarchartlayout.cpp qtcharts-opensource-src-5.9.5/src/charts/layout/polarchartlayout.cpp --- qtcharts-opensource-src-5.12.5/src/charts/layout/polarchartlayout.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/layout/polarchartlayout.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -43,9 +43,7 @@ { } -QRectF PolarChartLayout::calculateAxisGeometry(const QRectF &geometry, - const QList &axes, - bool update) const +QRectF PolarChartLayout::calculateAxisGeometry(const QRectF &geometry, const QList &axes) const { // How to handle multiple angular/radial axes? qreal axisRadius = geometry.height() / 2.0; @@ -76,10 +74,8 @@ axisRect.moveCenter(geometry.center()); axisRect.adjust(0, titleHeight, 0, titleHeight); - if (update) { - foreach (ChartAxisElement *chartAxis, axes) - chartAxis->setGeometry(axisRect, QRectF()); - } + foreach (ChartAxisElement *chartAxis, axes) + chartAxis->setGeometry(axisRect, QRectF()); return axisRect; } diff -Nru qtcharts-opensource-src-5.12.5/src/charts/layout/polarchartlayout_p.h qtcharts-opensource-src-5.9.5/src/charts/layout/polarchartlayout_p.h --- qtcharts-opensource-src-5.12.5/src/charts/layout/polarchartlayout_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/layout/polarchartlayout_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,11 +40,10 @@ #define POLARCHARTLAYOUT_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT PolarChartLayout : public AbstractChartLayout +class PolarChartLayout : public AbstractChartLayout { public: PolarChartLayout(ChartPresenter *presenter); @@ -52,8 +51,7 @@ // from AbstractChartLayout QRectF calculateAxisMinimum(const QRectF &minimum, const QList &axes) const; - QRectF calculateAxisGeometry(const QRectF &geometry, const QList &axes, - bool update = true) const; + QRectF calculateAxisGeometry(const QRectF &geometry, const QList &axes) const; }; QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/legendlayout.cpp qtcharts-opensource-src-5.9.5/src/charts/legend/legendlayout.cpp --- qtcharts-opensource-src-5.12.5/src/charts/legend/legendlayout.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/legendlayout.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -315,6 +315,8 @@ getContentsMargins(&left, &top, &right, &bottom); QRectF geometry = rect.adjusted(left, top, -right, -bottom); + QSizeF size(0, 0); + QList markers = m_legend->d_ptr->markers(); if (markers.isEmpty()) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/legendlayout_p.h qtcharts-opensource-src-5.9.5/src/charts/legend/legendlayout_p.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/legendlayout_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/legendlayout_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,14 +40,13 @@ #define LEGENDLAYOUT_H #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class QLegend; class LegendMarkerItem; -class QT_CHARTS_PRIVATE_EXPORT LegendLayout : public QGraphicsLayout +class LegendLayout : public QGraphicsLayout { public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/legendmarkeritem.cpp qtcharts-opensource-src-5.9.5/src/charts/legend/legendmarkeritem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/legend/legendmarkeritem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/legendmarkeritem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -62,6 +62,7 @@ m_hovering(false), m_itemType(TypeRect) { + updateMarkerShapeAndSize(); m_textItem->document()->setDocumentMargin(ChartPresenter::textMargin()); setAcceptHoverEvents(true); } @@ -146,9 +147,6 @@ void LegendMarkerItem::setGeometry(const QRectF &rect) { - if (!m_markerItem) - updateMarkerShapeAndSize(); - const qreal width = rect.width(); const qreal markerWidth = effectiveMarkerWidth(); const qreal x = m_margin + markerWidth + m_space + m_margin; @@ -370,6 +368,6 @@ || m_marker->m_legend->alignment() == Qt::AlignRight); } -QT_CHARTS_END_NAMESPACE - #include "moc_legendmarkeritem_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/legendmarkeritem_p.h qtcharts-opensource-src-5.9.5/src/charts/legend/legendmarkeritem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/legendmarkeritem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/legendmarkeritem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -47,13 +47,12 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class QLegendMarkerPrivate; -class QT_CHARTS_PRIVATE_EXPORT LegendMarkerItem : public QGraphicsObject, public QGraphicsLayoutItem +class LegendMarkerItem : public QGraphicsObject, public QGraphicsLayoutItem { Q_OBJECT Q_INTERFACES(QGraphicsLayoutItem) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/legendscroller.cpp qtcharts-opensource-src-5.9.5/src/charts/legend/legendscroller.cpp --- qtcharts-opensource-src-5.12.5/src/charts/legend/legendscroller.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/legendscroller.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -78,6 +78,6 @@ } } -QT_CHARTS_END_NAMESPACE #include "moc_legendscroller_p.cpp" +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/legendscroller_p.h qtcharts-opensource-src-5.9.5/src/charts/legend/legendscroller_p.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/legendscroller_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/legendscroller_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,11 +43,10 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT LegendScroller: public QLegend, public Scroller +class LegendScroller: public QLegend, public Scroller { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qarealegendmarker.cpp qtcharts-opensource-src-5.9.5/src/charts/legend/qarealegendmarker.cpp --- qtcharts-opensource-src-5.12.5/src/charts/legend/qarealegendmarker.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qarealegendmarker.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -36,7 +36,7 @@ /*! \class QAreaLegendMarker - \inmodule QtCharts + \inmodule Qt Charts \brief The QAreaLegendMarker class is a legend marker for an area series. An area legend marker is related to a QAreaSeries object, so that one area series @@ -129,7 +129,7 @@ emit q_ptr->brushChanged(); } -QT_CHARTS_END_NAMESPACE - #include "moc_qarealegendmarker.cpp" #include "moc_qarealegendmarker_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qarealegendmarker.h qtcharts-opensource-src-5.9.5/src/charts/legend/qarealegendmarker.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/qarealegendmarker.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qarealegendmarker.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,7 +43,7 @@ Q_OBJECT public: - explicit QAreaLegendMarker(QAreaSeries *series, QLegend *legend, QObject *parent = nullptr); + explicit QAreaLegendMarker(QAreaSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR); virtual ~QAreaLegendMarker(); virtual LegendMarkerType type() { return LegendMarkerTypeArea; } @@ -52,7 +52,7 @@ virtual QAreaSeries* series(); protected: - QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent = nullptr); + QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QAreaLegendMarker) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qarealegendmarker_p.h qtcharts-opensource-src-5.9.5/src/charts/legend/qarealegendmarker_p.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/qarealegendmarker_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qarealegendmarker_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,13 +43,12 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class QAreaLegendMarker; -class QT_CHARTS_PRIVATE_EXPORT QAreaLegendMarkerPrivate : public QLegendMarkerPrivate +class QAreaLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qbarlegendmarker.cpp qtcharts-opensource-src-5.9.5/src/charts/legend/qbarlegendmarker.cpp --- qtcharts-opensource-src-5.12.5/src/charts/legend/qbarlegendmarker.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qbarlegendmarker.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -36,7 +36,7 @@ /*! \class QBarLegendMarker - \inmodule QtCharts + \inmodule Qt Charts \brief The QBarLegendMarker class is a legend marker for a bar series. A bar legend marker is related to QAbstractBarSeries derived classes. With a bar series, @@ -148,7 +148,8 @@ emit q_ptr->penChanged(); } -QT_CHARTS_END_NAMESPACE - #include "moc_qbarlegendmarker.cpp" #include "moc_qbarlegendmarker_p.cpp" + +QT_CHARTS_END_NAMESPACE + diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qbarlegendmarker.h qtcharts-opensource-src-5.9.5/src/charts/legend/qbarlegendmarker.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/qbarlegendmarker.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qbarlegendmarker.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,7 +43,7 @@ { Q_OBJECT public: - explicit QBarLegendMarker(QAbstractBarSeries *series, QBarSet *barset, QLegend *legend, QObject *parent = nullptr); + explicit QBarLegendMarker(QAbstractBarSeries *series, QBarSet *barset, QLegend *legend, QObject *parent = Q_NULLPTR); virtual ~QBarLegendMarker(); virtual LegendMarkerType type() { return LegendMarkerTypeBar; } @@ -53,7 +53,7 @@ QBarSet* barset(); protected: - QBarLegendMarker(QBarLegendMarkerPrivate &d, QObject *parent = nullptr); + QBarLegendMarker(QBarLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QBarLegendMarker) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qbarlegendmarker_p.h qtcharts-opensource-src-5.9.5/src/charts/legend/qbarlegendmarker_p.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/qbarlegendmarker_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qbarlegendmarker_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -44,13 +44,12 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class QBarLegendMarker; -class QT_CHARTS_PRIVATE_EXPORT QBarLegendMarkerPrivate : public QLegendMarkerPrivate +class QBarLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qboxplotlegendmarker.cpp qtcharts-opensource-src-5.9.5/src/charts/legend/qboxplotlegendmarker.cpp --- qtcharts-opensource-src-5.12.5/src/charts/legend/qboxplotlegendmarker.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qboxplotlegendmarker.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -36,7 +36,7 @@ /*! \class QBoxPlotLegendMarker - \inmodule QtCharts + \inmodule Qt Charts \brief The QBoxPlotLegendMarker class is a legend marker for a box plot series. A box plot legend marker is related to a QBoxPlotSeries object. @@ -128,7 +128,8 @@ emit q_ptr->brushChanged(); } -QT_CHARTS_END_NAMESPACE - #include "moc_qboxplotlegendmarker.cpp" #include "moc_qboxplotlegendmarker_p.cpp" + +QT_CHARTS_END_NAMESPACE + diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qboxplotlegendmarker.h qtcharts-opensource-src-5.9.5/src/charts/legend/qboxplotlegendmarker.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/qboxplotlegendmarker.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qboxplotlegendmarker.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,7 +43,7 @@ Q_OBJECT public: - explicit QBoxPlotLegendMarker(QBoxPlotSeries *series, QLegend *legend, QObject *parent = nullptr); + explicit QBoxPlotLegendMarker(QBoxPlotSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR); virtual ~QBoxPlotLegendMarker(); virtual LegendMarkerType type() { return LegendMarkerTypeBoxPlot; } @@ -52,7 +52,7 @@ virtual QBoxPlotSeries* series(); protected: - QBoxPlotLegendMarker(QBoxPlotLegendMarkerPrivate &d, QObject *parent = nullptr); + QBoxPlotLegendMarker(QBoxPlotLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QBoxPlotLegendMarker) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qboxplotlegendmarker_p.h qtcharts-opensource-src-5.9.5/src/charts/legend/qboxplotlegendmarker_p.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/qboxplotlegendmarker_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qboxplotlegendmarker_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,13 +43,12 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class QBoxPlotLegendMarker; -class QT_CHARTS_PRIVATE_EXPORT QBoxPlotLegendMarkerPrivate : public QLegendMarkerPrivate +class QBoxPlotLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qcandlesticklegendmarker.cpp qtcharts-opensource-src-5.9.5/src/charts/legend/qcandlesticklegendmarker.cpp --- qtcharts-opensource-src-5.12.5/src/charts/legend/qcandlesticklegendmarker.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qcandlesticklegendmarker.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -36,7 +36,7 @@ /*! \class QCandlestickLegendMarker - \inmodule QtCharts + \inmodule Qt Charts \since 5.8 \brief The QCandlestickLegendMarker class is a legend marker for a candlestick series. @@ -140,7 +140,7 @@ emit q_ptr->brushChanged(); } -QT_CHARTS_END_NAMESPACE - #include "moc_qcandlesticklegendmarker.cpp" #include "moc_qcandlesticklegendmarker_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qcandlesticklegendmarker_p.h qtcharts-opensource-src-5.9.5/src/charts/legend/qcandlesticklegendmarker_p.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/qcandlesticklegendmarker_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qcandlesticklegendmarker_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,14 +40,13 @@ #define QCANDLESTICKLEGENDMARKER_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QCandlestickLegendMarker; class QCandlestickSeries; -class QT_CHARTS_PRIVATE_EXPORT QCandlestickLegendMarkerPrivate : public QLegendMarkerPrivate +class QCandlestickLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qlegend.cpp qtcharts-opensource-src-5.9.5/src/charts/legend/qlegend.cpp --- qtcharts-opensource-src-5.12.5/src/charts/legend/qlegend.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qlegend.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -47,7 +47,7 @@ /*! \class QLegend - \inmodule QtCharts + \inmodule Qt Charts \inherits QGraphicsWidget \brief The QLegend class displays the legend of a chart. @@ -707,124 +707,70 @@ m_layout->invalidate(); } -QObject *QLegendPrivate::relatedObject(const QLegendMarker *l) -{ - return l->d_ptr->relatedObject(); -} - -// Find equivalent QLegendMarker by checking for relatedObject() -static int indexOfEquivalent(const QLegendMarker *needle, - const QList &hayStack) -{ - const QObject *needleObject = QLegendPrivate::relatedObject(needle); - for (int i = 0, size = hayStack.size(); i < size; ++i) { - if (QLegendPrivate::relatedObject(hayStack.at(i)) == needleObject) - return i; - } - return -1; -} - -// Find QLegendMarker for series -static int indexOfSeries(const QAbstractSeries *series, - const QList &hayStack) -{ - for (int i = 0, size = hayStack.size(); i < size; ++i) { - if (hayStack.at(i)->series() == series) - return i; - } - return -1; -} - void QLegendPrivate::handleCountChanged() { // Here we handle the changes in marker count. // Can happen for example when pieslice(s) have been added to or removed from pieseries. - QAbstractSeriesPrivate *seriesP = qobject_cast(sender()); - QAbstractSeries *series = seriesP->q_ptr; - QList createdMarkers = seriesP->createLegendMarkers(q_ptr); - QVector isNew(createdMarkers.size(), true); - - const int pos = indexOfSeries(series, m_markers); - // Remove markers of the series from m_markers and check against the newly - // created ones. - if (pos != -1) { - while (pos < m_markers.size() && m_markers.at(pos)->series() == series) { - QLegendMarker *oldMarker = m_markers.takeAt(pos); - const int newIndex = indexOfEquivalent(oldMarker, createdMarkers); - if (newIndex == -1) { - removeMarkerHelper(oldMarker); // no longer exists - } else { - // Replace newly created marker by its equivalent - delete createdMarkers[newIndex]; - createdMarkers[newIndex] = oldMarker; - isNew[newIndex] = false; - } - } - } + QAbstractSeriesPrivate *series = qobject_cast (sender()); + QList createdMarkers = series->createLegendMarkers(q_ptr); - for (int i = 0, size = createdMarkers.size(); i < size; ++i) { - if (isNew.at(i)) { - insertMarkerHelper(createdMarkers.at(i)); - decorateMarker(createdMarkers.at(i)); + // Find out removed markers and created markers + QList removedMarkers; + foreach (QLegendMarker *oldMarker, m_markers) { + // we have marker, which is related to sender. + if (oldMarker->series() == series->q_ptr) { + bool found = false; + foreach(QLegendMarker *newMarker, createdMarkers) { + // New marker considered existing if: + // - d_ptr->relatedObject() is same for both markers. + if (newMarker->d_ptr->relatedObject() == oldMarker->d_ptr->relatedObject()) { + // Delete the new marker, since we already have existing marker, that might be connected on user side. + found = true; + createdMarkers.removeOne(newMarker); + delete newMarker; + } + } + if (!found) { + // No related object found for marker, add to removedMarkers list + removedMarkers << oldMarker; + } } } - // Re-insert createdMarkers into m_markers in correct order. - if (pos != -1 || pos == m_markers.size()) { - m_markers.append(createdMarkers); - } else { - for (int c = createdMarkers.size() - 1; c >= 0; --c) - m_markers.insert(pos, createdMarkers.at(c)); - } + removeMarkers(removedMarkers); + decorateMarkers(createdMarkers); + addMarkers(createdMarkers); q_ptr->layout()->invalidate(); } -// Helper function for marker insertion except m_markers handling -void QLegendPrivate::insertMarkerHelper(QLegendMarker *marker) -{ - LegendMarkerItem *item = marker->d_ptr->item(); - m_items->addToGroup(item); - m_markerHash.insert(item, marker); -} - void QLegendPrivate::addMarkers(QList markers) { foreach (QLegendMarker *marker, markers) { - insertMarkerHelper(marker); + m_items->addToGroup(marker->d_ptr.data()->item()); m_markers << marker; + m_markerHash.insert(marker->d_ptr->item(), marker); } } -// Helper function for marker removal except m_markers handling -void QLegendPrivate::removeMarkerHelper(QLegendMarker *marker) -{ - LegendMarkerItem *item = marker->d_ptr->item(); - item->setVisible(false); - m_items->removeFromGroup(item); - m_markerHash.remove(item); - delete marker; -} - void QLegendPrivate::removeMarkers(QList markers) { foreach (QLegendMarker *marker, markers) { + marker->d_ptr->item()->setVisible(false); + m_items->removeFromGroup(marker->d_ptr->item()); m_markers.removeOne(marker); - removeMarkerHelper(marker); + m_markerHash.remove(marker->d_ptr->item()); + delete marker; } } -void QLegendPrivate::decorateMarker(QLegendMarker *marker) -{ - marker->setFont(m_font); - marker->setLabelBrush(m_labelBrush); -} - void QLegendPrivate::decorateMarkers(QList markers) { - for (QLegendMarker *marker : markers) - decorateMarker(marker); + foreach (QLegendMarker *marker, markers) { + marker->setFont(m_font); + marker->setLabelBrush(m_labelBrush); + } } void QLegendPrivate::updateToolTips() @@ -836,8 +782,7 @@ m->d_ptr->m_item->setToolTip(QString()); } } - -QT_CHARTS_END_NAMESPACE - #include "moc_qlegend.cpp" #include "moc_qlegend_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qlegend.h qtcharts-opensource-src-5.9.5/src/charts/legend/qlegend.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/qlegend.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qlegend.h 2018-03-19 05:05:55.000000000 +0000 @@ -69,7 +69,7 @@ ~QLegend(); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR); void setBrush(const QBrush &brush); QBrush brush() const; @@ -99,7 +99,7 @@ void setBackgroundVisible(bool visible = true); bool isBackgroundVisible() const; - QList markers(QAbstractSeries *series = nullptr) const; + QList markers(QAbstractSeries *series = Q_NULLPTR) const; bool reverseMarkers(); void setReverseMarkers(bool reverseMarkers = true); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qlegendmarker.cpp qtcharts-opensource-src-5.9.5/src/charts/legend/qlegendmarker.cpp --- qtcharts-opensource-src-5.12.5/src/charts/legend/qlegendmarker.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qlegendmarker.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -41,7 +41,7 @@ /*! \class QLegendMarker - \inmodule QtCharts + \inmodule Qt Charts \brief The QLegendMarker class is an abstract object that can be used to access markers within a legend. @@ -352,7 +352,7 @@ m_legend->d_ptr->m_layout->invalidate(); } -QT_CHARTS_END_NAMESPACE - #include "moc_qlegendmarker.cpp" #include "moc_qlegendmarker_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qlegendmarker.h qtcharts-opensource-src-5.9.5/src/charts/legend/qlegendmarker.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/qlegendmarker.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qlegendmarker.h 2018-03-19 05:05:55.000000000 +0000 @@ -63,7 +63,7 @@ Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged) Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged) Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged) - Q_PROPERTY(QtCharts::QLegend::MarkerShape shape READ shape WRITE setShape NOTIFY shapeChanged) + Q_PROPERTY(QLegend::MarkerShape shape READ shape WRITE setShape NOTIFY shapeChanged) Q_ENUMS(LegendMarkerType) public: @@ -105,7 +105,7 @@ void shapeChanged(); protected: - explicit QLegendMarker(QLegendMarkerPrivate &d, QObject *parent = nullptr); + explicit QLegendMarker(QLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); QScopedPointer d_ptr; friend class QLegendPrivate; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qlegendmarker_p.h qtcharts-opensource-src-5.9.5/src/charts/legend/qlegendmarker_p.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/qlegendmarker_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qlegendmarker_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -44,7 +44,6 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE @@ -54,7 +53,7 @@ class QLegendMarker; class LegendMarkerItem; -class QT_CHARTS_PRIVATE_EXPORT QLegendMarkerPrivate : public QObject +class QLegendMarkerPrivate : public QObject { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qlegend_p.h qtcharts-opensource-src-5.9.5/src/charts/legend/qlegend_p.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/qlegend_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qlegend_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,6 @@ #define QLEGEND_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE @@ -50,7 +49,7 @@ class LegendLayout; class QLegendMarker; -class QT_CHARTS_PRIVATE_EXPORT QLegendPrivate : public QObject +class QLegendPrivate : public QObject { Q_OBJECT public: @@ -66,8 +65,6 @@ QList markers(QAbstractSeries *series = 0); qreal maxMarkerWidth() const; - static QObject *relatedObject(const QLegendMarker *l); - public Q_SLOTS: void handleSeriesAdded(QAbstractSeries *series); void handleSeriesRemoved(QAbstractSeries *series); @@ -76,11 +73,8 @@ private: // Internal helpers - void insertMarkerHelper(QLegendMarker *marker); void addMarkers(QList markers); - void removeMarkerHelper(QLegendMarker *marker); void removeMarkers(QList markers); - void decorateMarker(QLegendMarker *marker); void decorateMarkers(QList markers); void updateToolTips(); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qpielegendmarker.cpp qtcharts-opensource-src-5.9.5/src/charts/legend/qpielegendmarker.cpp --- qtcharts-opensource-src-5.12.5/src/charts/legend/qpielegendmarker.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qpielegendmarker.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -36,7 +36,7 @@ /*! \class QPieLegendMarker - \inmodule QtCharts + \inmodule Qt Charts \brief The QPieLegendMarker class is a legend marker for a pie series. A pie legend marker is related to QPieSeries. With a pie series, each slice of the pie @@ -147,7 +147,7 @@ emit q_ptr->penChanged(); } -QT_CHARTS_END_NAMESPACE - #include "moc_qpielegendmarker.cpp" #include "moc_qpielegendmarker_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qpielegendmarker.h qtcharts-opensource-src-5.9.5/src/charts/legend/qpielegendmarker.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/qpielegendmarker.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qpielegendmarker.h 2018-03-19 05:05:55.000000000 +0000 @@ -44,7 +44,7 @@ Q_OBJECT public: - explicit QPieLegendMarker(QPieSeries *series, QPieSlice *slice, QLegend *legend, QObject *parent = nullptr); + explicit QPieLegendMarker(QPieSeries *series, QPieSlice *slice, QLegend *legend, QObject *parent = Q_NULLPTR); virtual ~QPieLegendMarker(); virtual LegendMarkerType type() { return LegendMarkerTypePie; } @@ -54,7 +54,7 @@ QPieSlice* slice(); protected: - QPieLegendMarker(QPieLegendMarkerPrivate &d, QObject *parent = nullptr); + QPieLegendMarker(QPieLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QPieLegendMarker) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qpielegendmarker_p.h qtcharts-opensource-src-5.9.5/src/charts/legend/qpielegendmarker_p.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/qpielegendmarker_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qpielegendmarker_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -44,13 +44,12 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class QPieLegendMarker; -class QT_CHARTS_PRIVATE_EXPORT QPieLegendMarkerPrivate : public QLegendMarkerPrivate +class QPieLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qxylegendmarker.cpp qtcharts-opensource-src-5.9.5/src/charts/legend/qxylegendmarker.cpp --- qtcharts-opensource-src-5.12.5/src/charts/legend/qxylegendmarker.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qxylegendmarker.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -37,7 +37,7 @@ /*! \class QXYLegendMarker - \inmodule QtCharts + \inmodule Qt Charts \brief The QXYLegendMarker class is a legend marker for a line, spline, or scatter series. An XY legend marker is related to QXYSeries derived classes: QLineSeries, QSplineSeries, @@ -156,7 +156,8 @@ emit q_ptr->brushChanged(); } -QT_CHARTS_END_NAMESPACE - #include "moc_qxylegendmarker.cpp" #include "moc_qxylegendmarker_p.cpp" + +QT_CHARTS_END_NAMESPACE + diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qxylegendmarker.h qtcharts-opensource-src-5.9.5/src/charts/legend/qxylegendmarker.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/qxylegendmarker.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qxylegendmarker.h 2018-03-19 05:05:55.000000000 +0000 @@ -42,7 +42,7 @@ { Q_OBJECT public: - explicit QXYLegendMarker(QXYSeries *series, QLegend *legend, QObject *parent = nullptr); + explicit QXYLegendMarker(QXYSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR); virtual ~QXYLegendMarker(); virtual LegendMarkerType type() { return LegendMarkerTypeXY; } @@ -51,7 +51,7 @@ virtual QXYSeries* series(); protected: - QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent = nullptr); + QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QXYLegendMarker) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/legend/qxylegendmarker_p.h qtcharts-opensource-src-5.9.5/src/charts/legend/qxylegendmarker_p.h --- qtcharts-opensource-src-5.12.5/src/charts/legend/qxylegendmarker_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/legend/qxylegendmarker_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,13 +43,12 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class QXYLegendMarker; -class QT_CHARTS_PRIVATE_EXPORT QXYLegendMarkerPrivate : public QLegendMarkerPrivate +class QXYLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/linechart/linechartitem.cpp qtcharts-opensource-src-5.9.5/src/charts/linechart/linechartitem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/linechart/linechartitem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/linechart/linechartitem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -354,18 +354,12 @@ m_pointLabelsVisible = m_series->pointLabelsVisible(); m_pointLabelsFont = m_series->pointLabelsFont(); m_pointLabelsColor = m_series->pointLabelsColor(); - bool labelClippingChanged = m_pointLabelsClipping != m_series->pointLabelsClipping(); m_pointLabelsClipping = m_series->pointLabelsClipping(); if (doGeometryUpdate) updateGeometry(); else if (m_series->useOpenGL() && visibleChanged) refreshGlChart(); - - // Update whole chart in case label clipping changed as labels can be outside series area - if (labelClippingChanged) - m_series->chart()->update(); - else - update(); + update(); } void LineChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) @@ -471,6 +465,6 @@ QGraphicsItem::mouseDoubleClickEvent(event); } -QT_CHARTS_END_NAMESPACE - #include "moc_linechartitem_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/linechart/linechartitem_p.h qtcharts-opensource-src-5.9.5/src/charts/linechart/linechartitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/linechart/linechartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/linechart/linechartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,14 +43,13 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class QLineSeries; class ChartPresenter; -class QT_CHARTS_PRIVATE_EXPORT LineChartItem : public XYChart +class LineChartItem : public XYChart { Q_OBJECT Q_INTERFACES(QGraphicsItem) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/linechart/qlineseries.cpp qtcharts-opensource-src-5.9.5/src/charts/linechart/qlineseries.cpp --- qtcharts-opensource-src-5.12.5/src/charts/linechart/qlineseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/linechart/qlineseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -37,7 +37,7 @@ /*! \class QLineSeries - \inmodule QtCharts + \inmodule Qt Charts \brief The QLineSeries class presents data in line charts. A line chart is used to show information as a series of data points @@ -188,6 +188,6 @@ } } -QT_CHARTS_END_NAMESPACE - #include "moc_qlineseries.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/linechart/qlineseries.h qtcharts-opensource-src-5.9.5/src/charts/linechart/qlineseries.h --- qtcharts-opensource-src-5.12.5/src/charts/linechart/qlineseries.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/linechart/qlineseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,12 +43,12 @@ Q_OBJECT public: - explicit QLineSeries(QObject *parent = nullptr); + explicit QLineSeries(QObject *parent = Q_NULLPTR); ~QLineSeries(); QAbstractSeries::SeriesType type() const; protected: - QLineSeries(QLineSeriesPrivate &d, QObject *parent = nullptr); + QLineSeries(QLineSeriesPrivate &d, QObject *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QLineSeries) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/linechart/qlineseries_p.h qtcharts-opensource-src-5.9.5/src/charts/linechart/qlineseries_p.h --- qtcharts-opensource-src-5.12.5/src/charts/linechart/qlineseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/linechart/qlineseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,12 +40,11 @@ #define QLINESERIES_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QLineSeriesPrivate: public QXYSeriesPrivate +class QLineSeriesPrivate: public QXYSeriesPrivate { public: QLineSeriesPrivate(QLineSeries *q); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/piechartitem.cpp qtcharts-opensource-src-5.9.5/src/charts/piechart/piechartitem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/piechart/piechartitem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/piechartitem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -271,6 +271,6 @@ return sliceData; } -QT_CHARTS_END_NAMESPACE - #include "moc_piechartitem_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/piechartitem_p.h qtcharts-opensource-src-5.9.5/src/charts/piechart/piechartitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/piechart/piechartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/piechartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,7 +43,6 @@ #include #include #include -#include QT_BEGIN_NAMESPACE class QGraphicsItem; @@ -54,7 +53,7 @@ class ChartPresenter; class PieAnimation; -class QT_CHARTS_PRIVATE_EXPORT PieChartItem : public ChartItem +class PieChartItem : public ChartItem { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/piesliceitem.cpp qtcharts-opensource-src-5.9.5/src/charts/piechart/piesliceitem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/piechart/piesliceitem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/piesliceitem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -43,8 +43,8 @@ QPointF offset(qreal angle, qreal length) { - qreal dx = qSin(qDegreesToRadians(angle)) * length; - qreal dy = qCos(qDegreesToRadians(angle)) * length; + qreal dx = qSin(angle * (M_PI / 180)) * length; + qreal dy = qCos(angle * (M_PI / 180)) * length; return QPointF(dx, -dy); } @@ -339,6 +339,7 @@ return path; } +#include "moc_piesliceitem_p.cpp" + QT_CHARTS_END_NAMESPACE -#include "moc_piesliceitem_p.cpp" diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/piesliceitem_p.h qtcharts-opensource-src-5.9.5/src/charts/piechart/piesliceitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/piechart/piesliceitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/piesliceitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -56,7 +55,7 @@ class PieSliceLabel; class QPieSlice; -class QT_CHARTS_PRIVATE_EXPORT PieSliceItem : public QGraphicsObject +class PieSliceItem : public QGraphicsObject { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/qhpiemodelmapper.cpp qtcharts-opensource-src-5.9.5/src/charts/piechart/qhpiemodelmapper.cpp --- qtcharts-opensource-src-5.12.5/src/charts/piechart/qhpiemodelmapper.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/qhpiemodelmapper.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -33,7 +33,7 @@ /*! \class QHPieModelMapper - \inmodule QtCharts + \inmodule Qt Charts \brief The QHPieModelMapper is a horizontal model mapper for pie series. Model mappers enable using a data model derived from the QAbstractItemModel class @@ -277,6 +277,6 @@ } } -QT_CHARTS_END_NAMESPACE - #include "moc_qhpiemodelmapper.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/qhpiemodelmapper.h qtcharts-opensource-src-5.9.5/src/charts/piechart/qhpiemodelmapper.h --- qtcharts-opensource-src-5.12.5/src/charts/piechart/qhpiemodelmapper.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/qhpiemodelmapper.h 2018-03-19 05:05:55.000000000 +0000 @@ -37,7 +37,7 @@ class QT_CHARTS_EXPORT QHPieModelMapper : public QPieModelMapper { Q_OBJECT - Q_PROPERTY(QtCharts::QPieSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) + Q_PROPERTY(QPieSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced) Q_PROPERTY(int valuesRow READ valuesRow WRITE setValuesRow NOTIFY valuesRowChanged) Q_PROPERTY(int labelsRow READ labelsRow WRITE setLabelsRow NOTIFY labelsRowChanged) @@ -45,7 +45,7 @@ Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount NOTIFY columnCountChanged) public: - explicit QHPieModelMapper(QObject *parent = nullptr); + explicit QHPieModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/qpiemodelmapper.cpp qtcharts-opensource-src-5.9.5/src/charts/piechart/qpiemodelmapper.cpp --- qtcharts-opensource-src-5.12.5/src/charts/piechart/qpiemodelmapper.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/qpiemodelmapper.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -572,7 +572,7 @@ blockSeriesSignals(false); } -QT_CHARTS_END_NAMESPACE - #include "moc_qpiemodelmapper_p.cpp" #include "moc_qpiemodelmapper.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/qpiemodelmapper.h qtcharts-opensource-src-5.9.5/src/charts/piechart/qpiemodelmapper.h --- qtcharts-opensource-src-5.12.5/src/charts/piechart/qpiemodelmapper.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/qpiemodelmapper.h 2018-03-19 05:05:55.000000000 +0000 @@ -47,7 +47,7 @@ Q_OBJECT protected: - explicit QPieModelMapper(QObject *parent = nullptr); + explicit QPieModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/qpiemodelmapper_p.h qtcharts-opensource-src-5.9.5/src/charts/piechart/qpiemodelmapper_p.h --- qtcharts-opensource-src-5.12.5/src/charts/piechart/qpiemodelmapper_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/qpiemodelmapper_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,7 +41,6 @@ #include #include -#include QT_BEGIN_NAMESPACE class QModelIndex; @@ -51,7 +50,7 @@ class QPieSlice; -class QT_CHARTS_PRIVATE_EXPORT QPieModelMapperPrivate : public QObject +class QPieModelMapperPrivate : public QObject { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/qpieseries.cpp qtcharts-opensource-src-5.9.5/src/charts/piechart/qpieseries.cpp --- qtcharts-opensource-src-5.12.5/src/charts/piechart/qpieseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/qpieseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -44,7 +44,7 @@ /*! \class QPieSeries - \inmodule QtCharts + \inmodule Qt Charts \brief The QPieSeries class presents data in pie charts. A pie series consists of slices that are defined as QPieSlice objects. @@ -1067,7 +1067,8 @@ } } -QT_CHARTS_END_NAMESPACE #include "moc_qpieseries.cpp" #include "moc_qpieseries_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/qpieseries.h qtcharts-opensource-src-5.9.5/src/charts/piechart/qpieseries.h --- qtcharts-opensource-src-5.12.5/src/charts/piechart/qpieseries.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/qpieseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -49,7 +49,7 @@ Q_PROPERTY(qreal holeSize READ holeSize WRITE setHoleSize) public: - explicit QPieSeries(QObject *parent = nullptr); + explicit QPieSeries(QObject *parent = Q_NULLPTR); virtual ~QPieSeries(); QAbstractSeries::SeriesType type() const; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/qpieseries_p.h qtcharts-opensource-src-5.9.5/src/charts/piechart/qpieseries_p.h --- qtcharts-opensource-src-5.12.5/src/charts/piechart/qpieseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/qpieseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,12 +41,11 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class QLegendPrivate; -class QT_CHARTS_PRIVATE_EXPORT QPieSeriesPrivate : public QAbstractSeriesPrivate +class QPieSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/qpieslice.cpp qtcharts-opensource-src-5.9.5/src/charts/piechart/qpieslice.cpp --- qtcharts-opensource-src-5.12.5/src/charts/piechart/qpieslice.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/qpieslice.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -34,7 +34,7 @@ /*! \class QPieSlice - \inmodule QtCharts + \inmodule Qt Charts \brief The QPieSlice class represents a single slice in a pie series. A pie slice has a value and a label. When the slice is added to a pie series, the @@ -838,6 +838,5 @@ QT_CHARTS_END_NAMESPACE QT_CHARTS_USE_NAMESPACE - #include "moc_qpieslice.cpp" #include "moc_qpieslice_p.cpp" diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/qpieslice.h qtcharts-opensource-src-5.9.5/src/charts/piechart/qpieslice.h --- qtcharts-opensource-src-5.12.5/src/charts/piechart/qpieslice.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/qpieslice.h 2018-03-19 05:05:55.000000000 +0000 @@ -72,8 +72,8 @@ }; public: - explicit QPieSlice(QObject *parent = nullptr); - QPieSlice(QString label, qreal value, QObject *parent = nullptr); + explicit QPieSlice(QObject *parent = Q_NULLPTR); + QPieSlice(QString label, qreal value, QObject *parent = Q_NULLPTR); virtual ~QPieSlice(); void setLabel(QString label); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/qpieslice_p.h qtcharts-opensource-src-5.9.5/src/charts/piechart/qpieslice_p.h --- qtcharts-opensource-src-5.12.5/src/charts/piechart/qpieslice_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/qpieslice_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -42,12 +42,11 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class QPieSeries; -class QT_CHARTS_PRIVATE_EXPORT QPieSlicePrivate : public QObject +class QPieSlicePrivate : public QObject { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/qvpiemodelmapper.cpp qtcharts-opensource-src-5.9.5/src/charts/piechart/qvpiemodelmapper.cpp --- qtcharts-opensource-src-5.12.5/src/charts/piechart/qvpiemodelmapper.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/qvpiemodelmapper.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -33,7 +33,7 @@ /*! \class QVPieModelMapper - \inmodule QtCharts + \inmodule Qt Charts \brief The QVPieModelMapper is a vertical model mapper for pie series. Model mappers enable using a data model derived from the QAbstractItemModel class @@ -281,6 +281,6 @@ } } -QT_CHARTS_END_NAMESPACE - #include "moc_qvpiemodelmapper.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/piechart/qvpiemodelmapper.h qtcharts-opensource-src-5.9.5/src/charts/piechart/qvpiemodelmapper.h --- qtcharts-opensource-src-5.12.5/src/charts/piechart/qvpiemodelmapper.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/piechart/qvpiemodelmapper.h 2018-03-19 05:05:55.000000000 +0000 @@ -37,7 +37,7 @@ class QT_CHARTS_EXPORT QVPieModelMapper : public QPieModelMapper { Q_OBJECT - Q_PROPERTY(QtCharts::QPieSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) + Q_PROPERTY(QPieSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced) Q_PROPERTY(int valuesColumn READ valuesColumn WRITE setValuesColumn NOTIFY valuesColumnChanged) Q_PROPERTY(int labelsColumn READ labelsColumn WRITE setLabelsColumn NOTIFY labelsColumnChanged) @@ -45,7 +45,7 @@ Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged) public: - explicit QVPieModelMapper(QObject *parent = nullptr); + explicit QVPieModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/qabstractseries.cpp qtcharts-opensource-src-5.9.5/src/charts/qabstractseries.cpp --- qtcharts-opensource-src-5.12.5/src/charts/qabstractseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/qabstractseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -42,7 +42,7 @@ /*! \class QAbstractSeries - \inmodule QtCharts + \inmodule Qt Charts \brief The QAbstractSeries class is a base class for all Qt Chart series. Usually, the series type specific inherited classes are used instead of the base class. @@ -477,7 +477,9 @@ q_ptr->setUseOpenGL(false); } -QT_CHARTS_END_NAMESPACE - #include "moc_qabstractseries.cpp" #include "moc_qabstractseries_p.cpp" + +QT_CHARTS_END_NAMESPACE + + diff -Nru qtcharts-opensource-src-5.12.5/src/charts/qabstractseries_p.h qtcharts-opensource-src-5.9.5/src/charts/qabstractseries_p.h --- qtcharts-opensource-src-5.12.5/src/charts/qabstractseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/qabstractseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -42,7 +42,6 @@ #include #include #include -#include QT_BEGIN_NAMESPACE class QGraphicsItem; @@ -62,7 +61,7 @@ class ChartItem; class BoxPlotChartItem; -class QT_CHARTS_PRIVATE_EXPORT QAbstractSeriesPrivate : public QObject +class QAbstractSeriesPrivate : public QObject { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/qchart.cpp qtcharts-opensource-src-5.9.5/src/charts/qchart.cpp --- qtcharts-opensource-src-5.12.5/src/charts/qchart.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/qchart.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -103,7 +103,7 @@ /*! \class QChart - \inmodule QtCharts + \inmodule Qt Charts \brief The QChart class manages the graphical representation of the chart's series, legends, and axes. @@ -223,9 +223,7 @@ \property QChart::plotArea \brief The rectangle within which the chart is drawn. - The plot area does not include the area defined by margins. By default this will resize if inside - a QChartView. If an explicit size is set for the plot area then it will respect this, to revert - back to the default behavior, then calling \c{setPlotArea(QRectF());} will achieve this. + The plot area does not include the area defined by margins. */ /*! @@ -401,8 +399,6 @@ /*! Zooms into the view to a maximum level at which the rectangle \a rect is still fully visible. - \note Applying a zoom may modify properties of attached axes, for instance QAbstractAxis::min - and QAbstractAxis::max. \note This is not supported for polar charts. */ void QChart::zoomIn(const QRectF &rect) @@ -465,9 +461,6 @@ } /*! - \deprecated - Use axes() instead. - Returns a pointer to the horizontal axis attached to the specified \a series. If no series is specified, the first horizontal axis added to the chart is returned. @@ -482,9 +475,6 @@ } /*! - \deprecated - Use axes() instead. - Returns a pointer to the vertical axis attached to the specified \a series. If no series is specified, the first vertical axis added to the chart is returned. @@ -502,7 +492,6 @@ Returns the axes attached to the series \a series with the orientation specified by \a orientation. If no series is specified, all axes added to the chart with the specified orientation are returned. - \sa addAxis(), createDefaultAxes() */ QList QChart::axes(Qt::Orientations orientation, QAbstractSeries *series) const @@ -536,8 +525,8 @@ \table \header \li Series type - \li Horizontal axis (X) - \li Vertical axis (Y) + \li X-axis + \li Y-axis \row \li QXYSeries \li QValueAxis @@ -559,7 +548,7 @@ as the parameter for the axes() function call. QPieSeries does not create any axes. - \sa axes(), QAbstractSeries::attachAxis() + \sa axisX(), axisY(), axes(), setAxisX(), setAxisY(), QAbstractSeries::attachAxis() */ void QChart::createDefaultAxes() { @@ -594,11 +583,6 @@ return d_ptr->m_presenter->geometry(); } -void QChart::setPlotArea(const QRectF &rect) -{ - d_ptr->m_presenter->setFixedGeometry(rect); -} - /*! Sets the brush used to fill the background of the plot area of the chart to \a brush. @@ -750,9 +734,6 @@ } /*! - \deprecated - Use addAxis() instead. - Adds the axis \a axis to the chart and attaches it to the series \a series as a bottom-aligned horizontal axis. The chart takes ownership of both the axis and the series. @@ -775,9 +756,6 @@ } /*! - \deprecated - Use addAxis() instead. - Adds the axis \a axis to the chart and attaches it to the series \a series as a left-aligned vertical axis. The chart takes ownership of both the axis and the series. @@ -964,6 +942,6 @@ m_presenter->setState(ChartPresenter::ShowState,QPointF()); } -QT_CHARTS_END_NAMESPACE - #include "moc_qchart.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/qchartglobal.h qtcharts-opensource-src-5.9.5/src/charts/qchartglobal.h --- qtcharts-opensource-src-5.12.5/src/charts/qchartglobal.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/qchartglobal.h 2018-03-19 05:05:55.000000000 +0000 @@ -54,9 +54,7 @@ #define QT_CHARTS_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT -#ifndef Q_CLANG_QDOC #define QT_CHARTS_NAMESPACE QtCharts -#endif #ifdef QT_CHARTS_NAMESPACE # define QT_CHARTS_BEGIN_NAMESPACE namespace QT_CHARTS_NAMESPACE { diff -Nru qtcharts-opensource-src-5.12.5/src/charts/qchartglobal_p.h qtcharts-opensource-src-5.9.5/src/charts/qchartglobal_p.h --- qtcharts-opensource-src-5.12.5/src/charts/qchartglobal_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/qchartglobal_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QCHARTGLOBAL_P_H -#define QCHARTGLOBAL_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include "qchartglobal.h" - -#define QT_CHARTS_PRIVATE_EXPORT QT_CHARTS_EXPORT - -#endif // QCHARTGLOBAL_P_H diff -Nru qtcharts-opensource-src-5.12.5/src/charts/qchart.h qtcharts-opensource-src-5.9.5/src/charts/qchart.h --- qtcharts-opensource-src-5.12.5/src/charts/qchart.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/qchart.h 2018-03-19 05:05:55.000000000 +0000 @@ -63,7 +63,7 @@ Q_PROPERTY(bool plotAreaBackgroundVisible READ isPlotAreaBackgroundVisible WRITE setPlotAreaBackgroundVisible) Q_PROPERTY(bool localizeNumbers READ localizeNumbers WRITE setLocalizeNumbers) Q_PROPERTY(QLocale locale READ locale WRITE setLocale) - Q_PROPERTY(QRectF plotArea READ plotArea WRITE setPlotArea NOTIFY plotAreaChanged) + Q_PROPERTY(QRectF plotArea READ plotArea NOTIFY plotAreaChanged) Q_ENUMS(ChartTheme) Q_ENUMS(AnimationOption) Q_ENUMS(ChartType) @@ -96,7 +96,7 @@ Q_DECLARE_FLAGS(AnimationOptions, AnimationOption) public: - explicit QChart(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = Qt::WindowFlags()); + explicit QChart(QGraphicsItem *parent = Q_NULLPTR, Qt::WindowFlags wFlags = Qt::WindowFlags()); ~QChart(); void addSeries(QAbstractSeries *series); @@ -104,14 +104,16 @@ void removeAllSeries(); QList series() const; - Q_DECL_DEPRECATED void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = nullptr); - Q_DECL_DEPRECATED void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = nullptr); - Q_DECL_DEPRECATED QAbstractAxis *axisX(QAbstractSeries *series = nullptr) const; - Q_DECL_DEPRECATED QAbstractAxis *axisY(QAbstractSeries *series = nullptr) const; + // *** deprecated *** + void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = Q_NULLPTR); + void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = Q_NULLPTR); + QAbstractAxis *axisX(QAbstractSeries *series = Q_NULLPTR) const; + QAbstractAxis *axisY(QAbstractSeries *series = Q_NULLPTR) const; + // ****************** void addAxis(QAbstractAxis *axis, Qt::Alignment alignment); void removeAxis(QAbstractAxis *axis); - QList axes(Qt::Orientations orientation = Qt::Horizontal|Qt::Vertical, QAbstractSeries *series = nullptr) const; + QList axes(Qt::Orientations orientation = Qt::Horizontal|Qt::Vertical, QAbstractSeries *series = Q_NULLPTR) const; void createDefaultAxes(); @@ -160,7 +162,6 @@ QMargins margins() const; QRectF plotArea() const; - void setPlotArea(const QRectF &rect); void setPlotAreaBackgroundBrush(const QBrush &brush); QBrush plotAreaBackgroundBrush() const; void setPlotAreaBackgroundPen(const QPen &pen); @@ -172,8 +173,8 @@ void setLocale(const QLocale &locale); QLocale locale() const; - QPointF mapToValue(const QPointF &position, QAbstractSeries *series = nullptr); - QPointF mapToPosition(const QPointF &value, QAbstractSeries *series = nullptr); + QPointF mapToValue(const QPointF &position, QAbstractSeries *series = Q_NULLPTR); + QPointF mapToPosition(const QPointF &value, QAbstractSeries *series = Q_NULLPTR); ChartType chartType() const; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/qchart_p.h qtcharts-opensource-src-5.9.5/src/charts/qchart_p.h --- qtcharts-opensource-src-5.12.5/src/charts/qchart_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/qchart_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,7 +41,6 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE @@ -50,7 +49,7 @@ class QLegend; class ChartDataSet; -class QT_CHARTS_PRIVATE_EXPORT QChartPrivate +class QChartPrivate { public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/qchartview.cpp qtcharts-opensource-src-5.9.5/src/charts/qchartview.cpp --- qtcharts-opensource-src-5.12.5/src/charts/qchartview.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/qchartview.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -54,7 +54,7 @@ /*! \class QChartView - \inmodule QtCharts + \inmodule Qt Charts \brief The QChartView is a standalone widget that can display charts. A chart view does not require a QGraphicsScene object to work. To display @@ -130,7 +130,7 @@ if (!d_ptr->m_rubberBandFlags) { delete d_ptr->m_rubberBand; - d_ptr->m_rubberBand = nullptr; + d_ptr->m_rubberBand = 0; return; } @@ -277,7 +277,7 @@ m_scene(new QGraphicsScene(q)), m_chart(chart), #ifndef QT_NO_RUBBERBAND - m_rubberBand(nullptr), + m_rubberBand(0), #endif m_rubberBandFlags(QChartView::NoRubberBand) { @@ -331,11 +331,10 @@ } m_chart->resize(chartSize); - q_ptr->setMinimumSize(m_chart->minimumSize().toSize().expandedTo(q_ptr->minimumSize())); - q_ptr->setMaximumSize(q_ptr->maximumSize().boundedTo(m_chart->maximumSize().toSize())); + q_ptr->setMinimumSize(m_chart->minimumSize().toSize()); q_ptr->setSceneRect(m_chart->geometry()); } -QT_CHARTS_END_NAMESPACE - #include "moc_qchartview.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/qchartview.h qtcharts-opensource-src-5.9.5/src/charts/qchartview.h --- qtcharts-opensource-src-5.12.5/src/charts/qchartview.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/qchartview.h 2018-03-19 05:05:55.000000000 +0000 @@ -59,8 +59,8 @@ Q_DECLARE_FLAGS(RubberBands, RubberBand) - explicit QChartView(QWidget *parent = nullptr); - explicit QChartView(QChart *chart, QWidget *parent = nullptr); + explicit QChartView(QWidget *parent = Q_NULLPTR); + explicit QChartView(QChart *chart, QWidget *parent = Q_NULLPTR); ~QChartView(); void setRubberBand(const RubberBands &rubberBands); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/qchartview_p.h qtcharts-opensource-src-5.9.5/src/charts/qchartview_p.h --- qtcharts-opensource-src-5.12.5/src/charts/qchartview_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/qchartview_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,6 @@ #define QCHARTVIEW_P_H #include -#include QT_BEGIN_NAMESPACE class QGraphicsScene; @@ -52,7 +51,7 @@ class ChartPresenter; class QChartView; -class QT_CHARTS_PRIVATE_EXPORT QChartViewPrivate +class QChartViewPrivate { public: explicit QChartViewPrivate(QChartView *q, QChart *chart = 0); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/qpolarchart.cpp qtcharts-opensource-src-5.9.5/src/charts/qpolarchart.cpp --- qtcharts-opensource-src-5.12.5/src/charts/qpolarchart.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/qpolarchart.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -46,7 +46,7 @@ /*! \class QPolarChart - \inmodule QtCharts + \inmodule Qt Charts \brief The QPolarChart presents data in polar charts. Polar charts present data in a circular graph, where the placement of data @@ -145,6 +145,6 @@ return PolarOrientationRadial; } -QT_CHARTS_END_NAMESPACE - #include "moc_qpolarchart.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/qpolarchart.h qtcharts-opensource-src-5.9.5/src/charts/qpolarchart.h --- qtcharts-opensource-src-5.12.5/src/charts/qpolarchart.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/qpolarchart.h 2018-03-19 05:05:55.000000000 +0000 @@ -51,12 +51,12 @@ Q_DECLARE_FLAGS(PolarOrientations, PolarOrientation) public: - explicit QPolarChart(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = Qt::WindowFlags()); + explicit QPolarChart(QGraphicsItem *parent = Q_NULLPTR, Qt::WindowFlags wFlags = Qt::WindowFlags()); ~QPolarChart(); void addAxis(QAbstractAxis *axis, PolarOrientation polarOrientation); - QList axes(PolarOrientations polarOrientation = PolarOrientations(PolarOrientationRadial | PolarOrientationAngular), QAbstractSeries *series = nullptr) const; + QList axes(PolarOrientations polarOrientation = PolarOrientations(PolarOrientationRadial | PolarOrientationAngular), QAbstractSeries *series = Q_NULLPTR) const; static PolarOrientation axisPolarOrientation(QAbstractAxis *axis); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/scatterchart/qscatterseries.cpp qtcharts-opensource-src-5.9.5/src/charts/scatterchart/qscatterseries.cpp --- qtcharts-opensource-src-5.12.5/src/charts/scatterchart/qscatterseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/scatterchart/qscatterseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -37,7 +37,7 @@ /*! \class QScatterSeries - \inmodule QtCharts + \inmodule Qt Charts \brief The QScatterSeries class presents data in scatter charts. The scatter data is displayed as a collection of points on the chart. For @@ -376,6 +376,6 @@ QAbstractSeriesPrivate::initializeAnimations(options, duration, curve); } -QT_CHARTS_END_NAMESPACE - #include "moc_qscatterseries.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/scatterchart/qscatterseries.h qtcharts-opensource-src-5.9.5/src/charts/scatterchart/qscatterseries.h --- qtcharts-opensource-src-5.12.5/src/charts/scatterchart/qscatterseries.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/scatterchart/qscatterseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -54,7 +54,7 @@ }; public: - explicit QScatterSeries(QObject *parent = nullptr); + explicit QScatterSeries(QObject *parent = Q_NULLPTR); ~QScatterSeries(); QAbstractSeries::SeriesType type() const; void setPen(const QPen &pen); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/scatterchart/qscatterseries_p.h qtcharts-opensource-src-5.9.5/src/charts/scatterchart/qscatterseries_p.h --- qtcharts-opensource-src-5.12.5/src/charts/scatterchart/qscatterseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/scatterchart/qscatterseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,11 +40,10 @@ #define QSCATTERSERIES_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QScatterSeriesPrivate: public QXYSeriesPrivate +class QScatterSeriesPrivate: public QXYSeriesPrivate { public: QScatterSeriesPrivate(QScatterSeries *q); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/scatterchart/scatterchartitem.cpp qtcharts-opensource-src-5.9.5/src/charts/scatterchart/scatterchartitem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/scatterchart/scatterchartitem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/scatterchart/scatterchartitem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -273,7 +273,6 @@ m_pointLabelsVisible = m_series->pointLabelsVisible(); m_pointLabelsFont = m_series->pointLabelsFont(); m_pointLabelsColor = m_series->pointLabelsColor(); - bool labelClippingChanged = m_pointLabelsClipping != m_series->pointLabelsClipping(); m_pointLabelsClipping = m_series->pointLabelsClipping(); if (recreate) { @@ -286,13 +285,9 @@ setPen(m_series->pen()); setBrush(m_series->brush()); - // Update whole chart in case label clipping changed as labels can be outside series area - if (labelClippingChanged) - m_series->chart()->update(); - else - update(); + update(); } -QT_CHARTS_END_NAMESPACE - #include "moc_scatterchartitem_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/scatterchart/scatterchartitem_p.h qtcharts-opensource-src-5.9.5/src/charts/scatterchart/scatterchartitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/scatterchart/scatterchartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/scatterchart/scatterchartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -44,13 +44,12 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class QScatterSeries; -class QT_CHARTS_PRIVATE_EXPORT ScatterChartItem : public XYChart +class ScatterChartItem : public XYChart { Q_OBJECT Q_INTERFACES(QGraphicsItem) @@ -103,7 +102,7 @@ bool m_mousePressed; }; -class QT_CHARTS_PRIVATE_EXPORT CircleMarker: public QGraphicsEllipseItem +class CircleMarker: public QGraphicsEllipseItem { public: @@ -150,7 +149,7 @@ ScatterChartItem *m_parent; }; -class QT_CHARTS_PRIVATE_EXPORT RectangleMarker: public QGraphicsRectItem +class RectangleMarker: public QGraphicsRectItem { public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/scroller.cpp qtcharts-opensource-src-5.9.5/src/charts/scroller.cpp --- qtcharts-opensource-src-5.12.5/src/charts/scroller.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/scroller.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -220,6 +220,6 @@ m_scroller->scrollTick(); } -QT_CHARTS_END_NAMESPACE - #include "moc_scroller_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/scroller_p.h qtcharts-opensource-src-5.9.5/src/charts/scroller_p.h --- qtcharts-opensource-src-5.12.5/src/charts/scroller_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/scroller_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -44,7 +44,6 @@ #include #include #include -#include QT_BEGIN_NAMESPACE class QGraphicsSceneMouseEvent; @@ -55,7 +54,7 @@ class Scroller; class QLegend; -class QT_CHARTS_PRIVATE_EXPORT ScrollTicker : public QObject +class ScrollTicker : public QObject { Q_OBJECT public: @@ -70,7 +69,7 @@ Scroller *m_scroller; }; -class QT_CHARTS_PRIVATE_EXPORT Scroller +class Scroller { public: enum State { diff -Nru qtcharts-opensource-src-5.12.5/src/charts/splinechart/qsplineseries.cpp qtcharts-opensource-src-5.9.5/src/charts/splinechart/qsplineseries.cpp --- qtcharts-opensource-src-5.12.5/src/charts/splinechart/qsplineseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/splinechart/qsplineseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -37,7 +37,7 @@ /*! \class QSplineSeries - \inmodule QtCharts + \inmodule Qt Charts \brief The QSplineSeries class presents data as spline charts. A spline series stores the data points and the segment control points needed @@ -185,7 +185,7 @@ QAbstractSeriesPrivate::initializeAnimations(options, duration, curve); } -QT_CHARTS_END_NAMESPACE - #include "moc_qsplineseries.cpp" #include "moc_qsplineseries_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/splinechart/qsplineseries.h qtcharts-opensource-src-5.9.5/src/charts/splinechart/qsplineseries.h --- qtcharts-opensource-src-5.12.5/src/charts/splinechart/qsplineseries.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/splinechart/qsplineseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -45,7 +45,7 @@ Q_OBJECT public: - explicit QSplineSeries(QObject *parent = nullptr); + explicit QSplineSeries(QObject *parent = Q_NULLPTR); ~QSplineSeries(); QAbstractSeries::SeriesType type() const; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/splinechart/qsplineseries_p.h qtcharts-opensource-src-5.9.5/src/charts/splinechart/qsplineseries_p.h --- qtcharts-opensource-src-5.12.5/src/charts/splinechart/qsplineseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/splinechart/qsplineseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,12 +40,11 @@ #define QSPLINESERIES_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QSplineSeriesPrivate: public QLineSeriesPrivate +class QSplineSeriesPrivate: public QLineSeriesPrivate { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/splinechart/splinechartitem.cpp qtcharts-opensource-src-5.9.5/src/charts/splinechart/splinechartitem.cpp --- qtcharts-opensource-src-5.12.5/src/charts/splinechart/splinechartitem.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/splinechart/splinechartitem.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -427,13 +427,8 @@ m_pointLabelsVisible = m_series->pointLabelsVisible(); m_pointLabelsFont = m_series->pointLabelsFont(); m_pointLabelsColor = m_series->pointLabelsColor(); - bool labelClippingChanged = m_pointLabelsClipping != m_series->pointLabelsClipping(); m_pointLabelsClipping = m_series->pointLabelsClipping(); - // Update whole chart in case label clipping changed as labels can be outside series area - if (labelClippingChanged) - m_series->chart()->update(); - else - update(); + update(); } //painter @@ -521,6 +516,6 @@ QGraphicsItem::mouseDoubleClickEvent(event); } -QT_CHARTS_END_NAMESPACE - #include "moc_splinechartitem_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/splinechart/splinechartitem_p.h qtcharts-opensource-src-5.9.5/src/charts/splinechart/splinechartitem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/splinechart/splinechartitem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/splinechart/splinechartitem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -41,13 +41,12 @@ #include #include -#include QT_CHARTS_BEGIN_NAMESPACE class SplineAnimation; -class QT_CHARTS_PRIVATE_EXPORT SplineChartItem : public XYChart +class SplineChartItem : public XYChart { Q_OBJECT Q_INTERFACES(QGraphicsItem) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemebluecerulean_p.h qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemebluecerulean_p.h --- qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemebluecerulean_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemebluecerulean_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,11 +40,10 @@ #define CHARTTHEMEBLUECERULEAN_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeBlueCerulean: public ChartTheme +class ChartThemeBlueCerulean: public ChartTheme { public: ChartThemeBlueCerulean() : ChartTheme(QChart::ChartThemeBlueCerulean) { diff -Nru qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemeblueicy_p.h qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemeblueicy_p.h --- qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemeblueicy_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemeblueicy_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,11 +40,10 @@ #define CHARTTHEMEBLUEICY_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeBlueIcy: public ChartTheme +class ChartThemeBlueIcy: public ChartTheme { public: ChartThemeBlueIcy() : ChartTheme(QChart::ChartThemeBlueIcy) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemebluencs_p.h qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemebluencs_p.h --- qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemebluencs_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemebluencs_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,11 +40,10 @@ #define CHARTTHEMEBLUENCS_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeBlueNcs: public ChartTheme +class ChartThemeBlueNcs: public ChartTheme { public: ChartThemeBlueNcs() : ChartTheme(QChart::ChartThemeBlueNcs) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemebrownsand_p.h qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemebrownsand_p.h --- qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemebrownsand_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemebrownsand_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,11 +40,10 @@ #define CHARTTHEMEBROWNSAND_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeBrownSand: public ChartTheme +class ChartThemeBrownSand: public ChartTheme { public: ChartThemeBrownSand() : ChartTheme(QChart::ChartThemeBrownSand) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemedark_p.h qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemedark_p.h --- qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemedark_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemedark_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,11 +40,10 @@ #define CHARTTHEMEDARK_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeDark : public ChartTheme +class ChartThemeDark : public ChartTheme { public: ChartThemeDark() : ChartTheme(QChart::ChartThemeDark) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemehighcontrast_p.h qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemehighcontrast_p.h --- qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemehighcontrast_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemehighcontrast_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,11 +40,10 @@ #define CHARTTHEMEHIGHCONTRAST_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeHighContrast : public ChartTheme +class ChartThemeHighContrast : public ChartTheme { public: ChartThemeHighContrast() : ChartTheme(QChart::ChartThemeHighContrast) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemelight_p.h qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemelight_p.h --- qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemelight_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemelight_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,11 +40,10 @@ #define CHARTTHEMELIGHT_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeLight: public ChartTheme +class ChartThemeLight: public ChartTheme { public: ChartThemeLight() : ChartTheme(QChart::ChartThemeLight) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/themes/charttheme_p.h qtcharts-opensource-src-5.9.5/src/charts/themes/charttheme_p.h --- qtcharts-opensource-src-5.12.5/src/charts/themes/charttheme_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/themes/charttheme_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -42,11 +42,10 @@ #include #include #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartTheme +class ChartTheme { public: diff -Nru qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemeqt_p.h qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemeqt_p.h --- qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemeqt_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemeqt_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,11 +40,10 @@ #define CHARTTHEMEQT_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeQt : public ChartTheme +class ChartThemeQt : public ChartTheme { public: ChartThemeQt() : ChartTheme(QChart::ChartThemeQt) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemesystem_p.h qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemesystem_p.h --- qtcharts-opensource-src-5.12.5/src/charts/themes/chartthemesystem_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/themes/chartthemesystem_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,6 @@ #define CHARTTHEMESYSTEM_P_H #include -#include #ifdef Q_OS_WIN #include #include @@ -48,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeSystem: public ChartTheme +class ChartThemeSystem: public ChartTheme { public: // System theme not used at the moment (the user is not able to select this theme) diff -Nru qtcharts-opensource-src-5.12.5/src/charts/xychart/glxyseriesdata.cpp qtcharts-opensource-src-5.9.5/src/charts/xychart/glxyseriesdata.cpp --- qtcharts-opensource-src-5.12.5/src/charts/xychart/glxyseriesdata.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/xychart/glxyseriesdata.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -117,26 +117,20 @@ data->min = QVector2D(0, 0); data->delta = QVector2D(domain->size().width() / 2.0f, domain->size().height() / 2.0f); } else { - // Regular value axes, so we can optimize it a bit. + // Regular value axes, so we can do the math easily on shaders. if (reverseX) matrix.scale(-1.0, 1.0); if (reverseY) matrix.scale(1.0, -1.0); - - const qreal mx = domain->minX(); - const qreal my = domain->minY(); - const qreal xd = domain->maxX() - mx; - const qreal yd = domain->maxY() - my; - - if (!qFuzzyIsNull(xd) && !qFuzzyIsNull(yd)) { - const QVector seriesPoints = series->pointsVector(); - for (const QPointF &point : seriesPoints) { - array[index++] = float((point.x() - mx) / xd); - array[index++] = float((point.y() - my) / yd); - } + QVector seriesPoints = series->pointsVector(); + for (int i = 0; i < count; i++) { + const QPointF &point = seriesPoints.at(i); + array[index++] = float(point.x()); + array[index++] = float(point.y()); } - data->min = QVector2D(0.0f, 0.0f); - data->delta = QVector2D(0.5f, 0.5f); + data->min = QVector2D(domain->minX(), domain->minY()); + data->delta = QVector2D((domain->maxX() - domain->minX()) / 2.0f, + (domain->maxY() - domain->minY()) / 2.0f); } data->matrix = matrix; data->dirty = true; diff -Nru qtcharts-opensource-src-5.12.5/src/charts/xychart/glxyseriesdata_p.h qtcharts-opensource-src-5.9.5/src/charts/xychart/glxyseriesdata_p.h --- qtcharts-opensource-src-5.12.5/src/charts/xychart/glxyseriesdata_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/xychart/glxyseriesdata_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -79,7 +78,7 @@ typedef QMap GLXYDataMap; typedef QMapIterator GLXYDataMapIterator; -class QT_CHARTS_PRIVATE_EXPORT GLXYSeriesDataManager : public QObject +class GLXYSeriesDataManager : public QObject { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/xychart/qhxymodelmapper.cpp qtcharts-opensource-src-5.9.5/src/charts/xychart/qhxymodelmapper.cpp --- qtcharts-opensource-src-5.12.5/src/charts/xychart/qhxymodelmapper.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/xychart/qhxymodelmapper.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -33,7 +33,7 @@ /*! \class QHXYModelMapper - \inmodule QtCharts + \inmodule Qt Charts \brief The QHXYModelMapper class is a horizontal model mapper for line, spline, and scatter series. @@ -271,6 +271,6 @@ } } -QT_CHARTS_END_NAMESPACE - #include "moc_qhxymodelmapper.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/xychart/qhxymodelmapper.h qtcharts-opensource-src-5.9.5/src/charts/xychart/qhxymodelmapper.h --- qtcharts-opensource-src-5.12.5/src/charts/xychart/qhxymodelmapper.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/xychart/qhxymodelmapper.h 2018-03-19 05:05:55.000000000 +0000 @@ -37,7 +37,7 @@ class QT_CHARTS_EXPORT QHXYModelMapper : public QXYModelMapper { Q_OBJECT - Q_PROPERTY(QtCharts::QXYSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) + Q_PROPERTY(QXYSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced) Q_PROPERTY(int xRow READ xRow WRITE setXRow NOTIFY xRowChanged) Q_PROPERTY(int yRow READ yRow WRITE setYRow NOTIFY yRowChanged) @@ -45,7 +45,7 @@ Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount NOTIFY columnCountChanged) public: - explicit QHXYModelMapper(QObject *parent = nullptr); + explicit QHXYModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/xychart/qvxymodelmapper.cpp qtcharts-opensource-src-5.9.5/src/charts/xychart/qvxymodelmapper.cpp --- qtcharts-opensource-src-5.12.5/src/charts/xychart/qvxymodelmapper.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/xychart/qvxymodelmapper.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -33,7 +33,7 @@ /*! \class QVXYModelMapper - \inmodule QtCharts + \inmodule Qt Charts \brief The QVXYModelMapper class is a vertical model mapper for line, spline, and scatter series. @@ -268,6 +268,6 @@ } } -QT_CHARTS_END_NAMESPACE - #include "moc_qvxymodelmapper.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/xychart/qvxymodelmapper.h qtcharts-opensource-src-5.9.5/src/charts/xychart/qvxymodelmapper.h --- qtcharts-opensource-src-5.12.5/src/charts/xychart/qvxymodelmapper.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/xychart/qvxymodelmapper.h 2018-03-19 05:05:55.000000000 +0000 @@ -37,7 +37,7 @@ class QT_CHARTS_EXPORT QVXYModelMapper : public QXYModelMapper { Q_OBJECT - Q_PROPERTY(QtCharts::QXYSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) + Q_PROPERTY(QXYSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced) Q_PROPERTY(int xColumn READ xColumn WRITE setXColumn NOTIFY xColumnChanged) Q_PROPERTY(int yColumn READ yColumn WRITE setYColumn NOTIFY yColumnChanged) @@ -45,7 +45,7 @@ Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged) public: - explicit QVXYModelMapper(QObject *parent = nullptr); + explicit QVXYModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/xychart/qxymodelmapper.cpp qtcharts-opensource-src-5.9.5/src/charts/xychart/qxymodelmapper.cpp --- qtcharts-opensource-src-5.12.5/src/charts/xychart/qxymodelmapper.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/xychart/qxymodelmapper.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -573,7 +573,7 @@ blockSeriesSignals(false); } -QT_CHARTS_END_NAMESPACE - #include "moc_qxymodelmapper.cpp" #include "moc_qxymodelmapper_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/xychart/qxymodelmapper.h qtcharts-opensource-src-5.9.5/src/charts/xychart/qxymodelmapper.h --- qtcharts-opensource-src-5.12.5/src/charts/xychart/qxymodelmapper.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/xychart/qxymodelmapper.h 2018-03-19 05:05:55.000000000 +0000 @@ -47,7 +47,7 @@ Q_OBJECT protected: - explicit QXYModelMapper(QObject *parent = nullptr); + explicit QXYModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/xychart/qxymodelmapper_p.h qtcharts-opensource-src-5.9.5/src/charts/xychart/qxymodelmapper_p.h --- qtcharts-opensource-src-5.12.5/src/charts/xychart/qxymodelmapper_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/xychart/qxymodelmapper_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,7 +40,6 @@ #define QXYMODELMAPPER_P_H #include -#include #include QT_BEGIN_NAMESPACE @@ -54,7 +53,7 @@ class QXYModelMapper; class QXYSeries; -class QT_CHARTS_PRIVATE_EXPORT QXYModelMapperPrivate : public QObject +class QXYModelMapperPrivate : public QObject { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/xychart/qxyseries.cpp qtcharts-opensource-src-5.9.5/src/charts/xychart/qxyseries.cpp --- qtcharts-opensource-src-5.12.5/src/charts/xychart/qxyseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/xychart/qxyseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -41,7 +41,7 @@ /*! \class QXYSeries - \inmodule QtCharts + \inmodule Qt Charts \brief The QXYSeries class is a base class for line, spline, and scatter series. */ @@ -1008,9 +1008,7 @@ static const QString yPointTag(QLatin1String("@yPoint")); const int labelOffset = offset + 2; - QFont f(m_pointLabelsFont); - f.setPixelSize(QFontInfo(m_pointLabelsFont).pixelSize()); - painter->setFont(f); + painter->setFont(m_pointLabelsFont); painter->setPen(QPen(m_pointLabelsColor)); QFontMetrics fm(painter->font()); // m_points is used for the label here as it has the series point information @@ -1031,7 +1029,7 @@ } } -QT_CHARTS_END_NAMESPACE - #include "moc_qxyseries.cpp" #include "moc_qxyseries_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/xychart/qxyseries.h qtcharts-opensource-src-5.9.5/src/charts/xychart/qxyseries.h --- qtcharts-opensource-src-5.12.5/src/charts/xychart/qxyseries.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/xychart/qxyseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -56,7 +56,7 @@ Q_PROPERTY(bool pointLabelsClipping READ pointLabelsClipping WRITE setPointLabelsClipping NOTIFY pointLabelsClippingChanged) protected: - explicit QXYSeries(QXYSeriesPrivate &d, QObject *parent = nullptr); + explicit QXYSeries(QXYSeriesPrivate &d, QObject *parent = Q_NULLPTR); public: ~QXYSeries(); diff -Nru qtcharts-opensource-src-5.12.5/src/charts/xychart/qxyseries_p.h qtcharts-opensource-src-5.9.5/src/charts/xychart/qxyseries_p.h --- qtcharts-opensource-src-5.12.5/src/charts/xychart/qxyseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/xychart/qxyseries_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -40,14 +40,13 @@ #define QXYSERIES_P_H #include -#include QT_CHARTS_BEGIN_NAMESPACE class QXYSeries; class QAbstractAxis; -class QT_CHARTS_PRIVATE_EXPORT QXYSeriesPrivate: public QAbstractSeriesPrivate +class QXYSeriesPrivate: public QAbstractSeriesPrivate { Q_OBJECT diff -Nru qtcharts-opensource-src-5.12.5/src/charts/xychart/xychart.cpp qtcharts-opensource-src-5.9.5/src/charts/xychart/xychart.cpp --- qtcharts-opensource-src-5.12.5/src/charts/xychart/xychart.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/xychart/xychart.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -250,6 +250,6 @@ return domain()->isEmpty() || m_series->points().isEmpty(); } -QT_CHARTS_END_NAMESPACE - #include "moc_xychart_p.cpp" + +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/charts/xychart/xychart_p.h qtcharts-opensource-src-5.9.5/src/charts/xychart/xychart_p.h --- qtcharts-opensource-src-5.12.5/src/charts/xychart/xychart_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/charts/xychart/xychart_p.h 2018-03-19 05:05:55.000000000 +0000 @@ -43,7 +43,6 @@ #include #include #include -#include #include QT_CHARTS_BEGIN_NAMESPACE @@ -51,7 +50,7 @@ class ChartPresenter; class QXYSeries; -class QT_CHARTS_PRIVATE_EXPORT XYChart : public ChartItem +class XYChart : public ChartItem { Q_OBJECT public: diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/chartsqml2_plugin.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/chartsqml2_plugin.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/chartsqml2_plugin.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/chartsqml2_plugin.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -31,27 +31,27 @@ #include #include #include -#include "declarativecategoryaxis_p.h" +#include "declarativecategoryaxis.h" #include -#include "declarativechart_p.h" -#include "declarativepolarchart_p.h" -#include "declarativexypoint_p.h" -#include "declarativelineseries_p.h" -#include "declarativesplineseries_p.h" -#include "declarativeareaseries_p.h" -#include "declarativescatterseries_p.h" -#include "declarativebarseries_p.h" -#include "declarativeboxplotseries_p.h" -#include "declarativecandlestickseries_p.h" -#include "declarativepieseries_p.h" -#include "declarativeaxes_p.h" +#include "declarativechart.h" +#include "declarativepolarchart.h" +#include "declarativexypoint.h" +#include "declarativelineseries.h" +#include "declarativesplineseries.h" +#include "declarativeareaseries.h" +#include "declarativescatterseries.h" +#include "declarativebarseries.h" +#include "declarativeboxplotseries.h" +#include "declarativecandlestickseries.h" +#include "declarativepieseries.h" +#include "declarativeaxes.h" #include #include #include #include #include #include -#include "declarativemargins_p.h" +#include "declarativemargins.h" #include #include #include @@ -139,6 +139,13 @@ QML_DECLARE_TYPE(QSplineSeries) QML_DECLARE_TYPE(QStackedBarSeries) +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtCharts); +#endif +} + QT_CHARTS_BEGIN_NAMESPACE class QtChartsQml2Plugin : public QQmlExtensionPlugin @@ -148,7 +155,7 @@ Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QtChartsQml2Plugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } + QtChartsQml2Plugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCharts")); @@ -343,9 +350,6 @@ QLatin1String("Trying to create uncreatable: CandlestickModelMapper.")); qmlRegisterType(uri, 2, 2, "HCandlestickModelMapper"); qmlRegisterType(uri, 2, 2, "VCandlestickModelMapper"); - - // QtCharts 2.3 - qmlRegisterType(uri, 2, 3, "ValueAxis"); } }; diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/chartsqml2.pro qtcharts-opensource-src-5.9.5/src/chartsqml2/chartsqml2.pro --- qtcharts-opensource-src-5.12.5/src/chartsqml2/chartsqml2.pro 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/chartsqml2.pro 2018-03-19 05:05:55.000000000 +0000 @@ -1,7 +1,6 @@ TARGET = qtchartsqml2 CXX_MODULE = charts -DEFINES += QT_BUILD_QMLCHARTS_LIB QT += qml quick QT += charts charts-private @@ -28,36 +27,30 @@ declarativechartnode.cpp \ declarativecandlestickseries.cpp -PRIVATE_HEADERS += \ - declarativechart_p.h \ - declarativexypoint_p.h \ - declarativexyseries_p.h \ - declarativelineseries_p.h \ - declarativesplineseries_p.h \ - declarativeareaseries_p.h \ - declarativescatterseries_p.h \ - declarativepieseries_p.h \ - declarativebarseries_p.h \ - declarativecategoryaxis_p.h \ - declarativemargins_p.h \ - declarativeaxes_p.h \ - declarativepolarchart_p.h \ - declarativeboxplotseries_p.h \ - declarativecandlestickseries_p.h \ - declarativeabstractrendernode_p.h \ - declarativechartnode_p.h \ - declarativechartglobal_p.h +HEADERS += \ + declarativechart.h \ + declarativexypoint.h \ + declarativexyseries.h \ + declarativelineseries.h \ + declarativesplineseries.h \ + declarativeareaseries.h \ + declarativescatterseries.h \ + declarativepieseries.h \ + declarativebarseries.h \ + declarativecategoryaxis.h \ + declarativemargins.h \ + declarativeaxes.h \ + declarativepolarchart.h \ + declarativeboxplotseries.h \ + declarativechartnode.h \ + declarativecandlestickseries.h \ + declarativeabstractrendernode.h contains(QT_CONFIG, opengl) { SOURCES += declarativeopenglrendernode.cpp - PRIVATE_HEADERS += declarativeopenglrendernode_p.h + HEADERS += declarativeopenglrendernode.h } -HEADERS += $$PRIVATE_HEADERS -INCLUDEPATH += $$PWD - -IMPORT_VERSION = 2.3 -QMAKE_QMLPLUGINDUMP_FLAGS = -qapp load(qml_plugin) diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeabstractrendernode.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeabstractrendernode.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeabstractrendernode.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeabstractrendernode.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,81 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVEABSTRACTRENDERNODE_H +#define DECLARATIVEABSTRACTRENDERNODE_H + +#include +#include +#include +#include + +QT_CHARTS_BEGIN_NAMESPACE + +class MouseEventResponse { +public: + enum MouseEventType { + None, + Pressed, + Released, + Clicked, + DoubleClicked, + HoverEnter, + HoverLeave + }; + + MouseEventResponse() + : type(None), + series(nullptr) {} + MouseEventResponse(MouseEventType t, const QPoint &p, const QXYSeries *s) + : type(t), + point(p), + series(s) {} + MouseEventType type; + QPoint point; + const QXYSeries *series; +}; + +class DeclarativeAbstractRenderNode : public QSGRootNode +{ +public: + DeclarativeAbstractRenderNode() {} + + virtual void setTextureSize(const QSize &textureSize) = 0; + virtual QSize textureSize() const = 0; + virtual void setRect(const QRectF &rect) = 0; + virtual void setSeriesData(bool mapDirty, const GLXYDataMap &dataMap) = 0; + virtual void setAntialiasing(bool enable) = 0; + virtual void addMouseEvents(const QVector &events) = 0; + virtual void takeMouseEventResponses(QVector &responses) = 0; +}; + +QT_CHARTS_END_NAMESPACE + + +#endif // DECLARATIVEABSTRACTRENDERNODE_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeabstractrendernode_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeabstractrendernode_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeabstractrendernode_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeabstractrendernode_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVEABSTRACTRENDERNODE_H -#define DECLARATIVEABSTRACTRENDERNODE_H - -#include -#include -#include -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class QT_QMLCHARTS_PRIVATE_EXPORT MouseEventResponse { -public: - enum MouseEventType { - None, - Pressed, - Released, - Clicked, - DoubleClicked, - HoverEnter, - HoverLeave - }; - - MouseEventResponse() - : type(None), - series(nullptr) {} - MouseEventResponse(MouseEventType t, const QPoint &p, const QXYSeries *s) - : type(t), - point(p), - series(s) {} - MouseEventType type; - QPoint point; - const QXYSeries *series; -}; - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeAbstractRenderNode : public QSGRootNode -{ -public: - DeclarativeAbstractRenderNode() {} - - virtual void setTextureSize(const QSize &textureSize) = 0; - virtual QSize textureSize() const = 0; - virtual void setRect(const QRectF &rect) = 0; - virtual void setSeriesData(bool mapDirty, const GLXYDataMap &dataMap) = 0; - virtual void setAntialiasing(bool enable) = 0; - virtual void addMouseEvents(const QVector &events) = 0; - virtual void takeMouseEventResponses(QVector &responses) = 0; -}; - -QT_CHARTS_END_NAMESPACE - - -#endif // DECLARATIVEABSTRACTRENDERNODE_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeareaseries.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeareaseries.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeareaseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeareaseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#include "declarativeareaseries_p.h" -#include "declarativelineseries_p.h" +#include "declarativeareaseries.h" +#include "declarativelineseries.h" QT_CHARTS_BEGIN_NAMESPACE @@ -119,6 +119,6 @@ return QAreaSeries::brush(); } -QT_CHARTS_END_NAMESPACE +#include "moc_declarativeareaseries.cpp" -#include "moc_declarativeareaseries_p.cpp" +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeareaseries.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeareaseries.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeareaseries.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeareaseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,103 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVEAREASERIES_H +#define DECLARATIVEAREASERIES_H + +#include +#include "declarativeaxes.h" + +QT_CHARTS_BEGIN_NAMESPACE +class DeclarativeLineSeries; + +class DeclarativeAreaSeries : public QAreaSeries +{ + Q_OBJECT + Q_PROPERTY(DeclarativeLineSeries *upperSeries READ upperSeries WRITE setUpperSeries) + Q_PROPERTY(DeclarativeLineSeries *lowerSeries READ lowerSeries WRITE setLowerSeries) + Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) + Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) + Q_PROPERTY(QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3) + Q_PROPERTY(QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3) + Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1) + Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 4) + Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged REVISION 4) + +public: + explicit DeclarativeAreaSeries(QObject *parent = 0); + void setUpperSeries(DeclarativeLineSeries *series); + DeclarativeLineSeries *upperSeries() const; + void setLowerSeries(DeclarativeLineSeries *series); + DeclarativeLineSeries *lowerSeries() const; + QAbstractAxis *axisX() { return m_axes->axisX(); } + void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisY() { return m_axes->axisY(); } + void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QAbstractAxis *axisAngular() { return m_axes->axisX(); } + void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisRadial() { return m_axes->axisY(); } + void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + qreal borderWidth() const; + void setBorderWidth(qreal borderWidth); + QString brushFilename() const; + void setBrushFilename(const QString &brushFilename); + void setBrush(const QBrush &brush); + QBrush brush() const; + +Q_SIGNALS: + Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); + Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); + Q_REVISION(1) void borderWidthChanged(qreal width); + Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); + Q_REVISION(3) void axisAngularChanged(QAbstractAxis *axis); + Q_REVISION(3) void axisRadialChanged(QAbstractAxis *axis); + Q_REVISION(4) void brushChanged(); + Q_REVISION(4) void brushFilenameChanged(const QString &brushFilename); + +private Q_SLOTS: + void handleBrushChanged(); + +public: + DeclarativeAxes *m_axes; + +private: + QString m_brushFilename; + QImage m_brushImage; +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVEAREASERIES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeareaseries_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeareaseries_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeareaseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeareaseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVEAREASERIES_H -#define DECLARATIVEAREASERIES_H - -#include -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE -class DeclarativeLineSeries; - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeAreaSeries : public QAreaSeries -{ - Q_OBJECT - Q_PROPERTY(QtCharts::DeclarativeLineSeries *upperSeries READ upperSeries WRITE setUpperSeries) - Q_PROPERTY(QtCharts::DeclarativeLineSeries *lowerSeries READ lowerSeries WRITE setLowerSeries) - Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) - Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) - Q_PROPERTY(QtCharts::QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3) - Q_PROPERTY(QtCharts::QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3) - Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1) - Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 4) - Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged REVISION 4) - -public: - explicit DeclarativeAreaSeries(QObject *parent = 0); - void setUpperSeries(DeclarativeLineSeries *series); - DeclarativeLineSeries *upperSeries() const; - void setLowerSeries(DeclarativeLineSeries *series); - DeclarativeLineSeries *lowerSeries() const; - QAbstractAxis *axisX() { return m_axes->axisX(); } - void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - QAbstractAxis *axisY() { return m_axes->axisY(); } - void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - QAbstractAxis *axisAngular() { return m_axes->axisX(); } - void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - QAbstractAxis *axisRadial() { return m_axes->axisY(); } - void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - qreal borderWidth() const; - void setBorderWidth(qreal borderWidth); - QString brushFilename() const; - void setBrushFilename(const QString &brushFilename); - void setBrush(const QBrush &brush); - QBrush brush() const; - -Q_SIGNALS: - Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); - Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); - Q_REVISION(1) void borderWidthChanged(qreal width); - Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); - Q_REVISION(3) void axisAngularChanged(QAbstractAxis *axis); - Q_REVISION(3) void axisRadialChanged(QAbstractAxis *axis); - Q_REVISION(4) void brushChanged(); - Q_REVISION(4) void brushFilenameChanged(const QString &brushFilename); - -private Q_SLOTS: - void handleBrushChanged(); - -public: - DeclarativeAxes *m_axes; - -private: - QString m_brushFilename; - QImage m_brushImage; -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVEAREASERIES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeaxes.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeaxes.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeaxes.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeaxes.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativeaxes_p.h" +#include "declarativeaxes.h" #include QT_CHARTS_BEGIN_NAMESPACE @@ -65,6 +65,6 @@ emit axisYRightChanged(axis); } -QT_CHARTS_END_NAMESPACE +#include "moc_declarativeaxes.cpp" -#include "moc_declarativeaxes_p.cpp" +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeaxes.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeaxes.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeaxes.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeaxes.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,81 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVEAXES_H +#define DECLARATIVEAXES_H + +#include +#include + +QT_CHARTS_BEGIN_NAMESPACE + +class QAbstractAxis; + +class DeclarativeAxes : public QObject +{ + Q_OBJECT + Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) + Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged) + Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged) + Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged) + +public: + explicit DeclarativeAxes(QObject *parent = 0); + + QAbstractAxis *axisX() { return m_axisX; } + void setAxisX(QAbstractAxis *axis); + QAbstractAxis *axisY() { return m_axisY; } + void setAxisY(QAbstractAxis *axis); + QAbstractAxis *axisXTop() { return m_axisXTop; } + void setAxisXTop(QAbstractAxis *axis); + QAbstractAxis *axisYRight() { return m_axisYRight; } + void setAxisYRight(QAbstractAxis *axis); + +public: + void emitAxisXChanged() { emit axisXChanged(m_axisX); } + void emitAxisYChanged() { emit axisYChanged(m_axisY); } + void emitAxisXTopChanged() { emit axisXTopChanged(m_axisXTop); } + void emitAxisYRightChanged() { emit axisYRightChanged(m_axisYRight); } + +Q_SIGNALS: + void axisXChanged(QAbstractAxis *axis); + void axisYChanged(QAbstractAxis *axis); + void axisXTopChanged(QAbstractAxis *axis); + void axisYRightChanged(QAbstractAxis *axis); + +private: + QAbstractAxis *m_axisX; + QAbstractAxis *m_axisY; + QAbstractAxis *m_axisXTop; + QAbstractAxis *m_axisYRight; +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVEAXES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeaxes_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeaxes_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeaxes_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeaxes_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVEAXES_H -#define DECLARATIVEAXES_H - -#include -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class QAbstractAxis; - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeAxes : public QObject -{ - Q_OBJECT - Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) - Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged) - Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged) - Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged) - -public: - explicit DeclarativeAxes(QObject *parent = 0); - - QAbstractAxis *axisX() { return m_axisX; } - void setAxisX(QAbstractAxis *axis); - QAbstractAxis *axisY() { return m_axisY; } - void setAxisY(QAbstractAxis *axis); - QAbstractAxis *axisXTop() { return m_axisXTop; } - void setAxisXTop(QAbstractAxis *axis); - QAbstractAxis *axisYRight() { return m_axisYRight; } - void setAxisYRight(QAbstractAxis *axis); - -public: - void emitAxisXChanged() { emit axisXChanged(m_axisX); } - void emitAxisYChanged() { emit axisYChanged(m_axisY); } - void emitAxisXTopChanged() { emit axisXTopChanged(m_axisXTop); } - void emitAxisYRightChanged() { emit axisYRightChanged(m_axisYRight); } - -Q_SIGNALS: - void axisXChanged(QAbstractAxis *axis); - void axisYChanged(QAbstractAxis *axis); - void axisXTopChanged(QAbstractAxis *axis); - void axisYRightChanged(QAbstractAxis *axis); - -private: - QAbstractAxis *m_axisX; - QAbstractAxis *m_axisY; - QAbstractAxis *m_axisXTop; - QAbstractAxis *m_axisYRight; -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVEAXES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativebarseries.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativebarseries.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativebarseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativebarseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativebarseries_p.h" +#include "declarativebarseries.h" #include #include #include @@ -513,6 +513,6 @@ return 0; } -QT_CHARTS_END_NAMESPACE +#include "moc_declarativebarseries.cpp" -#include "moc_declarativebarseries_p.cpp" +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativebarseries.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativebarseries.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativebarseries.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativebarseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,370 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVEBARSERIES_H +#define DECLARATIVEBARSERIES_H + +#include +#include +#include +#include +#include +#include +#include +#include "declarativeaxes.h" + +#include +#include + +QT_CHARTS_BEGIN_NAMESPACE + +class QChart; + +class DeclarativeBarSet : public QBarSet +{ + Q_OBJECT + Q_PROPERTY(QVariantList values READ values WRITE setValues) + Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1) + Q_PROPERTY(int count READ count NOTIFY countChanged) + Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 2) + +public: + explicit DeclarativeBarSet(QObject *parent = 0); + QVariantList values(); + void setValues(QVariantList values); + qreal borderWidth() const; + void setBorderWidth(qreal borderWidth); + QString brushFilename() const; + void setBrushFilename(const QString &brushFilename); + +public: // From QBarSet + Q_INVOKABLE void append(qreal value) { QBarSet::append(value); } + Q_INVOKABLE void remove(const int index, const int count = 1) { QBarSet::remove(index, count); } + Q_INVOKABLE void replace(int index, qreal value) { QBarSet::replace(index, value); } + Q_INVOKABLE qreal at(int index) { return QBarSet::at(index); } + +Q_SIGNALS: + void countChanged(int count); + Q_REVISION(1) void borderWidthChanged(qreal width); + Q_REVISION(2) void brushFilenameChanged(const QString &brushFilename); + +private Q_SLOTS: + void handleCountChanged(int index, int count); + void handleBrushChanged(); + +private: + QString m_brushFilename; + QImage m_brushImage; +}; + +class DeclarativeBarSeries : public QBarSeries, public QQmlParserStatus +{ + Q_OBJECT + Q_INTERFACES(QQmlParserStatus) + Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) + Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) + Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) + Q_CLASSINFO("DefaultProperty", "seriesChildren") + +public: + explicit DeclarativeBarSeries(QQuickItem *parent = 0); + QAbstractAxis *axisX() { return m_axes->axisX(); } + void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisY() { return m_axes->axisY(); } + void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QQmlListProperty seriesChildren(); + +public: + Q_INVOKABLE DeclarativeBarSet *at(int index); + Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); } + Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values); + Q_INVOKABLE bool remove(QBarSet *barset) { return QBarSeries::remove(barset); } + Q_INVOKABLE void clear() { return QBarSeries::clear(); } + +public: // from QDeclarativeParserStatus + void classBegin(); + void componentComplete(); + +Q_SIGNALS: + Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); + Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); + +public Q_SLOTS: + static void appendSeriesChildren(QQmlListProperty *list, QObject *element); + +public: + DeclarativeAxes *m_axes; +}; + +class DeclarativeStackedBarSeries : public QStackedBarSeries, public QQmlParserStatus +{ + Q_OBJECT + Q_INTERFACES(QQmlParserStatus) + Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) + Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) + Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) + Q_CLASSINFO("DefaultProperty", "seriesChildren") + +public: + explicit DeclarativeStackedBarSeries(QQuickItem *parent = 0); + QAbstractAxis *axisX() { return m_axes->axisX(); } + void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisY() { return m_axes->axisY(); } + void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QQmlListProperty seriesChildren(); + +public: + Q_INVOKABLE DeclarativeBarSet *at(int index); + Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); } + Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values); + Q_INVOKABLE bool remove(QBarSet *barset) { return QStackedBarSeries::remove(barset); } + Q_INVOKABLE void clear() { return QStackedBarSeries::clear(); } + +public: // from QDeclarativeParserStatus + void classBegin(); + void componentComplete(); + +Q_SIGNALS: + Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); + Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); + +public Q_SLOTS: + static void appendSeriesChildren(QQmlListProperty *list, QObject *element); + +public: + DeclarativeAxes *m_axes; +}; + +class DeclarativePercentBarSeries : public QPercentBarSeries, public QQmlParserStatus +{ + Q_OBJECT + Q_INTERFACES(QQmlParserStatus) + Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) + Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) + Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) + Q_CLASSINFO("DefaultProperty", "seriesChildren") + +public: + explicit DeclarativePercentBarSeries(QQuickItem *parent = 0); + QAbstractAxis *axisX() { return m_axes->axisX(); } + void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisY() { return m_axes->axisY(); } + void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QQmlListProperty seriesChildren(); + +public: + Q_INVOKABLE DeclarativeBarSet *at(int index); + Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); } + Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values); + Q_INVOKABLE bool remove(QBarSet *barset) { return QPercentBarSeries::remove(barset); } + Q_INVOKABLE void clear() { return QPercentBarSeries::clear(); } + +public: // from QDeclarativeParserStatus + void classBegin(); + void componentComplete(); + +Q_SIGNALS: + Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); + Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); + +public Q_SLOTS: + static void appendSeriesChildren(QQmlListProperty *list, QObject *element); + +public: + DeclarativeAxes *m_axes; +}; + +class DeclarativeHorizontalBarSeries : public QHorizontalBarSeries, public QQmlParserStatus +{ + Q_OBJECT + Q_INTERFACES(QQmlParserStatus) + Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) + Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) + Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) + Q_CLASSINFO("DefaultProperty", "seriesChildren") + +public: + explicit DeclarativeHorizontalBarSeries(QQuickItem *parent = 0); + QAbstractAxis *axisX() { return m_axes->axisX(); } + void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisY() { return m_axes->axisY(); } + void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QQmlListProperty seriesChildren(); + +public: + Q_INVOKABLE DeclarativeBarSet *at(int index); + Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); } + Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values); + Q_INVOKABLE bool remove(QBarSet *barset) { return QHorizontalBarSeries::remove(barset); } + Q_INVOKABLE void clear() { return QHorizontalBarSeries::clear(); } + +public: // from QDeclarativeParserStatus + void classBegin(); + void componentComplete(); + +Q_SIGNALS: + Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); + Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); + +public Q_SLOTS: + static void appendSeriesChildren(QQmlListProperty *list, QObject *element); + +public: + DeclarativeAxes *m_axes; +}; + +class DeclarativeHorizontalStackedBarSeries : public QHorizontalStackedBarSeries, public QQmlParserStatus +{ + Q_OBJECT + Q_INTERFACES(QQmlParserStatus) + Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) + Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) + Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) + Q_CLASSINFO("DefaultProperty", "seriesChildren") + +public: + explicit DeclarativeHorizontalStackedBarSeries(QQuickItem *parent = 0); + QAbstractAxis *axisX() { return m_axes->axisX(); } + void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisY() { return m_axes->axisY(); } + void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QQmlListProperty seriesChildren(); + +public: + Q_INVOKABLE DeclarativeBarSet *at(int index); + Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); } + Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values); + Q_INVOKABLE bool remove(QBarSet *barset) { return QHorizontalStackedBarSeries::remove(barset); } + Q_INVOKABLE void clear() { return QHorizontalStackedBarSeries::clear(); } + +public: // from QDeclarativeParserStatus + void classBegin(); + void componentComplete(); + +Q_SIGNALS: + Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); + Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); + +public Q_SLOTS: + static void appendSeriesChildren(QQmlListProperty *list, QObject *element); + +public: + DeclarativeAxes *m_axes; +}; + +class DeclarativeHorizontalPercentBarSeries : public QHorizontalPercentBarSeries, public QQmlParserStatus +{ + Q_OBJECT + Q_INTERFACES(QQmlParserStatus) + Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) + Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) + Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) + Q_CLASSINFO("DefaultProperty", "seriesChildren") + +public: + explicit DeclarativeHorizontalPercentBarSeries(QQuickItem *parent = 0); + QAbstractAxis *axisX() { return m_axes->axisX(); } + void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisY() { return m_axes->axisY(); } + void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QQmlListProperty seriesChildren(); + +public: + Q_INVOKABLE DeclarativeBarSet *at(int index); + Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); } + Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values); + Q_INVOKABLE bool remove(QBarSet *barset) { return QHorizontalPercentBarSeries::remove(barset); } + Q_INVOKABLE void clear() { return QHorizontalPercentBarSeries::clear(); } + +public: // from QDeclarativeParserStatus + void classBegin(); + void componentComplete(); + +Q_SIGNALS: + Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); + Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); + +public Q_SLOTS: + static void appendSeriesChildren(QQmlListProperty *list, QObject *element); + +public: + DeclarativeAxes *m_axes; +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVEBARSERIES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativebarseries_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativebarseries_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativebarseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativebarseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,380 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVEBARSERIES_H -#define DECLARATIVEBARSERIES_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class QChart; - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBarSet : public QBarSet -{ - Q_OBJECT - Q_PROPERTY(QVariantList values READ values WRITE setValues) - Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1) - Q_PROPERTY(int count READ count NOTIFY countChanged) - Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 2) - -public: - explicit DeclarativeBarSet(QObject *parent = 0); - QVariantList values(); - void setValues(QVariantList values); - qreal borderWidth() const; - void setBorderWidth(qreal borderWidth); - QString brushFilename() const; - void setBrushFilename(const QString &brushFilename); - -public: // From QBarSet - Q_INVOKABLE void append(qreal value) { QBarSet::append(value); } - Q_INVOKABLE void remove(const int index, const int count = 1) { QBarSet::remove(index, count); } - Q_INVOKABLE void replace(int index, qreal value) { QBarSet::replace(index, value); } - Q_INVOKABLE qreal at(int index) { return QBarSet::at(index); } - -Q_SIGNALS: - void countChanged(int count); - Q_REVISION(1) void borderWidthChanged(qreal width); - Q_REVISION(2) void brushFilenameChanged(const QString &brushFilename); - -private Q_SLOTS: - void handleCountChanged(int index, int count); - void handleBrushChanged(); - -private: - QString m_brushFilename; - QImage m_brushImage; -}; - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBarSeries : public QBarSeries, public QQmlParserStatus -{ - Q_OBJECT - Q_INTERFACES(QQmlParserStatus) - Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) - Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) - Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) - Q_CLASSINFO("DefaultProperty", "seriesChildren") - -public: - explicit DeclarativeBarSeries(QQuickItem *parent = 0); - QAbstractAxis *axisX() { return m_axes->axisX(); } - void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - QAbstractAxis *axisY() { return m_axes->axisY(); } - void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - QQmlListProperty seriesChildren(); - -public: - Q_INVOKABLE DeclarativeBarSet *at(int index); - Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); } - Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values); - Q_INVOKABLE bool remove(QBarSet *barset) { return QBarSeries::remove(barset); } - Q_INVOKABLE void clear() { return QBarSeries::clear(); } - -public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); - -Q_SIGNALS: - Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); - Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); - -public Q_SLOTS: - static void appendSeriesChildren(QQmlListProperty *list, QObject *element); - -public: - DeclarativeAxes *m_axes; -}; - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeStackedBarSeries : public QStackedBarSeries, public QQmlParserStatus -{ - Q_OBJECT - Q_INTERFACES(QQmlParserStatus) - Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) - Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) - Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) - Q_CLASSINFO("DefaultProperty", "seriesChildren") - -public: - explicit DeclarativeStackedBarSeries(QQuickItem *parent = 0); - QAbstractAxis *axisX() { return m_axes->axisX(); } - void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - QAbstractAxis *axisY() { return m_axes->axisY(); } - void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - QQmlListProperty seriesChildren(); - -public: - Q_INVOKABLE DeclarativeBarSet *at(int index); - Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); } - Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values); - Q_INVOKABLE bool remove(QBarSet *barset) { return QStackedBarSeries::remove(barset); } - Q_INVOKABLE void clear() { return QStackedBarSeries::clear(); } - -public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); - -Q_SIGNALS: - Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); - Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); - -public Q_SLOTS: - static void appendSeriesChildren(QQmlListProperty *list, QObject *element); - -public: - DeclarativeAxes *m_axes; -}; - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativePercentBarSeries : public QPercentBarSeries, public QQmlParserStatus -{ - Q_OBJECT - Q_INTERFACES(QQmlParserStatus) - Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) - Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) - Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) - Q_CLASSINFO("DefaultProperty", "seriesChildren") - -public: - explicit DeclarativePercentBarSeries(QQuickItem *parent = 0); - QAbstractAxis *axisX() { return m_axes->axisX(); } - void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - QAbstractAxis *axisY() { return m_axes->axisY(); } - void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - QQmlListProperty seriesChildren(); - -public: - Q_INVOKABLE DeclarativeBarSet *at(int index); - Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); } - Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values); - Q_INVOKABLE bool remove(QBarSet *barset) { return QPercentBarSeries::remove(barset); } - Q_INVOKABLE void clear() { return QPercentBarSeries::clear(); } - -public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); - -Q_SIGNALS: - Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); - Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); - -public Q_SLOTS: - static void appendSeriesChildren(QQmlListProperty *list, QObject *element); - -public: - DeclarativeAxes *m_axes; -}; - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalBarSeries : public QHorizontalBarSeries, public QQmlParserStatus -{ - Q_OBJECT - Q_INTERFACES(QQmlParserStatus) - Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) - Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) - Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) - Q_CLASSINFO("DefaultProperty", "seriesChildren") - -public: - explicit DeclarativeHorizontalBarSeries(QQuickItem *parent = 0); - QAbstractAxis *axisX() { return m_axes->axisX(); } - void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - QAbstractAxis *axisY() { return m_axes->axisY(); } - void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - QQmlListProperty seriesChildren(); - -public: - Q_INVOKABLE DeclarativeBarSet *at(int index); - Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); } - Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values); - Q_INVOKABLE bool remove(QBarSet *barset) { return QHorizontalBarSeries::remove(barset); } - Q_INVOKABLE void clear() { return QHorizontalBarSeries::clear(); } - -public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); - -Q_SIGNALS: - Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); - Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); - -public Q_SLOTS: - static void appendSeriesChildren(QQmlListProperty *list, QObject *element); - -public: - DeclarativeAxes *m_axes; -}; - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalStackedBarSeries : public QHorizontalStackedBarSeries, public QQmlParserStatus -{ - Q_OBJECT - Q_INTERFACES(QQmlParserStatus) - Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) - Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) - Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) - Q_CLASSINFO("DefaultProperty", "seriesChildren") - -public: - explicit DeclarativeHorizontalStackedBarSeries(QQuickItem *parent = 0); - QAbstractAxis *axisX() { return m_axes->axisX(); } - void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - QAbstractAxis *axisY() { return m_axes->axisY(); } - void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - QQmlListProperty seriesChildren(); - -public: - Q_INVOKABLE DeclarativeBarSet *at(int index); - Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); } - Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values); - Q_INVOKABLE bool remove(QBarSet *barset) { return QHorizontalStackedBarSeries::remove(barset); } - Q_INVOKABLE void clear() { return QHorizontalStackedBarSeries::clear(); } - -public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); - -Q_SIGNALS: - Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); - Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); - -public Q_SLOTS: - static void appendSeriesChildren(QQmlListProperty *list, QObject *element); - -public: - DeclarativeAxes *m_axes; -}; - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalPercentBarSeries : public QHorizontalPercentBarSeries, public QQmlParserStatus -{ - Q_OBJECT - Q_INTERFACES(QQmlParserStatus) - Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) - Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) - Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) - Q_CLASSINFO("DefaultProperty", "seriesChildren") - -public: - explicit DeclarativeHorizontalPercentBarSeries(QQuickItem *parent = 0); - QAbstractAxis *axisX() { return m_axes->axisX(); } - void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - QAbstractAxis *axisY() { return m_axes->axisY(); } - void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - QQmlListProperty seriesChildren(); - -public: - Q_INVOKABLE DeclarativeBarSet *at(int index); - Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); } - Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values); - Q_INVOKABLE bool remove(QBarSet *barset) { return QHorizontalPercentBarSeries::remove(barset); } - Q_INVOKABLE void clear() { return QHorizontalPercentBarSeries::clear(); } - -public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); - -Q_SIGNALS: - Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); - Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); - -public Q_SLOTS: - static void appendSeriesChildren(QQmlListProperty *list, QObject *element); - -public: - DeclarativeAxes *m_axes; -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVEBARSERIES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeboxplotseries.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeboxplotseries.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeboxplotseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeboxplotseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -27,10 +27,9 @@ ** ****************************************************************************/ -#include "declarativebarseries_p.h" -#include "declarativeboxplotseries_p.h" +#include "declarativebarseries.h" +#include "declarativeboxplotseries.h" #include -#include #include QT_CHARTS_BEGIN_NAMESPACE @@ -406,8 +405,6 @@ } else if (qobject_cast(child)) { QVBoxPlotModelMapper *mapper = qobject_cast(child); mapper->setSeries(this); - } else if (QHBoxPlotModelMapper *mapper = qobject_cast(child)) { - mapper->setSeries(this); } } } @@ -496,6 +493,6 @@ } } -QT_CHARTS_END_NAMESPACE +#include "moc_declarativeboxplotseries.cpp" -#include "moc_declarativeboxplotseries_p.cpp" +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeboxplotseries.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeboxplotseries.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeboxplotseries.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeboxplotseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,157 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVEBOXPLOT_H +#define DECLARATIVEBOXPLOT_H + +#include +#include "declarativeaxes.h" +#include + +#include +#include + +QT_CHARTS_BEGIN_NAMESPACE + +class DeclarativeBoxSet : public QBoxSet +{ + Q_OBJECT + Q_PROPERTY(QVariantList values READ values WRITE setValues) + Q_PROPERTY(QString label READ label WRITE setLabel) + Q_PROPERTY(int count READ count) + Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 1) + Q_ENUMS(ValuePositions) + +public: // duplicate from QBoxSet + enum ValuePositions { + LowerExtreme = 0x0, + LowerQuartile, + Median, + UpperQuartile, + UpperExtreme + }; + +public: + explicit DeclarativeBoxSet(const QString label = "", QObject *parent = 0); + QVariantList values(); + void setValues(QVariantList values); + QString brushFilename() const; + void setBrushFilename(const QString &brushFilename); + +public: // From QBoxSet + Q_INVOKABLE void append(qreal value) { QBoxSet::append(value); } + Q_INVOKABLE void clear() {QBoxSet::clear(); } + Q_INVOKABLE qreal at(int index) { return QBoxSet::at(index); } + Q_INVOKABLE void setValue(int index, qreal value) { QBoxSet::setValue(index, value); } + +Q_SIGNALS: + void changedValues(); + void changedValue(int index); + Q_REVISION(1) void brushFilenameChanged(const QString &brushFilename); + +private Q_SLOTS: + void handleBrushChanged(); + +private: + QString m_brushFilename; + QImage m_brushImage; +}; + +class DeclarativeBoxPlotSeries : public QBoxPlotSeries, public QQmlParserStatus +{ + Q_OBJECT + Q_INTERFACES(QQmlParserStatus) + Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) + Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged) + Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged) + Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged) + Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) + Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 1) + Q_CLASSINFO("DefaultProperty", "seriesChildren") + +public: + explicit DeclarativeBoxPlotSeries(QQuickItem *parent = 0); + QAbstractAxis *axisX() { return m_axes->axisX(); } + void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisY() { return m_axes->axisY(); } + void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QQmlListProperty seriesChildren(); + QString brushFilename() const; + void setBrushFilename(const QString &brushFilename); + +public: + Q_INVOKABLE DeclarativeBoxSet *at(int index); + Q_INVOKABLE DeclarativeBoxSet *append(const QString label, QVariantList values) { return insert(count(), label, values); } + Q_INVOKABLE void append(DeclarativeBoxSet *box) { QBoxPlotSeries::append(box); } + Q_INVOKABLE DeclarativeBoxSet *insert(int index, const QString label, QVariantList values); + Q_INVOKABLE bool remove(DeclarativeBoxSet *box) { return QBoxPlotSeries::remove(qobject_cast(box)); } + Q_INVOKABLE void clear() { return QBoxPlotSeries::clear(); } + +public: // from QDeclarativeParserStatus + void classBegin(); + void componentComplete(); + +Q_SIGNALS: + void axisXChanged(QAbstractAxis *axis); + void axisYChanged(QAbstractAxis *axis); + void axisXTopChanged(QAbstractAxis *axis); + void axisYRightChanged(QAbstractAxis *axis); + void clicked(DeclarativeBoxSet *boxset); + void hovered(bool status, DeclarativeBoxSet *boxset); + void pressed(DeclarativeBoxSet *boxset); + void released(DeclarativeBoxSet *boxset); + void doubleClicked(DeclarativeBoxSet *boxset); + Q_REVISION(1) void brushFilenameChanged(const QString &brushFilename); + +public Q_SLOTS: + static void appendSeriesChildren(QQmlListProperty *list, QObject *element); + void onHovered(bool status, QBoxSet *boxset); + void onClicked(QBoxSet *boxset); + void onPressed(QBoxSet *boxset); + void onReleased(QBoxSet *boxset); + void onDoubleClicked(QBoxSet *boxset); + +private Q_SLOTS: + void handleBrushChanged(); + +public: + DeclarativeAxes *m_axes; + +private: + QString m_brushFilename; + QImage m_brushImage; +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVEBOXPLOT_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeboxplotseries_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeboxplotseries_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeboxplotseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeboxplotseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,167 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVEBOXPLOT_H -#define DECLARATIVEBOXPLOT_H - -#include -#include -#include -#include - -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBoxSet : public QBoxSet -{ - Q_OBJECT - Q_PROPERTY(QVariantList values READ values WRITE setValues) - Q_PROPERTY(QString label READ label WRITE setLabel) - Q_PROPERTY(int count READ count) - Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 1) - Q_ENUMS(ValuePositions) - -public: // duplicate from QBoxSet - enum ValuePositions { - LowerExtreme = 0x0, - LowerQuartile, - Median, - UpperQuartile, - UpperExtreme - }; - -public: - explicit DeclarativeBoxSet(const QString label = "", QObject *parent = 0); - QVariantList values(); - void setValues(QVariantList values); - QString brushFilename() const; - void setBrushFilename(const QString &brushFilename); - -public: // From QBoxSet - Q_INVOKABLE void append(qreal value) { QBoxSet::append(value); } - Q_INVOKABLE void clear() {QBoxSet::clear(); } - Q_INVOKABLE qreal at(int index) { return QBoxSet::at(index); } - Q_INVOKABLE void setValue(int index, qreal value) { QBoxSet::setValue(index, value); } - -Q_SIGNALS: - void changedValues(); - void changedValue(int index); - Q_REVISION(1) void brushFilenameChanged(const QString &brushFilename); - -private Q_SLOTS: - void handleBrushChanged(); - -private: - QString m_brushFilename; - QImage m_brushImage; -}; - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBoxPlotSeries : public QBoxPlotSeries, public QQmlParserStatus -{ - Q_OBJECT - Q_INTERFACES(QQmlParserStatus) - Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) - Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged) - Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged) - Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged) - Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) - Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 1) - Q_CLASSINFO("DefaultProperty", "seriesChildren") - -public: - explicit DeclarativeBoxPlotSeries(QQuickItem *parent = 0); - QAbstractAxis *axisX() { return m_axes->axisX(); } - void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - QAbstractAxis *axisY() { return m_axes->axisY(); } - void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - QQmlListProperty seriesChildren(); - QString brushFilename() const; - void setBrushFilename(const QString &brushFilename); - -public: - Q_INVOKABLE DeclarativeBoxSet *at(int index); - Q_INVOKABLE DeclarativeBoxSet *append(const QString label, QVariantList values) { return insert(count(), label, values); } - Q_INVOKABLE void append(DeclarativeBoxSet *box) { QBoxPlotSeries::append(box); } - Q_INVOKABLE DeclarativeBoxSet *insert(int index, const QString label, QVariantList values); - Q_INVOKABLE bool remove(DeclarativeBoxSet *box) { return QBoxPlotSeries::remove(qobject_cast(box)); } - Q_INVOKABLE void clear() { return QBoxPlotSeries::clear(); } - -public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); - -Q_SIGNALS: - void axisXChanged(QAbstractAxis *axis); - void axisYChanged(QAbstractAxis *axis); - void axisXTopChanged(QAbstractAxis *axis); - void axisYRightChanged(QAbstractAxis *axis); - void clicked(DeclarativeBoxSet *boxset); - void hovered(bool status, DeclarativeBoxSet *boxset); - void pressed(DeclarativeBoxSet *boxset); - void released(DeclarativeBoxSet *boxset); - void doubleClicked(DeclarativeBoxSet *boxset); - Q_REVISION(1) void brushFilenameChanged(const QString &brushFilename); - -public Q_SLOTS: - static void appendSeriesChildren(QQmlListProperty *list, QObject *element); - void onHovered(bool status, QBoxSet *boxset); - void onClicked(QBoxSet *boxset); - void onPressed(QBoxSet *boxset); - void onReleased(QBoxSet *boxset); - void onDoubleClicked(QBoxSet *boxset); - -private Q_SLOTS: - void handleBrushChanged(); - -public: - DeclarativeAxes *m_axes; - -private: - QString m_brushFilename; - QImage m_brushImage; -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVEBOXPLOT_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativecandlestickseries.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativecandlestickseries.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativecandlestickseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativecandlestickseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -29,8 +29,8 @@ #include #include -#include "declarativeaxes_p.h" -#include "declarativecandlestickseries_p.h" +#include "declarativeaxes.h" +#include "declarativecandlestickseries.h" QT_CHARTS_BEGIN_NAMESPACE @@ -239,6 +239,6 @@ } } -QT_CHARTS_END_NAMESPACE +#include "moc_declarativecandlestickseries.cpp" -#include "moc_declarativecandlestickseries_p.cpp" +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativecandlestickseries.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativecandlestickseries.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativecandlestickseries.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativecandlestickseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,136 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVECANDLESTICKSERIES_H +#define DECLARATIVECANDLESTICKSERIES_H + +#include +#include +#include +#include + +QT_CHARTS_BEGIN_NAMESPACE + +class DeclarativeAxes; +class QAbstractAxis; + +class DeclarativeCandlestickSet : public QCandlestickSet +{ + Q_OBJECT + Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged) + +public: + explicit DeclarativeCandlestickSet(qreal timestamp = 0.0, QObject *parent = nullptr); + void setBrushFilename(const QString &brushFilename); + QString brushFilename() const; + +Q_SIGNALS: + void brushFilenameChanged(const QString &brushFilename); + +private Q_SLOTS: + void handleBrushChanged(); + +private: + QString m_brushFilename; + QImage m_brushImage; +}; + +class DeclarativeCandlestickSeries : public QCandlestickSeries, public QQmlParserStatus +{ + Q_OBJECT + Q_INTERFACES(QQmlParserStatus) + Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) + Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged) + Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged) + Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged) + Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) + Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged) + Q_CLASSINFO("DefaultProperty", "seriesChildren") + +public: + explicit DeclarativeCandlestickSeries(QQuickItem *parent = nullptr); + void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisX() { return m_axes->axisX(); } + void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + QAbstractAxis *axisY() { return m_axes->axisY(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + QQmlListProperty seriesChildren(); + void setBrushFilename(const QString &brushFilename); + QString brushFilename() const; + +public: + Q_INVOKABLE DeclarativeCandlestickSet *at(int index); + Q_INVOKABLE bool append(DeclarativeCandlestickSet *set); + Q_INVOKABLE bool remove(DeclarativeCandlestickSet *set); + Q_INVOKABLE bool append(qreal open, qreal high, qreal low, qreal close, qreal timestamp); + Q_INVOKABLE bool remove(qreal timestamp); + Q_INVOKABLE bool insert(int index, DeclarativeCandlestickSet *set); + Q_INVOKABLE void clear(); + +public: // from QDeclarativeParserStatus + void classBegin(); + void componentComplete(); + +Q_SIGNALS: + void axisXChanged(QAbstractAxis *axis); + void axisYChanged(QAbstractAxis *axis); + void axisXTopChanged(QAbstractAxis *axis); + void axisYRightChanged(QAbstractAxis *axis); + void clicked(DeclarativeCandlestickSet *set); + void hovered(bool status, DeclarativeCandlestickSet *set); + void pressed(DeclarativeCandlestickSet *set); + void released(DeclarativeCandlestickSet *set); + void doubleClicked(DeclarativeCandlestickSet *set); + void brushFilenameChanged(const QString &brushFilename); + +public Q_SLOTS: + static void appendSeriesChildren(QQmlListProperty *list, QObject *element); + void onClicked(QCandlestickSet *set); + void onHovered(bool status, QCandlestickSet *set); + void onPressed(QCandlestickSet *set); + void onReleased(QCandlestickSet *set); + void onDoubleClicked(QCandlestickSet *set); + +private Q_SLOTS: + void handleBrushChanged(); + +public: + DeclarativeAxes *m_axes; + +private: + QString m_brushFilename; + QImage m_brushImage; +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVECANDLESTICKSERIES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativecandlestickseries_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativecandlestickseries_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativecandlestickseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativecandlestickseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,146 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVECANDLESTICKSERIES_H -#define DECLARATIVECANDLESTICKSERIES_H - -#include -#include -#include -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class DeclarativeAxes; -class QAbstractAxis; - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeCandlestickSet : public QCandlestickSet -{ - Q_OBJECT - Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged) - -public: - explicit DeclarativeCandlestickSet(qreal timestamp = 0.0, QObject *parent = nullptr); - void setBrushFilename(const QString &brushFilename); - QString brushFilename() const; - -Q_SIGNALS: - void brushFilenameChanged(const QString &brushFilename); - -private Q_SLOTS: - void handleBrushChanged(); - -private: - QString m_brushFilename; - QImage m_brushImage; -}; - -class DeclarativeCandlestickSeries : public QCandlestickSeries, public QQmlParserStatus -{ - Q_OBJECT - Q_INTERFACES(QQmlParserStatus) - Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) - Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged) - Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged) - Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged) - Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) - Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged) - Q_CLASSINFO("DefaultProperty", "seriesChildren") - -public: - explicit DeclarativeCandlestickSeries(QQuickItem *parent = nullptr); - void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - QAbstractAxis *axisX() { return m_axes->axisX(); } - void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - QAbstractAxis *axisY() { return m_axes->axisY(); } - void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - QQmlListProperty seriesChildren(); - void setBrushFilename(const QString &brushFilename); - QString brushFilename() const; - -public: - Q_INVOKABLE DeclarativeCandlestickSet *at(int index); - Q_INVOKABLE bool append(DeclarativeCandlestickSet *set); - Q_INVOKABLE bool remove(DeclarativeCandlestickSet *set); - Q_INVOKABLE bool append(qreal open, qreal high, qreal low, qreal close, qreal timestamp); - Q_INVOKABLE bool remove(qreal timestamp); - Q_INVOKABLE bool insert(int index, DeclarativeCandlestickSet *set); - Q_INVOKABLE void clear(); - -public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); - -Q_SIGNALS: - void axisXChanged(QAbstractAxis *axis); - void axisYChanged(QAbstractAxis *axis); - void axisXTopChanged(QAbstractAxis *axis); - void axisYRightChanged(QAbstractAxis *axis); - void clicked(DeclarativeCandlestickSet *set); - void hovered(bool status, DeclarativeCandlestickSet *set); - void pressed(DeclarativeCandlestickSet *set); - void released(DeclarativeCandlestickSet *set); - void doubleClicked(DeclarativeCandlestickSet *set); - void brushFilenameChanged(const QString &brushFilename); - -public Q_SLOTS: - static void appendSeriesChildren(QQmlListProperty *list, QObject *element); - void onClicked(QCandlestickSet *set); - void onHovered(bool status, QCandlestickSet *set); - void onPressed(QCandlestickSet *set); - void onReleased(QCandlestickSet *set); - void onDoubleClicked(QCandlestickSet *set); - -private Q_SLOTS: - void handleBrushChanged(); - -public: - DeclarativeAxes *m_axes; - -private: - QString m_brushFilename; - QImage m_brushImage; -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVECANDLESTICKSERIES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativecategoryaxis.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativecategoryaxis.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativecategoryaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativecategoryaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativecategoryaxis_p.h" +#include "declarativecategoryaxis.h" #include QT_CHARTS_BEGIN_NAMESPACE @@ -133,6 +133,6 @@ } } -QT_CHARTS_END_NAMESPACE +#include "moc_declarativecategoryaxis.cpp" -#include "moc_declarativecategoryaxis_p.cpp" +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativecategoryaxis.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativecategoryaxis.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativecategoryaxis.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativecategoryaxis.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,104 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVECATEGORYAXIS_H +#define DECLARATIVECATEGORYAXIS_H + +#include + +#include +#include + +QT_CHARTS_BEGIN_NAMESPACE + +class DeclarativeCategoryRange : public QObject +{ + Q_OBJECT + Q_PROPERTY(qreal endValue READ endValue WRITE setEndValue) + Q_PROPERTY(QString label READ label WRITE setLabel) + +public: + explicit DeclarativeCategoryRange(QObject *parent = 0); + qreal endValue() { return m_endValue; } + void setEndValue(qreal endValue) { m_endValue = endValue; } + QString label() { return m_label; } + void setLabel(QString label) { m_label = label; } + +private: + qreal m_endValue; + QString m_label; +}; + +class DeclarativeCategoryAxis : public QCategoryAxis, public QQmlParserStatus +{ + Q_OBJECT + Q_INTERFACES(QQmlParserStatus) + Q_PROPERTY(QQmlListProperty axisChildren READ axisChildren) + Q_CLASSINFO("DefaultProperty", "axisChildren") + Q_PROPERTY(AxisLabelsPosition labelsPosition READ labelsPosition WRITE setLabelsPosition NOTIFY labelsPositionChanged REVISION 1) + Q_ENUMS(AxisLabelsPosition) + +public: + // duplicating enums from QChart to make the QML api namings 1-to-1 with the C++ api + enum AxisLabelsPosition { + AxisLabelsPositionCenter = 0x0, + AxisLabelsPositionOnValue = 0x1 + }; + + explicit DeclarativeCategoryAxis(QObject *parent = 0); + QQmlListProperty axisChildren(); + + +public: // from QDeclarativeParserStatus + void classBegin(); + void componentComplete(); + +public: + AxisLabelsPosition labelsPosition() const; + void setLabelsPosition(AxisLabelsPosition position); + +Q_SIGNALS: + Q_REVISION(1) void labelsPositionChanged(AxisLabelsPosition position); + +public Q_SLOTS: + Q_INVOKABLE void append(const QString &label, qreal categoryEndValue); + Q_INVOKABLE void remove(const QString &label); + Q_INVOKABLE void replace(const QString &oldLabel, const QString &newLabel); + static void appendAxisChildren(QQmlListProperty *list, QObject *element); + +private: + static bool endValueLessThan(const QPair &value1, const QPair &value2); + +private: + AxisLabelsPosition m_labelsPosition; +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVECATEGORYAXIS_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativecategoryaxis_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativecategoryaxis_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativecategoryaxis_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativecategoryaxis_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,114 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVECATEGORYAXIS_H -#define DECLARATIVECATEGORYAXIS_H - -#include -#include - -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeCategoryRange : public QObject -{ - Q_OBJECT - Q_PROPERTY(qreal endValue READ endValue WRITE setEndValue) - Q_PROPERTY(QString label READ label WRITE setLabel) - -public: - explicit DeclarativeCategoryRange(QObject *parent = 0); - qreal endValue() { return m_endValue; } - void setEndValue(qreal endValue) { m_endValue = endValue; } - QString label() { return m_label; } - void setLabel(QString label) { m_label = label; } - -private: - qreal m_endValue; - QString m_label; -}; - -class DeclarativeCategoryAxis : public QCategoryAxis, public QQmlParserStatus -{ - Q_OBJECT - Q_INTERFACES(QQmlParserStatus) - Q_PROPERTY(QQmlListProperty axisChildren READ axisChildren) - Q_CLASSINFO("DefaultProperty", "axisChildren") - Q_PROPERTY(AxisLabelsPosition labelsPosition READ labelsPosition WRITE setLabelsPosition NOTIFY labelsPositionChanged REVISION 1) - Q_ENUMS(AxisLabelsPosition) - -public: - // duplicating enums from QChart to make the QML api namings 1-to-1 with the C++ api - enum AxisLabelsPosition { - AxisLabelsPositionCenter = 0x0, - AxisLabelsPositionOnValue = 0x1 - }; - - explicit DeclarativeCategoryAxis(QObject *parent = 0); - QQmlListProperty axisChildren(); - - -public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); - -public: - AxisLabelsPosition labelsPosition() const; - void setLabelsPosition(AxisLabelsPosition position); - -Q_SIGNALS: - Q_REVISION(1) void labelsPositionChanged(AxisLabelsPosition position); - -public Q_SLOTS: - Q_INVOKABLE void append(const QString &label, qreal categoryEndValue); - Q_INVOKABLE void remove(const QString &label); - Q_INVOKABLE void replace(const QString &oldLabel, const QString &newLabel); - static void appendAxisChildren(QQmlListProperty *list, QObject *element); - -private: - static bool endValueLessThan(const QPair &value1, const QPair &value2); - -private: - AxisLabelsPosition m_labelsPosition; -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVECATEGORYAXIS_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativechart.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativechart.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativechart.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativechart.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -27,26 +27,26 @@ ** ****************************************************************************/ -#include "declarativechart_p.h" +#include "declarativechart.h" #include -#include "declarativelineseries_p.h" -#include "declarativeareaseries_p.h" -#include "declarativebarseries_p.h" -#include "declarativepieseries_p.h" -#include "declarativesplineseries_p.h" -#include "declarativeboxplotseries_p.h" -#include "declarativecandlestickseries_p.h" -#include "declarativescatterseries_p.h" -#include "declarativechartnode_p.h" -#include "declarativeabstractrendernode_p.h" +#include "declarativelineseries.h" +#include "declarativeareaseries.h" +#include "declarativebarseries.h" +#include "declarativepieseries.h" +#include "declarativesplineseries.h" +#include "declarativeboxplotseries.h" +#include "declarativecandlestickseries.h" +#include "declarativescatterseries.h" +#include "declarativechartnode.h" +#include "declarativeabstractrendernode.h" #include #include #include #include #include -#include "declarativemargins_p.h" +#include "declarativemargins.h" #include -#include "declarativeaxes_p.h" +#include "declarativeaxes.h" #include #include #include @@ -211,9 +211,7 @@ \qmlproperty rect ChartView::plotArea The rectangle within which the chart is drawn. - The plot area does not include the area defined by margins. By default this will resize if inside - a ChartView. If an explicit rectangle is set for the plot area then it will respect this, to revert - back to the default behavior, then setting it to \c{Qt.rect(0, 0, 0, 0)} will achieve this. + The plot area does not include the area defined by margins. \sa margins */ @@ -441,23 +439,6 @@ initChart(type); } -// QTBUG-71013 -// The symbol resides in qbarmodelmapper.cpp#548 in the C++ module. -// Here, it gets imported and reset to the DeclarativeBarSet allocator -#if defined(Q_OS_WIN) && !defined(QT_STATIC) -QT_CHARTS_EXPORT -#else -extern -#endif -QBarSet *(*qt_allocate_bar_set)(const QString &label); - -QBarSet *qt_allocate_bar_set_qml(const QString &label) -{ - auto bar = new DeclarativeBarSet(); - bar->setLabel(label); - return bar; -} - void DeclarativeChart::initChart(QChart::ChartType type) { m_sceneImage = 0; @@ -469,10 +450,6 @@ setFlag(ItemHasContents, true); - // Reset allocator for QBarSet to create - // Declarative BarSets by default - qt_allocate_bar_set = &qt_allocate_bar_set_qml; - if (type == QChart::ChartTypePolar) m_chart = new QPolarChart(); else @@ -511,7 +488,7 @@ this, SLOT(changeMargins(int,int,int,int))); connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries*)), this, SLOT(handleSeriesAdded(QAbstractSeries*))); connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), this, SIGNAL(seriesRemoved(QAbstractSeries*))); - connect(m_chart, SIGNAL(plotAreaChanged(QRectF)), this, SIGNAL(plotAreaChanged(QRectF))); + connect(m_chart, &QChart::plotAreaChanged, this, &DeclarativeChart::plotAreaChanged); } void DeclarativeChart::handleSeriesAdded(QAbstractSeries *series) @@ -1492,11 +1469,6 @@ return m_chart->mapToPosition(value, series); } -void DeclarativeChart::setPlotArea(const QRectF &rect) -{ - m_chart->setPlotArea(rect); -} +#include "moc_declarativechart.cpp" QT_CHARTS_END_NAMESPACE - -#include "moc_declarativechart_p.cpp" diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativechartglobal_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativechartglobal_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativechartglobal_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativechartglobal_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVECHARTGLOBAL_H -#define DECLARATIVECHARTGLOBAL_H - -#include - -#ifndef QT_STATIC -# if defined(QT_BUILD_QMLCHARTS_LIB) -# define QT_QMLCHARTS_PRIVATE_EXPORT Q_DECL_EXPORT -# else -# define QT_QMLCHARTS_PRIVATE_EXPORT Q_DECL_IMPORT -# endif -#else -# define QT_QMLCHARTS_PRIVATE_EXPORT -#endif - -#endif // DECLARATIVECHARTGLOBAL_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativechart.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativechart.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativechart.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativechart.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,264 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVECHART_H +#define DECLARATIVECHART_H + +#include +#include "declarativeabstractrendernode.h" + +#include +#include +#include + +#include +#include +#include + +QT_CHARTS_BEGIN_NAMESPACE + +class DeclarativeMargins; +class Domain; +class DeclarativeAxes; + +class DeclarativeChart : public QQuickItem +{ + Q_OBJECT + Q_PROPERTY(Theme theme READ theme WRITE setTheme) + Q_PROPERTY(Animation animationOptions READ animationOptions WRITE setAnimationOptions) + Q_PROPERTY(int animationDuration READ animationDuration WRITE setAnimationDuration NOTIFY animationDurationChanged REVISION 5) + Q_PROPERTY(QEasingCurve animationEasingCurve READ animationEasingCurve WRITE setAnimationEasingCurve NOTIFY animationEasingCurveChanged REVISION 5) + Q_PROPERTY(QString title READ title WRITE setTitle) + Q_PROPERTY(QFont titleFont READ titleFont WRITE setTitleFont) + Q_PROPERTY(QColor titleColor READ titleColor WRITE setTitleColor NOTIFY titleColorChanged) + Q_PROPERTY(QLegend *legend READ legend CONSTANT) + Q_PROPERTY(int count READ count) + Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged) + Q_PROPERTY(bool dropShadowEnabled READ dropShadowEnabled WRITE setDropShadowEnabled NOTIFY dropShadowEnabledChanged) + Q_PROPERTY(qreal backgroundRoundness READ backgroundRoundness WRITE setBackgroundRoundness NOTIFY backgroundRoundnessChanged REVISION 3) + Q_PROPERTY(DeclarativeMargins *margins READ margins NOTIFY marginsChanged REVISION 2) + Q_PROPERTY(QRectF plotArea READ plotArea NOTIFY plotAreaChanged REVISION 1) + Q_PROPERTY(QColor plotAreaColor READ plotAreaColor WRITE setPlotAreaColor NOTIFY plotAreaColorChanged REVISION 3) + Q_PROPERTY(QQmlListProperty axes READ axes REVISION 2) + Q_PROPERTY(bool localizeNumbers READ localizeNumbers WRITE setLocalizeNumbers NOTIFY localizeNumbersChanged REVISION 4) + Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged REVISION 4) + Q_ENUMS(Animation) + Q_ENUMS(Theme) + Q_ENUMS(SeriesType) + +public: + // duplicating enums from QChart to make the QML api namings 1-to-1 with the C++ api + enum Theme { + ChartThemeLight = 0, + ChartThemeBlueCerulean, + ChartThemeDark, + ChartThemeBrownSand, + ChartThemeBlueNcs, + ChartThemeHighContrast, + ChartThemeBlueIcy, + ChartThemeQt + }; + + enum Animation { + NoAnimation = 0x0, + GridAxisAnimations = 0x1, + SeriesAnimations = 0x2, + AllAnimations = 0x3 + }; + + enum SeriesType { + SeriesTypeLine, + SeriesTypeArea, + SeriesTypeBar, + SeriesTypeStackedBar, + SeriesTypePercentBar, + SeriesTypePie, + SeriesTypeScatter, + SeriesTypeSpline, + SeriesTypeHorizontalBar, + SeriesTypeHorizontalStackedBar, + SeriesTypeHorizontalPercentBar, + SeriesTypeBoxPlot, + SeriesTypeCandlestick + }; + +public: + DeclarativeChart(QQuickItem *parent = 0); + ~DeclarativeChart(); + +public: // From parent classes + void childEvent(QChildEvent *event); + void componentComplete(); + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *); +protected: + void mousePressEvent(QMouseEvent *event); + void mouseReleaseEvent(QMouseEvent *event); + void hoverMoveEvent(QHoverEvent *event); + void mouseDoubleClickEvent(QMouseEvent *event); +private Q_SLOTS: + void handleAntialiasingChanged(bool enable); + void sceneChanged(QList region); + void renderScene(); + +public: + void setTheme(DeclarativeChart::Theme theme); + DeclarativeChart::Theme theme(); + void setAnimationOptions(DeclarativeChart::Animation animations); + DeclarativeChart::Animation animationOptions(); + void setAnimationDuration(int msecs); + int animationDuration() const; + void setAnimationEasingCurve(const QEasingCurve &curve); + QEasingCurve animationEasingCurve() const; + void setTitle(QString title); + QString title(); + QLegend *legend(); + QFont titleFont() const; + void setTitleFont(const QFont &font); + void setTitleColor(QColor color); + QColor titleColor(); + void setBackgroundColor(QColor color); + QColor backgroundColor(); + void setPlotAreaColor(QColor color); + QColor plotAreaColor(); + void setLocalizeNumbers(bool localize); + bool localizeNumbers() const; + void setLocale(const QLocale &locale); + QLocale locale() const; + + int count(); + void setDropShadowEnabled(bool enabled); + bool dropShadowEnabled(); + qreal backgroundRoundness() const; + void setBackgroundRoundness(qreal diameter); + + // Margins & plotArea + DeclarativeMargins *margins() { return m_margins; } + QRectF plotArea() { return m_chart->plotArea(); } + + // Axis handling + QAbstractAxis *defaultAxis(Qt::Orientation orientation, QAbstractSeries *series); + void initializeAxes(QAbstractSeries *series); + void doInitializeAxes(QAbstractSeries *series, DeclarativeAxes *axes); + QQmlListProperty axes(); + static void axesAppendFunc(QQmlListProperty *list, QAbstractAxis *element); + static int axesCountFunc(QQmlListProperty *list); + static QAbstractAxis *axesAtFunc(QQmlListProperty *list, int index); + static void axesClearFunc(QQmlListProperty *list); + +public: + Q_INVOKABLE QAbstractSeries *series(int index); + Q_INVOKABLE QAbstractSeries *series(QString seriesName); + Q_INVOKABLE QAbstractSeries *createSeries(int type, QString name = "", QAbstractAxis *axisX = 0, QAbstractAxis *axisY = 0); + Q_INVOKABLE void removeSeries(QAbstractSeries *series); + Q_INVOKABLE void removeAllSeries() { m_chart->removeAllSeries(); } + Q_INVOKABLE void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = 0); + Q_INVOKABLE void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = 0); + Q_INVOKABLE QAbstractAxis *axisX(QAbstractSeries *series = 0); + Q_INVOKABLE QAbstractAxis *axisY(QAbstractSeries *series = 0); + Q_INVOKABLE void zoom(qreal factor); + Q_REVISION(5) Q_INVOKABLE void zoomIn(); + Q_REVISION(5) Q_INVOKABLE void zoomIn(const QRectF &rectangle); + Q_REVISION(5) Q_INVOKABLE void zoomOut(); + Q_REVISION(5) Q_INVOKABLE void zoomReset(); + Q_REVISION(5) Q_INVOKABLE bool isZoomed(); + Q_INVOKABLE void scrollLeft(qreal pixels); + Q_INVOKABLE void scrollRight(qreal pixels); + Q_INVOKABLE void scrollUp(qreal pixels); + Q_INVOKABLE void scrollDown(qreal pixels); + Q_REVISION(5) Q_INVOKABLE QPointF mapToValue(const QPointF &position, + QAbstractSeries *series = 0); + Q_REVISION(5) Q_INVOKABLE QPointF mapToPosition(const QPointF &value, + QAbstractSeries *series = 0); + + +Q_SIGNALS: + void axisLabelsChanged(); + void titleColorChanged(QColor color); + void backgroundColorChanged(); + void dropShadowEnabledChanged(bool enabled); + Q_REVISION(2) void marginsChanged(); + void plotAreaChanged(QRectF plotArea); + void seriesAdded(QAbstractSeries *series); + void seriesRemoved(QAbstractSeries *series); + Q_REVISION(3) void plotAreaColorChanged(); + Q_REVISION(3) void backgroundRoundnessChanged(qreal diameter); + Q_REVISION(4) void localizeNumbersChanged(); + Q_REVISION(4) void localeChanged(); + Q_REVISION(5) void animationDurationChanged(int msecs); + Q_REVISION(5) void animationEasingCurveChanged(QEasingCurve curve); + void needRender(); + void pendingRenderNodeMouseEventResponses(); + +private Q_SLOTS: + void changeMargins(int top, int bottom, int left, int right); + void handleAxisXSet(QAbstractAxis *axis); + void handleAxisYSet(QAbstractAxis *axis); + void handleAxisXTopSet(QAbstractAxis *axis); + void handleAxisYRightSet(QAbstractAxis *axis); + void handleSeriesAdded(QAbstractSeries *series); + void handlePendingRenderNodeMouseEventResponses(); + +protected: + explicit DeclarativeChart(QChart::ChartType type, QQuickItem *parent); + +private: + void initChart(QChart::ChartType type); + void seriesAxisAttachHelper(QAbstractSeries *series, QAbstractAxis *axis, + Qt::Orientations orientation, Qt::Alignment alignment); + void findMinMaxForSeries(QAbstractSeries *series,Qt::Orientations orientation, + qreal &min, qreal &max); + void queueRendererMouseEvent(QMouseEvent *event); + + // Extending QChart with DeclarativeChart is not possible because QObject does not support + // multi inheritance, so we now have a QChart as a member instead + QChart *m_chart; + QGraphicsScene *m_scene; + QPointF m_mousePressScenePoint; + QPoint m_mousePressScreenPoint; + QPointF m_lastMouseMoveScenePoint; + QPoint m_lastMouseMoveScreenPoint; + Qt::MouseButton m_mousePressButton; + Qt::MouseButtons m_mousePressButtons; + QImage *m_sceneImage; + bool m_sceneImageDirty; + bool m_updatePending; + Qt::HANDLE m_paintThreadId; + Qt::HANDLE m_guiThreadId; + DeclarativeMargins *m_margins; + GLXYSeriesDataManager *m_glXYDataManager; + bool m_sceneImageNeedsClear; + QVector m_pendingRenderNodeMouseEvents; + QVector m_pendingRenderNodeMouseEventResponses; + QRectF m_adjustedPlotArea; +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVECHART_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativechartnode.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativechartnode.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativechartnode.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativechartnode.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -27,15 +27,15 @@ ** ****************************************************************************/ -#include "declarativechartnode_p.h" -#include "declarativeabstractrendernode_p.h" +#include "declarativechartnode.h" +#include "declarativeabstractrendernode.h" #include #include #include #ifndef QT_NO_OPENGL -# include "declarativeopenglrendernode_p.h" +# include "declarativeopenglrendernode.h" #endif QT_CHARTS_BEGIN_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativechartnode.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativechartnode.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativechartnode.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativechartnode.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,61 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVECHARTNODE_P_H +#define DECLARATIVECHARTNODE_P_H + +#include +#include +#include +#include + +QT_CHARTS_BEGIN_NAMESPACE + +class DeclarativeAbstractRenderNode; +class DeclarativeChartNode : public QSGRootNode +{ +public: + DeclarativeChartNode(QQuickWindow *window); + ~DeclarativeChartNode(); + + void createTextureFromImage(const QImage &chartImage); + DeclarativeAbstractRenderNode *renderNode() const { return m_renderNode; } + + void setRect(const QRectF &rect); + +private: + QRectF m_rect; + QQuickWindow *m_window; + DeclarativeAbstractRenderNode *m_renderNode; + QSGImageNode *m_imageNode; +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVECHARTNODE_P_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativechartnode_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativechartnode_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativechartnode_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativechartnode_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVECHARTNODE_P_H -#define DECLARATIVECHARTNODE_P_H - -#include -#include -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class DeclarativeAbstractRenderNode; -class DeclarativeChartNode : public QSGRootNode -{ -public: - DeclarativeChartNode(QQuickWindow *window); - ~DeclarativeChartNode(); - - void createTextureFromImage(const QImage &chartImage); - DeclarativeAbstractRenderNode *renderNode() const { return m_renderNode; } - - void setRect(const QRectF &rect); - -private: - QRectF m_rect; - QQuickWindow *m_window; - DeclarativeAbstractRenderNode *m_renderNode; - QSGImageNode *m_imageNode; -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVECHARTNODE_P_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativechart_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativechart_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativechart_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativechart_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,275 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVECHART_H -#define DECLARATIVECHART_H - -#include -#include -#include - -#include -#include -#include - -#include -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class DeclarativeMargins; -class Domain; -class DeclarativeAxes; - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeChart : public QQuickItem -{ - Q_OBJECT - Q_PROPERTY(Theme theme READ theme WRITE setTheme) - Q_PROPERTY(Animation animationOptions READ animationOptions WRITE setAnimationOptions) - Q_PROPERTY(int animationDuration READ animationDuration WRITE setAnimationDuration NOTIFY animationDurationChanged REVISION 5) - Q_PROPERTY(QEasingCurve animationEasingCurve READ animationEasingCurve WRITE setAnimationEasingCurve NOTIFY animationEasingCurveChanged REVISION 5) - Q_PROPERTY(QString title READ title WRITE setTitle) - Q_PROPERTY(QFont titleFont READ titleFont WRITE setTitleFont) - Q_PROPERTY(QColor titleColor READ titleColor WRITE setTitleColor NOTIFY titleColorChanged) - Q_PROPERTY(QtCharts::QLegend *legend READ legend CONSTANT) - Q_PROPERTY(int count READ count) - Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged) - Q_PROPERTY(bool dropShadowEnabled READ dropShadowEnabled WRITE setDropShadowEnabled NOTIFY dropShadowEnabledChanged) - Q_PROPERTY(qreal backgroundRoundness READ backgroundRoundness WRITE setBackgroundRoundness NOTIFY backgroundRoundnessChanged REVISION 3) - Q_PROPERTY(QtCharts::DeclarativeMargins *margins READ margins NOTIFY marginsChanged REVISION 2) - Q_PROPERTY(QRectF plotArea READ plotArea WRITE setPlotArea NOTIFY plotAreaChanged REVISION 1) - Q_PROPERTY(QColor plotAreaColor READ plotAreaColor WRITE setPlotAreaColor NOTIFY plotAreaColorChanged REVISION 3) - Q_PROPERTY(QQmlListProperty axes READ axes REVISION 2) - Q_PROPERTY(bool localizeNumbers READ localizeNumbers WRITE setLocalizeNumbers NOTIFY localizeNumbersChanged REVISION 4) - Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged REVISION 4) - Q_ENUMS(Animation) - Q_ENUMS(Theme) - Q_ENUMS(SeriesType) - -public: - // duplicating enums from QChart to make the QML api namings 1-to-1 with the C++ api - enum Theme { - ChartThemeLight = 0, - ChartThemeBlueCerulean, - ChartThemeDark, - ChartThemeBrownSand, - ChartThemeBlueNcs, - ChartThemeHighContrast, - ChartThemeBlueIcy, - ChartThemeQt - }; - - enum Animation { - NoAnimation = 0x0, - GridAxisAnimations = 0x1, - SeriesAnimations = 0x2, - AllAnimations = 0x3 - }; - - enum SeriesType { - SeriesTypeLine, - SeriesTypeArea, - SeriesTypeBar, - SeriesTypeStackedBar, - SeriesTypePercentBar, - SeriesTypePie, - SeriesTypeScatter, - SeriesTypeSpline, - SeriesTypeHorizontalBar, - SeriesTypeHorizontalStackedBar, - SeriesTypeHorizontalPercentBar, - SeriesTypeBoxPlot, - SeriesTypeCandlestick - }; - -public: - DeclarativeChart(QQuickItem *parent = 0); - ~DeclarativeChart(); - -public: // From parent classes - void childEvent(QChildEvent *event); - void componentComplete(); - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *); -protected: - void mousePressEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void hoverMoveEvent(QHoverEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); -private Q_SLOTS: - void handleAntialiasingChanged(bool enable); - void sceneChanged(QList region); - void renderScene(); - -public: - void setTheme(DeclarativeChart::Theme theme); - DeclarativeChart::Theme theme(); - void setAnimationOptions(DeclarativeChart::Animation animations); - DeclarativeChart::Animation animationOptions(); - void setAnimationDuration(int msecs); - int animationDuration() const; - void setAnimationEasingCurve(const QEasingCurve &curve); - QEasingCurve animationEasingCurve() const; - void setTitle(QString title); - QString title(); - QLegend *legend(); - QFont titleFont() const; - void setTitleFont(const QFont &font); - void setTitleColor(QColor color); - QColor titleColor(); - void setBackgroundColor(QColor color); - QColor backgroundColor(); - void setPlotAreaColor(QColor color); - QColor plotAreaColor(); - void setLocalizeNumbers(bool localize); - bool localizeNumbers() const; - void setLocale(const QLocale &locale); - QLocale locale() const; - - int count(); - void setDropShadowEnabled(bool enabled); - bool dropShadowEnabled(); - qreal backgroundRoundness() const; - void setBackgroundRoundness(qreal diameter); - - // Margins & plotArea - DeclarativeMargins *margins() { return m_margins; } - QRectF plotArea() { return m_chart->plotArea(); } - void setPlotArea(const QRectF &rect); - - // Axis handling - QAbstractAxis *defaultAxis(Qt::Orientation orientation, QAbstractSeries *series); - void initializeAxes(QAbstractSeries *series); - void doInitializeAxes(QAbstractSeries *series, DeclarativeAxes *axes); - QQmlListProperty axes(); - static void axesAppendFunc(QQmlListProperty *list, QAbstractAxis *element); - static int axesCountFunc(QQmlListProperty *list); - static QAbstractAxis *axesAtFunc(QQmlListProperty *list, int index); - static void axesClearFunc(QQmlListProperty *list); - -public: - Q_INVOKABLE QAbstractSeries *series(int index); - Q_INVOKABLE QAbstractSeries *series(QString seriesName); - Q_INVOKABLE QAbstractSeries *createSeries(int type, QString name = "", QAbstractAxis *axisX = 0, QAbstractAxis *axisY = 0); - Q_INVOKABLE void removeSeries(QAbstractSeries *series); - Q_INVOKABLE void removeAllSeries() { m_chart->removeAllSeries(); } - Q_INVOKABLE void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = 0); - Q_INVOKABLE void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = 0); - Q_INVOKABLE QAbstractAxis *axisX(QAbstractSeries *series = 0); - Q_INVOKABLE QAbstractAxis *axisY(QAbstractSeries *series = 0); - Q_INVOKABLE void zoom(qreal factor); - Q_REVISION(5) Q_INVOKABLE void zoomIn(); - Q_REVISION(5) Q_INVOKABLE void zoomIn(const QRectF &rectangle); - Q_REVISION(5) Q_INVOKABLE void zoomOut(); - Q_REVISION(5) Q_INVOKABLE void zoomReset(); - Q_REVISION(5) Q_INVOKABLE bool isZoomed(); - Q_INVOKABLE void scrollLeft(qreal pixels); - Q_INVOKABLE void scrollRight(qreal pixels); - Q_INVOKABLE void scrollUp(qreal pixels); - Q_INVOKABLE void scrollDown(qreal pixels); - Q_REVISION(5) Q_INVOKABLE QPointF mapToValue(const QPointF &position, - QAbstractSeries *series = 0); - Q_REVISION(5) Q_INVOKABLE QPointF mapToPosition(const QPointF &value, - QAbstractSeries *series = 0); - - -Q_SIGNALS: - void axisLabelsChanged(); - void titleColorChanged(QColor color); - void backgroundColorChanged(); - void dropShadowEnabledChanged(bool enabled); - Q_REVISION(2) void marginsChanged(); - void plotAreaChanged(QRectF plotArea); - void seriesAdded(QAbstractSeries *series); - void seriesRemoved(QAbstractSeries *series); - Q_REVISION(3) void plotAreaColorChanged(); - Q_REVISION(3) void backgroundRoundnessChanged(qreal diameter); - Q_REVISION(4) void localizeNumbersChanged(); - Q_REVISION(4) void localeChanged(); - Q_REVISION(5) void animationDurationChanged(int msecs); - Q_REVISION(5) void animationEasingCurveChanged(QEasingCurve curve); - void needRender(); - void pendingRenderNodeMouseEventResponses(); - -private Q_SLOTS: - void changeMargins(int top, int bottom, int left, int right); - void handleAxisXSet(QAbstractAxis *axis); - void handleAxisYSet(QAbstractAxis *axis); - void handleAxisXTopSet(QAbstractAxis *axis); - void handleAxisYRightSet(QAbstractAxis *axis); - void handleSeriesAdded(QAbstractSeries *series); - void handlePendingRenderNodeMouseEventResponses(); - -protected: - explicit DeclarativeChart(QChart::ChartType type, QQuickItem *parent); - -private: - void initChart(QChart::ChartType type); - void seriesAxisAttachHelper(QAbstractSeries *series, QAbstractAxis *axis, - Qt::Orientations orientation, Qt::Alignment alignment); - void findMinMaxForSeries(QAbstractSeries *series,Qt::Orientations orientation, - qreal &min, qreal &max); - void queueRendererMouseEvent(QMouseEvent *event); - - // Extending QChart with DeclarativeChart is not possible because QObject does not support - // multi inheritance, so we now have a QChart as a member instead - QChart *m_chart; - QGraphicsScene *m_scene; - QPointF m_mousePressScenePoint; - QPoint m_mousePressScreenPoint; - QPointF m_lastMouseMoveScenePoint; - QPoint m_lastMouseMoveScreenPoint; - Qt::MouseButton m_mousePressButton; - Qt::MouseButtons m_mousePressButtons; - QImage *m_sceneImage; - bool m_sceneImageDirty; - bool m_updatePending; - Qt::HANDLE m_paintThreadId; - Qt::HANDLE m_guiThreadId; - DeclarativeMargins *m_margins; - GLXYSeriesDataManager *m_glXYDataManager; - bool m_sceneImageNeedsClear; - QVector m_pendingRenderNodeMouseEvents; - QVector m_pendingRenderNodeMouseEventResponses; - QRectF m_adjustedPlotArea; -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVECHART_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativelineseries.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativelineseries.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativelineseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativelineseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativelineseries_p.h" +#include "declarativelineseries.h" QT_CHARTS_BEGIN_NAMESPACE @@ -109,6 +109,6 @@ // Empty implementation, children are parsed in componentComplete } -QT_CHARTS_END_NAMESPACE +#include "moc_declarativelineseries.cpp" -#include "moc_declarativelineseries_p.cpp" +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativelineseries.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativelineseries.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativelineseries.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativelineseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,119 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVELINESERIES_H +#define DECLARATIVELINESERIES_H + +#include +#include "declarativexyseries.h" +#include "declarativeaxes.h" + +#include +#include + +QT_CHARTS_BEGIN_NAMESPACE + +class DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, public QQmlParserStatus +{ + Q_OBJECT + Q_INTERFACES(QQmlParserStatus) + Q_PROPERTY(int count READ count NOTIFY countChanged) + Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) + Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) + Q_PROPERTY(QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3) + Q_PROPERTY(QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3) + Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged REVISION 1) + Q_PROPERTY(Qt::PenStyle style READ style WRITE setStyle NOTIFY styleChanged REVISION 1) + Q_PROPERTY(Qt::PenCapStyle capStyle READ capStyle WRITE setCapStyle NOTIFY capStyleChanged REVISION 1) + Q_PROPERTY(QQmlListProperty declarativeChildren READ declarativeChildren) + Q_CLASSINFO("DefaultProperty", "declarativeChildren") + +public: + explicit DeclarativeLineSeries(QObject *parent = 0); + QXYSeries *xySeries() { return this; } + QAbstractAxis *axisX() { return m_axes->axisX(); } + void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisY() { return m_axes->axisY(); } + void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QAbstractAxis *axisAngular() { return m_axes->axisX(); } + void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisRadial() { return m_axes->axisY(); } + void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + qreal width() const; + void setWidth(qreal width); + Qt::PenStyle style() const; + void setStyle(Qt::PenStyle style); + Qt::PenCapStyle capStyle() const; + void setCapStyle(Qt::PenCapStyle capStyle); + QQmlListProperty declarativeChildren(); + +public: // from QDeclarativeParserStatus + void classBegin() { DeclarativeXySeries::classBegin(); } + void componentComplete() { DeclarativeXySeries::componentComplete(); } + +public: + Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); } + Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); } + Q_REVISION(3) Q_INVOKABLE void replace(int index, qreal newX, qreal newY) { DeclarativeXySeries::replace(index, newX, newY); } + Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); } + Q_REVISION(3) Q_INVOKABLE void remove(int index) { DeclarativeXySeries::remove(index); } + Q_REVISION(4) Q_INVOKABLE void removePoints(int index, int count) { DeclarativeXySeries::removePoints(index, count); } + Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); } + Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); } + Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); } + +Q_SIGNALS: + void countChanged(int count); + Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); + Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); + Q_REVISION(3) void axisAngularChanged(QAbstractAxis *axis); + Q_REVISION(3) void axisRadialChanged(QAbstractAxis *axis); + Q_REVISION(1) void widthChanged(qreal width); + Q_REVISION(1) void styleChanged(Qt::PenStyle style); + Q_REVISION(1) void capStyleChanged(Qt::PenCapStyle capStyle); + +public Q_SLOTS: + static void appendDeclarativeChildren(QQmlListProperty *list, QObject *element); + void handleCountChanged(int index); + +public: + DeclarativeAxes *m_axes; +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVELINESERIES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativelineseries_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativelineseries_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativelineseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativelineseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,129 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVELINESERIES_H -#define DECLARATIVELINESERIES_H - -#include -#include -#include -#include - -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, public QQmlParserStatus -{ - Q_OBJECT - Q_INTERFACES(QQmlParserStatus) - Q_PROPERTY(int count READ count NOTIFY countChanged) - Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) - Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) - Q_PROPERTY(QtCharts::QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3) - Q_PROPERTY(QtCharts::QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3) - Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged REVISION 1) - Q_PROPERTY(Qt::PenStyle style READ style WRITE setStyle NOTIFY styleChanged REVISION 1) - Q_PROPERTY(Qt::PenCapStyle capStyle READ capStyle WRITE setCapStyle NOTIFY capStyleChanged REVISION 1) - Q_PROPERTY(QQmlListProperty declarativeChildren READ declarativeChildren) - Q_CLASSINFO("DefaultProperty", "declarativeChildren") - -public: - explicit DeclarativeLineSeries(QObject *parent = 0); - QXYSeries *xySeries() { return this; } - QAbstractAxis *axisX() { return m_axes->axisX(); } - void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - QAbstractAxis *axisY() { return m_axes->axisY(); } - void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - QAbstractAxis *axisAngular() { return m_axes->axisX(); } - void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - QAbstractAxis *axisRadial() { return m_axes->axisY(); } - void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - qreal width() const; - void setWidth(qreal width); - Qt::PenStyle style() const; - void setStyle(Qt::PenStyle style); - Qt::PenCapStyle capStyle() const; - void setCapStyle(Qt::PenCapStyle capStyle); - QQmlListProperty declarativeChildren(); - -public: // from QDeclarativeParserStatus - void classBegin() { DeclarativeXySeries::classBegin(); } - void componentComplete() { DeclarativeXySeries::componentComplete(); } - -public: - Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); } - Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); } - Q_REVISION(3) Q_INVOKABLE void replace(int index, qreal newX, qreal newY) { DeclarativeXySeries::replace(index, newX, newY); } - Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); } - Q_REVISION(3) Q_INVOKABLE void remove(int index) { DeclarativeXySeries::remove(index); } - Q_REVISION(4) Q_INVOKABLE void removePoints(int index, int count) { DeclarativeXySeries::removePoints(index, count); } - Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); } - Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); } - Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); } - -Q_SIGNALS: - void countChanged(int count); - Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); - Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); - Q_REVISION(3) void axisAngularChanged(QAbstractAxis *axis); - Q_REVISION(3) void axisRadialChanged(QAbstractAxis *axis); - Q_REVISION(1) void widthChanged(qreal width); - Q_REVISION(1) void styleChanged(Qt::PenStyle style); - Q_REVISION(1) void capStyleChanged(Qt::PenCapStyle capStyle); - -public Q_SLOTS: - static void appendDeclarativeChildren(QQmlListProperty *list, QObject *element); - void handleCountChanged(int index); - -public: - DeclarativeAxes *m_axes; -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVELINESERIES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativemargins.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativemargins.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativemargins.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativemargins.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativemargins_p.h" +#include "declarativemargins.h" #include #include @@ -123,6 +123,6 @@ } } -QT_CHARTS_END_NAMESPACE +#include "moc_declarativemargins.cpp" -#include "moc_declarativemargins_p.cpp" +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativemargins.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativemargins.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativemargins.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativemargins.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVE_MARGINS_H +#define DECLARATIVE_MARGINS_H + +#include +#include +#include + +QT_CHARTS_BEGIN_NAMESPACE + +class DeclarativeMargins : public QObject, public QMargins +{ + Q_OBJECT + Q_PROPERTY(int top READ top WRITE setTop NOTIFY topChanged) + Q_PROPERTY(int bottom READ bottom WRITE setBottom NOTIFY bottomChanged) + Q_PROPERTY(int left READ left WRITE setLeft NOTIFY leftChanged) + Q_PROPERTY(int right READ right WRITE setRight NOTIFY rightChanged) + +public: + explicit DeclarativeMargins(QObject *parent = 0); + void setTop(int top); + void setBottom(int bottom); + void setLeft(int left); + void setRight(int right); + +Q_SIGNALS: + void topChanged(int top, int bottom, int left, int right); + void bottomChanged(int top, int bottom, int left, int right); + void leftChanged(int top, int bottom, int left, int right); + void rightChanged(int top, int bottom, int left, int right); +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVE_MARGINS_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativemargins_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativemargins_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativemargins_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativemargins_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVE_MARGINS_H -#define DECLARATIVE_MARGINS_H - -#include -#include -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeMargins : public QObject, public QMargins -{ - Q_OBJECT - Q_PROPERTY(int top READ top WRITE setTop NOTIFY topChanged) - Q_PROPERTY(int bottom READ bottom WRITE setBottom NOTIFY bottomChanged) - Q_PROPERTY(int left READ left WRITE setLeft NOTIFY leftChanged) - Q_PROPERTY(int right READ right WRITE setRight NOTIFY rightChanged) - -public: - explicit DeclarativeMargins(QObject *parent = 0); - void setTop(int top); - void setBottom(int bottom); - void setLeft(int left); - void setRight(int right); - -Q_SIGNALS: - void topChanged(int top, int bottom, int left, int right); - void bottomChanged(int top, int bottom, int left, int right); - void leftChanged(int top, int bottom, int left, int right); - void rightChanged(int top, int bottom, int left, int right); -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVE_MARGINS_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeopenglrendernode.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeopenglrendernode.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeopenglrendernode.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeopenglrendernode.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativeopenglrendernode_p.h" +#include "declarativeopenglrendernode.h" #include #include diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeopenglrendernode.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeopenglrendernode.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeopenglrendernode.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeopenglrendernode.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,110 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVEOPENGLRENDERNODE_P_H +#define DECLARATIVEOPENGLRENDERNODE_P_H + +#include "declarativeabstractrendernode.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +QT_CHARTS_BEGIN_NAMESPACE + +class DeclarativeOpenGLRenderNode : public QObject, public DeclarativeAbstractRenderNode, QOpenGLFunctions +{ + Q_OBJECT +public: + DeclarativeOpenGLRenderNode(QQuickWindow *window); + ~DeclarativeOpenGLRenderNode(); + + void initGL(); + QSize textureSize() const override { return m_textureSize; } + void setTextureSize(const QSize &size) override; + + void setSeriesData(bool mapDirty, const GLXYDataMap &dataMap) override; + void setRect(const QRectF &rect) override; + void setAntialiasing(bool enable) override; + void addMouseEvents(const QVector &events) override; + void takeMouseEventResponses(QVector &responses) override; + +public Q_SLOTS: + void render(); + +private: + void renderGL(bool selection); + void renderSelection(); + void renderVisual(); + void recreateFBO(); + void cleanXYSeriesResources(const QXYSeries *series); + void handleMouseEvents(); + const QXYSeries *findSeriesAtEvent(QMouseEvent *event); + + QSGTexture *m_texture; + QSGImageNode *m_imageNode; + QQuickWindow *m_window; + QQuickWindow::CreateTextureOptions m_textureOptions; + QSize m_textureSize; + bool m_recreateFbo; + GLXYDataMap m_xyDataMap; + QOpenGLFramebufferObject *m_fbo; + QOpenGLFramebufferObject *m_resolvedFbo; + QOpenGLFramebufferObject *m_selectionFbo; + QOpenGLShaderProgram *m_program; + int m_shaderAttribLoc; + int m_colorUniformLoc; + int m_minUniformLoc; + int m_deltaUniformLoc; + int m_pointSizeUniformLoc; + int m_matrixUniformLoc; + QOpenGLVertexArrayObject m_vao; + QHash m_seriesBufferMap; + bool m_renderNeeded; + QRectF m_rect; + bool m_antialiasing; + QVector m_mouseEvents; + QVector m_mouseEventResponses; + bool m_selectionRenderNeeded; + QVector m_selectionVector; + QPoint m_mousePressPos; + bool m_mousePressed; + const QXYSeries *m_lastPressSeries; + const QXYSeries *m_lastHoverSeries; +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVEOPENGLRENDERNODE_P_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeopenglrendernode_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeopenglrendernode_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativeopenglrendernode_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativeopenglrendernode_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,119 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVEOPENGLRENDERNODE_P_H -#define DECLARATIVEOPENGLRENDERNODE_P_H - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class DeclarativeOpenGLRenderNode : public QObject, public DeclarativeAbstractRenderNode, QOpenGLFunctions -{ - Q_OBJECT -public: - DeclarativeOpenGLRenderNode(QQuickWindow *window); - ~DeclarativeOpenGLRenderNode(); - - void initGL(); - QSize textureSize() const override { return m_textureSize; } - void setTextureSize(const QSize &size) override; - - void setSeriesData(bool mapDirty, const GLXYDataMap &dataMap) override; - void setRect(const QRectF &rect) override; - void setAntialiasing(bool enable) override; - void addMouseEvents(const QVector &events) override; - void takeMouseEventResponses(QVector &responses) override; - -public Q_SLOTS: - void render(); - -private: - void renderGL(bool selection); - void renderSelection(); - void renderVisual(); - void recreateFBO(); - void cleanXYSeriesResources(const QXYSeries *series); - void handleMouseEvents(); - const QXYSeries *findSeriesAtEvent(QMouseEvent *event); - - QSGTexture *m_texture; - QSGImageNode *m_imageNode; - QQuickWindow *m_window; - QQuickWindow::CreateTextureOptions m_textureOptions; - QSize m_textureSize; - bool m_recreateFbo; - GLXYDataMap m_xyDataMap; - QOpenGLFramebufferObject *m_fbo; - QOpenGLFramebufferObject *m_resolvedFbo; - QOpenGLFramebufferObject *m_selectionFbo; - QOpenGLShaderProgram *m_program; - int m_shaderAttribLoc; - int m_colorUniformLoc; - int m_minUniformLoc; - int m_deltaUniformLoc; - int m_pointSizeUniformLoc; - int m_matrixUniformLoc; - QOpenGLVertexArrayObject m_vao; - QHash m_seriesBufferMap; - bool m_renderNeeded; - QRectF m_rect; - bool m_antialiasing; - QVector m_mouseEvents; - QVector m_mouseEventResponses; - bool m_selectionRenderNeeded; - QVector m_selectionVector; - QPoint m_mousePressPos; - bool m_mousePressed; - const QXYSeries *m_lastPressSeries; - const QXYSeries *m_lastHoverSeries; -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVEOPENGLRENDERNODE_P_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativepieseries.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativepieseries.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativepieseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativepieseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativepieseries_p.h" +#include "declarativepieseries.h" #include #include #include @@ -158,6 +158,6 @@ emit sliceRemoved(slice); } -QT_CHARTS_END_NAMESPACE +#include "moc_declarativepieseries.cpp" -#include "moc_declarativepieseries_p.cpp" +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativepieseries.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativepieseries.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativepieseries.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativepieseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,94 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVEPIESERIES_H +#define DECLARATIVEPIESERIES_H + +#include +#include + +#include +#include + +QT_CHARTS_BEGIN_NAMESPACE + +class DeclarativePieSlice : public QPieSlice +{ + Q_OBJECT + Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged) + +public: + explicit DeclarativePieSlice(QObject *parent = 0); + QString brushFilename() const; + void setBrushFilename(const QString &brushFilename); + +Q_SIGNALS: + void brushFilenameChanged(const QString &brushFilename); + +private Q_SLOTS: + void handleBrushChanged(); + +private: + QString m_brushFilename; + QImage m_brushImage; +}; + +class DeclarativePieSeries : public QPieSeries, public QQmlParserStatus +{ + Q_OBJECT + Q_INTERFACES(QQmlParserStatus) + Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) + Q_CLASSINFO("DefaultProperty", "seriesChildren") + +public: + explicit DeclarativePieSeries(QQuickItem *parent = 0); + QQmlListProperty seriesChildren(); + Q_INVOKABLE QPieSlice *at(int index); + Q_INVOKABLE QPieSlice *find(QString label); + Q_INVOKABLE DeclarativePieSlice *append(QString label, qreal value); + Q_INVOKABLE bool remove(QPieSlice *slice); + Q_INVOKABLE void clear(); + +public: + void classBegin(); + void componentComplete(); + +Q_SIGNALS: + void sliceAdded(QPieSlice *slice); + void sliceRemoved(QPieSlice *slice); + +public Q_SLOTS: + static void appendSeriesChildren(QQmlListProperty *list, QObject *element); + void handleAdded(QList slices); + void handleRemoved(QList slices); +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVEPIESERIES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativepieseries_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativepieseries_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativepieseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativepieseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVEPIESERIES_H -#define DECLARATIVEPIESERIES_H - -#include -#include -#include - -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativePieSlice : public QPieSlice -{ - Q_OBJECT - Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged) - -public: - explicit DeclarativePieSlice(QObject *parent = 0); - QString brushFilename() const; - void setBrushFilename(const QString &brushFilename); - -Q_SIGNALS: - void brushFilenameChanged(const QString &brushFilename); - -private Q_SLOTS: - void handleBrushChanged(); - -private: - QString m_brushFilename; - QImage m_brushImage; -}; - -class DeclarativePieSeries : public QPieSeries, public QQmlParserStatus -{ - Q_OBJECT - Q_INTERFACES(QQmlParserStatus) - Q_PROPERTY(QQmlListProperty seriesChildren READ seriesChildren) - Q_CLASSINFO("DefaultProperty", "seriesChildren") - -public: - explicit DeclarativePieSeries(QQuickItem *parent = 0); - QQmlListProperty seriesChildren(); - Q_INVOKABLE QPieSlice *at(int index); - Q_INVOKABLE QPieSlice *find(QString label); - Q_INVOKABLE DeclarativePieSlice *append(QString label, qreal value); - Q_INVOKABLE bool remove(QPieSlice *slice); - Q_INVOKABLE void clear(); - -public: - void classBegin(); - void componentComplete(); - -Q_SIGNALS: - void sliceAdded(QPieSlice *slice); - void sliceRemoved(QPieSlice *slice); - -public Q_SLOTS: - static void appendSeriesChildren(QQmlListProperty *list, QObject *element); - void handleAdded(QList slices); - void handleRemoved(QList slices); -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVEPIESERIES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativepolarchart.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativepolarchart.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativepolarchart.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativepolarchart.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativepolarchart_p.h" +#include "declarativepolarchart.h" #include QT_CHARTS_BEGIN_NAMESPACE @@ -78,6 +78,6 @@ { } -QT_CHARTS_END_NAMESPACE +#include "moc_declarativepolarchart.cpp" -#include "moc_declarativepolarchart_p.cpp" +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativepolarchart.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativepolarchart.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativepolarchart.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativepolarchart.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,50 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVEPOLARCHART_H +#define DECLARATIVEPOLARCHART_H + +#include +#include + +#include "declarativechart.h" + +QT_CHARTS_BEGIN_NAMESPACE + +class DeclarativePolarChart : public DeclarativeChart +{ + Q_OBJECT +public: + DeclarativePolarChart(QQuickItem *parent = 0); + ~DeclarativePolarChart(); +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVEPOLARCHART_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativepolarchart_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativepolarchart_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativepolarchart_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativepolarchart_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVEPOLARCHART_H -#define DECLARATIVEPOLARCHART_H - -#include -#include -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativePolarChart : public DeclarativeChart -{ - Q_OBJECT -public: - DeclarativePolarChart(QQuickItem *parent = 0); - ~DeclarativePolarChart(); -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVEPOLARCHART_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativescatterseries.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativescatterseries.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativescatterseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativescatterseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativescatterseries_p.h" +#include "declarativescatterseries.h" QT_CHARTS_BEGIN_NAMESPACE @@ -119,6 +119,6 @@ } } -QT_CHARTS_END_NAMESPACE +#include "moc_declarativescatterseries.cpp" -#include "moc_declarativescatterseries_p.cpp" +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativescatterseries.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativescatterseries.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativescatterseries.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativescatterseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,126 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVESCATTERSERIES_H +#define DECLARATIVESCATTERSERIES_H + +#include +#include "declarativexyseries.h" +#include "declarativeaxes.h" + +#include +#include + +QT_CHARTS_BEGIN_NAMESPACE + +class DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QQmlParserStatus +{ + Q_OBJECT + Q_INTERFACES(QQmlParserStatus) + Q_PROPERTY(int count READ count NOTIFY countChanged) + Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) + Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) + Q_PROPERTY(QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3) + Q_PROPERTY(QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3) + Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1) + Q_PROPERTY(QQmlListProperty declarativeChildren READ declarativeChildren) + Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 4) + Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged REVISION 4) + Q_CLASSINFO("DefaultProperty", "declarativeChildren") + +public: + explicit DeclarativeScatterSeries(QObject *parent = 0); + QXYSeries *xySeries() { return this; } + QAbstractAxis *axisX() { return m_axes->axisX(); } + void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisY() { return m_axes->axisY(); } + void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QAbstractAxis *axisAngular() { return m_axes->axisX(); } + void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisRadial() { return m_axes->axisY(); } + void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + qreal borderWidth() const; + void setBorderWidth(qreal borderWidth); + QQmlListProperty declarativeChildren(); + QString brushFilename() const; + void setBrushFilename(const QString &brushFilename); + void setBrush(const QBrush &brush); + QBrush brush() const; + +public: // from QDeclarativeParserStatus + void classBegin() { DeclarativeXySeries::classBegin(); } + void componentComplete() { DeclarativeXySeries::componentComplete(); } + +public: + Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); } + Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); } + Q_REVISION(3) Q_INVOKABLE void replace(int index, qreal newX, qreal newY) { DeclarativeXySeries::replace(index, newX, newY); } + Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); } + Q_REVISION(3) Q_INVOKABLE void remove(int index) { DeclarativeXySeries::remove(index); } + Q_REVISION(5) Q_INVOKABLE void removePoints(int index, int count) { DeclarativeXySeries::removePoints(index, count); } + Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); } + Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); } + Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); } + +Q_SIGNALS: + void countChanged(int count); + Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); + Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); + Q_REVISION(1) void borderWidthChanged(qreal width); + Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); + Q_REVISION(3) void axisAngularChanged(QAbstractAxis *axis); + Q_REVISION(3) void axisRadialChanged(QAbstractAxis *axis); + Q_REVISION(4) void brushFilenameChanged(const QString &brushFilename); + Q_REVISION(4) void brushChanged(); + +public Q_SLOTS: + static void appendDeclarativeChildren(QQmlListProperty *list, QObject *element); + void handleCountChanged(int index); + +private Q_SLOTS: + void handleBrushChanged(); + +public: + DeclarativeAxes *m_axes; + +private: + QString m_brushFilename; + QImage m_brushImage; +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVESCATTERSERIES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativescatterseries_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativescatterseries_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativescatterseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativescatterseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVESCATTERSERIES_H -#define DECLARATIVESCATTERSERIES_H - -#include -#include -#include -#include - -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QQmlParserStatus -{ - Q_OBJECT - Q_INTERFACES(QQmlParserStatus) - Q_PROPERTY(int count READ count NOTIFY countChanged) - Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) - Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) - Q_PROPERTY(QtCharts::QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3) - Q_PROPERTY(QtCharts::QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3) - Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1) - Q_PROPERTY(QQmlListProperty declarativeChildren READ declarativeChildren) - Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 4) - Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged REVISION 4) - Q_CLASSINFO("DefaultProperty", "declarativeChildren") - -public: - explicit DeclarativeScatterSeries(QObject *parent = 0); - QXYSeries *xySeries() { return this; } - QAbstractAxis *axisX() { return m_axes->axisX(); } - void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - QAbstractAxis *axisY() { return m_axes->axisY(); } - void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - QAbstractAxis *axisAngular() { return m_axes->axisX(); } - void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - QAbstractAxis *axisRadial() { return m_axes->axisY(); } - void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - qreal borderWidth() const; - void setBorderWidth(qreal borderWidth); - QQmlListProperty declarativeChildren(); - QString brushFilename() const; - void setBrushFilename(const QString &brushFilename); - void setBrush(const QBrush &brush); - QBrush brush() const; - -public: // from QDeclarativeParserStatus - void classBegin() { DeclarativeXySeries::classBegin(); } - void componentComplete() { DeclarativeXySeries::componentComplete(); } - -public: - Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); } - Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); } - Q_REVISION(3) Q_INVOKABLE void replace(int index, qreal newX, qreal newY) { DeclarativeXySeries::replace(index, newX, newY); } - Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); } - Q_REVISION(3) Q_INVOKABLE void remove(int index) { DeclarativeXySeries::remove(index); } - Q_REVISION(5) Q_INVOKABLE void removePoints(int index, int count) { DeclarativeXySeries::removePoints(index, count); } - Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); } - Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); } - Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); } - -Q_SIGNALS: - void countChanged(int count); - Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); - Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); - Q_REVISION(1) void borderWidthChanged(qreal width); - Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); - Q_REVISION(3) void axisAngularChanged(QAbstractAxis *axis); - Q_REVISION(3) void axisRadialChanged(QAbstractAxis *axis); - Q_REVISION(4) void brushFilenameChanged(const QString &brushFilename); - Q_REVISION(4) void brushChanged(); - -public Q_SLOTS: - static void appendDeclarativeChildren(QQmlListProperty *list, QObject *element); - void handleCountChanged(int index); - -private Q_SLOTS: - void handleBrushChanged(); - -public: - DeclarativeAxes *m_axes; - -private: - QString m_brushFilename; - QImage m_brushImage; -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVESCATTERSERIES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativesplineseries.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativesplineseries.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativesplineseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativesplineseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativesplineseries_p.h" +#include "declarativesplineseries.h" QT_CHARTS_BEGIN_NAMESPACE @@ -109,6 +109,6 @@ // Empty implementation, children are parsed in componentComplete } -QT_CHARTS_END_NAMESPACE +#include "moc_declarativesplineseries.cpp" -#include "moc_declarativesplineseries_p.cpp" +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativesplineseries.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativesplineseries.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativesplineseries.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativesplineseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,119 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVESPLINESERIES_H +#define DECLARATIVESPLINESERIES_H + +#include +#include "declarativexyseries.h" +#include "declarativeaxes.h" + +#include +#include + +QT_CHARTS_BEGIN_NAMESPACE + +class DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QQmlParserStatus +{ + Q_OBJECT + Q_INTERFACES(QQmlParserStatus) + Q_PROPERTY(int count READ count NOTIFY countChanged) + Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) + Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) + Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) + Q_PROPERTY(QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3) + Q_PROPERTY(QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3) + Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged REVISION 1) + Q_PROPERTY(Qt::PenStyle style READ style WRITE setStyle NOTIFY styleChanged REVISION 1) + Q_PROPERTY(Qt::PenCapStyle capStyle READ capStyle WRITE setCapStyle NOTIFY capStyleChanged REVISION 1) + Q_PROPERTY(QQmlListProperty declarativeChildren READ declarativeChildren) + Q_CLASSINFO("DefaultProperty", "declarativeChildren") + +public: + explicit DeclarativeSplineSeries(QObject *parent = 0); + QXYSeries *xySeries() { return this; } + QAbstractAxis *axisX() { return m_axes->axisX(); } + void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisY() { return m_axes->axisY(); } + void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QAbstractAxis *axisAngular() { return m_axes->axisX(); } + void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisRadial() { return m_axes->axisY(); } + void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + qreal width() const; + void setWidth(qreal width); + Qt::PenStyle style() const; + void setStyle(Qt::PenStyle style); + Qt::PenCapStyle capStyle() const; + void setCapStyle(Qt::PenCapStyle capStyle); + QQmlListProperty declarativeChildren(); + +public: // from QDeclarativeParserStatus + void classBegin() { DeclarativeXySeries::classBegin(); } + void componentComplete() { DeclarativeXySeries::componentComplete(); } + +public: + Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); } + Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); } + Q_REVISION(3) Q_INVOKABLE void replace(int index, qreal newX, qreal newY) { DeclarativeXySeries::replace(index, newX, newY); } + Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); } + Q_REVISION(3) Q_INVOKABLE void remove(int index) { DeclarativeXySeries::remove(index); } + Q_REVISION(4) Q_INVOKABLE void removePoints(int index, int count) { DeclarativeXySeries::removePoints(index, count); } + Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); } + Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); } + Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); } + +Q_SIGNALS: + void countChanged(int count); + Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); + Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); + Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); + Q_REVISION(3) void axisAngularChanged(QAbstractAxis *axis); + Q_REVISION(3) void axisRadialChanged(QAbstractAxis *axis); + Q_REVISION(1) void widthChanged(qreal width); + Q_REVISION(1) void styleChanged(Qt::PenStyle style); + Q_REVISION(1) void capStyleChanged(Qt::PenCapStyle capStyle); + +public Q_SLOTS: + static void appendDeclarativeChildren(QQmlListProperty *list, QObject *element); + void handleCountChanged(int index); + +public: + DeclarativeAxes *m_axes; +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVESPLINESERIES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativesplineseries_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativesplineseries_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativesplineseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativesplineseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,129 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVESPLINESERIES_H -#define DECLARATIVESPLINESERIES_H - -#include -#include -#include -#include - -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QQmlParserStatus -{ - Q_OBJECT - Q_INTERFACES(QQmlParserStatus) - Q_PROPERTY(int count READ count NOTIFY countChanged) - Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1) - Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2) - Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2) - Q_PROPERTY(QtCharts::QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3) - Q_PROPERTY(QtCharts::QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3) - Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged REVISION 1) - Q_PROPERTY(Qt::PenStyle style READ style WRITE setStyle NOTIFY styleChanged REVISION 1) - Q_PROPERTY(Qt::PenCapStyle capStyle READ capStyle WRITE setCapStyle NOTIFY capStyleChanged REVISION 1) - Q_PROPERTY(QQmlListProperty declarativeChildren READ declarativeChildren) - Q_CLASSINFO("DefaultProperty", "declarativeChildren") - -public: - explicit DeclarativeSplineSeries(QObject *parent = 0); - QXYSeries *xySeries() { return this; } - QAbstractAxis *axisX() { return m_axes->axisX(); } - void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - QAbstractAxis *axisY() { return m_axes->axisY(); } - void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - QAbstractAxis *axisAngular() { return m_axes->axisX(); } - void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - QAbstractAxis *axisRadial() { return m_axes->axisY(); } - void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - qreal width() const; - void setWidth(qreal width); - Qt::PenStyle style() const; - void setStyle(Qt::PenStyle style); - Qt::PenCapStyle capStyle() const; - void setCapStyle(Qt::PenCapStyle capStyle); - QQmlListProperty declarativeChildren(); - -public: // from QDeclarativeParserStatus - void classBegin() { DeclarativeXySeries::classBegin(); } - void componentComplete() { DeclarativeXySeries::componentComplete(); } - -public: - Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); } - Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); } - Q_REVISION(3) Q_INVOKABLE void replace(int index, qreal newX, qreal newY) { DeclarativeXySeries::replace(index, newX, newY); } - Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); } - Q_REVISION(3) Q_INVOKABLE void remove(int index) { DeclarativeXySeries::remove(index); } - Q_REVISION(4) Q_INVOKABLE void removePoints(int index, int count) { DeclarativeXySeries::removePoints(index, count); } - Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); } - Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); } - Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); } - -Q_SIGNALS: - void countChanged(int count); - Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); - Q_REVISION(1) void axisYChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis); - Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis); - Q_REVISION(3) void axisAngularChanged(QAbstractAxis *axis); - Q_REVISION(3) void axisRadialChanged(QAbstractAxis *axis); - Q_REVISION(1) void widthChanged(qreal width); - Q_REVISION(1) void styleChanged(Qt::PenStyle style); - Q_REVISION(1) void capStyleChanged(Qt::PenCapStyle capStyle); - -public Q_SLOTS: - static void appendDeclarativeChildren(QQmlListProperty *list, QObject *element); - void handleCountChanged(int index); - -public: - DeclarativeAxes *m_axes; -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVESPLINESERIES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativexypoint.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativexypoint.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativexypoint.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativexypoint.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativexypoint_p.h" +#include "declarativexypoint.h" #include QT_CHARTS_BEGIN_NAMESPACE @@ -62,6 +62,6 @@ setY(0.0); } -QT_CHARTS_END_NAMESPACE +#include "moc_declarativexypoint.cpp" -#include "moc_declarativexypoint_p.cpp" +QT_CHARTS_END_NAMESPACE diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativexypoint.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativexypoint.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativexypoint.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativexypoint.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVE_XY_POINT_H +#define DECLARATIVE_XY_POINT_H + +#include +#include +#include + +QT_CHARTS_BEGIN_NAMESPACE + +class DeclarativeXYPoint : public QObject, public QPointF +{ + Q_OBJECT + Q_PROPERTY(qreal x READ x WRITE setX) + Q_PROPERTY(qreal y READ y WRITE setY) + +public: + explicit DeclarativeXYPoint(QObject *parent = 0); +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVE_XY_POINT_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativexypoint_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativexypoint_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativexypoint_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativexypoint_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVE_XY_POINT_H -#define DECLARATIVE_XY_POINT_H - -#include -#include -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeXYPoint : public QObject, public QPointF -{ - Q_OBJECT - Q_PROPERTY(qreal x READ x WRITE setX) - Q_PROPERTY(qreal y READ y WRITE setY) - -public: - explicit DeclarativeXYPoint(QObject *parent = 0); -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVE_XY_POINT_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativexyseries.cpp qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativexyseries.cpp --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativexyseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativexyseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -28,8 +28,8 @@ ****************************************************************************/ -#include "declarativexyseries_p.h" -#include "declarativexypoint_p.h" +#include "declarativexyseries.h" +#include "declarativexypoint.h" #include #include diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativexyseries.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativexyseries.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativexyseries.h 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativexyseries.h 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DECLARATIVE_XY_SERIES_H +#define DECLARATIVE_XY_SERIES_H + +#include + +QT_CHARTS_BEGIN_NAMESPACE + +class QChart; +class QAbstractSeries; + +class DeclarativeXySeries +{ +public: + explicit DeclarativeXySeries(); + ~DeclarativeXySeries(); + +public: + void classBegin(); + void componentComplete(); + virtual QXYSeries *xySeries() = 0; + + void append(qreal x, qreal y); + void replace(qreal oldX, qreal oldY, qreal newX, qreal newY); + void replace(int index, qreal newX, qreal newY); + void remove(qreal x, qreal y); + void remove(int index); + void removePoints(int index, int count); + void insert(int index, qreal x, qreal y); + void clear(); + QPointF at(int index); +}; + +QT_CHARTS_END_NAMESPACE + +#endif // DECLARATIVE_XY_SERIES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativexyseries_p.h qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativexyseries_p.h --- qtcharts-opensource-src-5.12.5/src/chartsqml2/declarativexyseries_p.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/declarativexyseries_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Charts module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef DECLARATIVE_XY_SERIES_H -#define DECLARATIVE_XY_SERIES_H - -#include -#include - -QT_CHARTS_BEGIN_NAMESPACE - -class QChart; -class QAbstractSeries; - -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeXySeries -{ -public: - explicit DeclarativeXySeries(); - ~DeclarativeXySeries(); - -public: - void classBegin(); - void componentComplete(); - virtual QXYSeries *xySeries() = 0; - - void append(qreal x, qreal y); - void replace(qreal oldX, qreal oldY, qreal newX, qreal newY); - void replace(int index, qreal newX, qreal newY); - void remove(qreal x, qreal y); - void remove(int index); - void removePoints(int index, int count); - void insert(int index, qreal x, qreal y); - void clear(); - QPointF at(int index); -}; - -QT_CHARTS_END_NAMESPACE - -#endif // DECLARATIVE_XY_SERIES_H diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/designer/qtcharts.metainfo qtcharts-opensource-src-5.9.5/src/chartsqml2/designer/qtcharts.metainfo --- qtcharts-opensource-src-5.12.5/src/chartsqml2/designer/qtcharts.metainfo 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/designer/qtcharts.metainfo 2018-03-19 05:05:55.000000000 +0000 @@ -1,6 +1,6 @@ MetaInfo { Type { - name: "QtCharts.ChartView" + name: "QtCharts.AreaSeries" icon: "images/areaseries-chart-icon16.png" ItemLibraryEntry { @@ -14,7 +14,7 @@ } } Type { - name: "QtCharts.ChartView" + name: "QtCharts.BarSeries" icon: "images/barseries-icon16.png" ItemLibraryEntry { @@ -28,7 +28,7 @@ } } Type { - name: "QtCharts.ChartView" + name: "QtCharts.BoxPlotSeries" icon: "images/boxplotseries-chart-icon16.png" ItemLibraryEntry { @@ -42,7 +42,7 @@ } } Type { - name: "QtCharts.ChartView" + name: "QtCharts.HorizontalBarSeries" icon: "images/horizontalbarseries-icon16.png" ItemLibraryEntry { @@ -56,7 +56,7 @@ } } Type { - name: "QtCharts.ChartView" + name: "QtCharts.HorizontalPercentBarSeries" icon: "images/horizontalpercentbarseries-icon16.png" ItemLibraryEntry { @@ -70,7 +70,7 @@ } } Type { - name: "QtCharts.ChartView" + name: "QtCharts.HorizontalStackedBarSeries" icon: "images/horizontalstackedbarseries-icon16.png" ItemLibraryEntry { @@ -84,7 +84,7 @@ } } Type { - name: "QtCharts.ChartView" + name: "QtCharts.LineSeries" icon: "images/lineseries-chart-icon16.png" ItemLibraryEntry { @@ -98,7 +98,7 @@ } } Type { - name: "QtCharts.ChartView" + name: "QtCharts.PercentBarSeries" icon: "images/percentbarseries-icon16.png" ItemLibraryEntry { @@ -112,7 +112,7 @@ } } Type { - name: "QtCharts.ChartView" + name: "QtCharts.PieSeries" icon: "images/pieseries-chart-icon16.png" ItemLibraryEntry { @@ -126,7 +126,7 @@ } } Type { - name: "QtCharts.ChartView" + name: "QtCharts.ScatterSeries" icon: "images/scatterseries-chart-icon16.png" ItemLibraryEntry { @@ -140,7 +140,7 @@ } } Type { - name: "QtCharts.ChartView" + name: "QtCharts.SplineSeries" icon: "images/splineseries-chart-icon16.png" ItemLibraryEntry { @@ -154,7 +154,7 @@ } } Type { - name: "QtCharts.ChartView" + name: "QtCharts.StackedBarSeries" icon: "images/stackedbarseries-icon16.png" ItemLibraryEntry { @@ -169,7 +169,7 @@ } Type { - name: "QtCharts.ChartView" + name: "QtCharts.AreaSeries" icon: "images/areaseries-polar-icon16.png" ItemLibraryEntry { @@ -183,7 +183,7 @@ } } Type { - name: "QtCharts.ChartView" + name: "QtCharts.LineSeries" icon: "images/lineseries-polar-icon16.png" ItemLibraryEntry { @@ -197,7 +197,7 @@ } } Type { - name: "QtCharts.ChartView" + name: "QtCharts.ScatterSeries" icon: "images/scatterseries-polar-icon16.png" ItemLibraryEntry { @@ -211,7 +211,7 @@ } } Type { - name: "QtCharts.ChartView" + name: "QtCharts.SplineSeries" icon: "images/splineseries-polar-icon16.png" ItemLibraryEntry { diff -Nru qtcharts-opensource-src-5.12.5/src/chartsqml2/plugins.qmltypes qtcharts-opensource-src-5.9.5/src/chartsqml2/plugins.qmltypes --- qtcharts-opensource-src-5.12.5/src/chartsqml2/plugins.qmltypes 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/src/chartsqml2/plugins.qmltypes 2018-03-19 05:05:55.000000000 +0000 @@ -4,10 +4,280 @@ // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable -qapp QtCharts 2.3' +// 'qmlplugindump -nonrelocatable QtCharts 2.0' Module { - dependencies: ["QtQuick 2.12"] + dependencies: [] + Component { + name: "QAbstractItemModel" + prototype: "QObject" + exports: [ + "QtCharts/AbstractItemModel 1.0", + "QtCharts/AbstractItemModel 2.0" + ] + isCreatable: false + exportMetaObjectRevisions: [0, 0] + Enum { + name: "LayoutChangeHint" + values: { + "NoLayoutChangeHint": 0, + "VerticalSortHint": 1, + "HorizontalSortHint": 2 + } + } + Signal { + name: "dataChanged" + Parameter { name: "topLeft"; type: "QModelIndex" } + Parameter { name: "bottomRight"; type: "QModelIndex" } + Parameter { name: "roles"; type: "QVector" } + } + Signal { + name: "dataChanged" + Parameter { name: "topLeft"; type: "QModelIndex" } + Parameter { name: "bottomRight"; type: "QModelIndex" } + } + Signal { + name: "headerDataChanged" + Parameter { name: "orientation"; type: "Qt::Orientation" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "layoutChanged" + Parameter { name: "parents"; type: "QList" } + Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" } + } + Signal { + name: "layoutChanged" + Parameter { name: "parents"; type: "QList" } + } + Signal { name: "layoutChanged" } + Signal { + name: "layoutAboutToBeChanged" + Parameter { name: "parents"; type: "QList" } + Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" } + } + Signal { + name: "layoutAboutToBeChanged" + Parameter { name: "parents"; type: "QList" } + } + Signal { name: "layoutAboutToBeChanged" } + Signal { + name: "rowsAboutToBeInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsAboutToBeRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsAboutToBeInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsAboutToBeRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { name: "modelAboutToBeReset" } + Signal { name: "modelReset" } + Signal { + name: "rowsAboutToBeMoved" + Parameter { name: "sourceParent"; type: "QModelIndex" } + Parameter { name: "sourceStart"; type: "int" } + Parameter { name: "sourceEnd"; type: "int" } + Parameter { name: "destinationParent"; type: "QModelIndex" } + Parameter { name: "destinationRow"; type: "int" } + } + Signal { + name: "rowsMoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + Parameter { name: "destination"; type: "QModelIndex" } + Parameter { name: "row"; type: "int" } + } + Signal { + name: "columnsAboutToBeMoved" + Parameter { name: "sourceParent"; type: "QModelIndex" } + Parameter { name: "sourceStart"; type: "int" } + Parameter { name: "sourceEnd"; type: "int" } + Parameter { name: "destinationParent"; type: "QModelIndex" } + Parameter { name: "destinationColumn"; type: "int" } + } + Signal { + name: "columnsMoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + Parameter { name: "destination"; type: "QModelIndex" } + Parameter { name: "column"; type: "int" } + } + Method { name: "submit"; type: "bool" } + Method { name: "revert" } + Method { + name: "hasIndex" + type: "bool" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "hasIndex" + type: "bool" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + } + Method { + name: "index" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "index" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + } + Method { + name: "parent" + type: "QModelIndex" + Parameter { name: "child"; type: "QModelIndex" } + } + Method { + name: "sibling" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "idx"; type: "QModelIndex" } + } + Method { + name: "rowCount" + type: "int" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "rowCount"; type: "int" } + Method { + name: "columnCount" + type: "int" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "columnCount"; type: "int" } + Method { + name: "hasChildren" + type: "bool" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "hasChildren"; type: "bool" } + Method { + name: "data" + type: "QVariant" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "data" + type: "QVariant" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "setData" + type: "bool" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "setData" + type: "bool" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "value"; type: "QVariant" } + } + Method { + name: "headerData" + type: "QVariant" + Parameter { name: "section"; type: "int" } + Parameter { name: "orientation"; type: "Qt::Orientation" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "headerData" + type: "QVariant" + Parameter { name: "section"; type: "int" } + Parameter { name: "orientation"; type: "Qt::Orientation" } + } + Method { + name: "fetchMore" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "canFetchMore" + type: "bool" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "flags" + type: "Qt::ItemFlags" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "hits"; type: "int" } + Parameter { name: "flags"; type: "Qt::MatchFlags" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "hits"; type: "int" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + } + } Component { name: "QGraphicsObject" defaultProperty: "children" @@ -64,14 +334,14 @@ "QtCharts/AreaSeries 2.0" ] exportMetaObjectRevisions: [0, 1, 2, 3, 4, 4] - Property { name: "upperSeries"; type: "QtCharts::DeclarativeLineSeries"; isPointer: true } - Property { name: "lowerSeries"; type: "QtCharts::DeclarativeLineSeries"; isPointer: true } - Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisAngular"; revision: 3; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisRadial"; revision: 3; type: "QtCharts::QAbstractAxis"; isPointer: true } + Property { name: "upperSeries"; type: "DeclarativeLineSeries"; isPointer: true } + Property { name: "lowerSeries"; type: "DeclarativeLineSeries"; isPointer: true } + Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisAngular"; revision: 3; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisRadial"; revision: 3; type: "QAbstractAxis"; isPointer: true } Property { name: "borderWidth"; revision: 1; type: "double" } Property { name: "brushFilename"; revision: 4; type: "string" } Property { name: "brush"; revision: 4; type: "QBrush" } @@ -126,10 +396,10 @@ ] isCreatable: false exportMetaObjectRevisions: [0, 0] - Property { name: "axisX"; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisY"; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisXTop"; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisYRight"; type: "QtCharts::QAbstractAxis"; isPointer: true } + Property { name: "axisX"; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisY"; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisXTop"; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisYRight"; type: "QAbstractAxis"; isPointer: true } Signal { name: "axisXChanged" Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true } @@ -158,10 +428,10 @@ "QtCharts/BarSeries 2.0" ] exportMetaObjectRevisions: [0, 1, 2, 2] - Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } + Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true } Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true } Signal { name: "axisXChanged" @@ -275,10 +545,10 @@ "QtCharts/BoxPlotSeries 2.0" ] exportMetaObjectRevisions: [0, 1, 1] - Property { name: "axisX"; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisY"; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisXTop"; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisYRight"; type: "QtCharts::QAbstractAxis"; isPointer: true } + Property { name: "axisX"; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisY"; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisXTop"; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisYRight"; type: "QAbstractAxis"; isPointer: true } Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true } Property { name: "brushFilename"; revision: 1; type: "string" } Signal { @@ -433,10 +703,10 @@ prototype: "QtCharts::QCandlestickSeries" exports: ["QtCharts/CandlestickSeries 2.2"] exportMetaObjectRevisions: [0] - Property { name: "axisX"; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisY"; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisXTop"; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisYRight"; type: "QtCharts::QAbstractAxis"; isPointer: true } + Property { name: "axisX"; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisY"; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisXTop"; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisYRight"; type: "QAbstractAxis"; isPointer: true } Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true } Property { name: "brushFilename"; type: "string" } Signal { @@ -649,14 +919,14 @@ "SeriesTypeBar": 2, "SeriesTypeStackedBar": 3, "SeriesTypePercentBar": 4, - "SeriesTypePie": 5, - "SeriesTypeScatter": 6, - "SeriesTypeSpline": 7, - "SeriesTypeHorizontalBar": 8, - "SeriesTypeHorizontalStackedBar": 9, - "SeriesTypeHorizontalPercentBar": 10, - "SeriesTypeBoxPlot": 11, - "SeriesTypeCandlestick": 12 + "SeriesTypeBoxPlot": 5, + "SeriesTypeCandlestick": 6, + "SeriesTypePie": 7, + "SeriesTypeScatter": 8, + "SeriesTypeSpline": 9, + "SeriesTypeHorizontalBar": 10, + "SeriesTypeHorizontalStackedBar": 11, + "SeriesTypeHorizontalPercentBar": 12 } } Property { name: "theme"; type: "Theme" } @@ -666,7 +936,7 @@ Property { name: "title"; type: "string" } Property { name: "titleFont"; type: "QFont" } Property { name: "titleColor"; type: "QColor" } - Property { name: "legend"; type: "QtCharts::QLegend"; isReadonly: true; isPointer: true } + Property { name: "legend"; type: "QLegend"; isReadonly: true; isPointer: true } Property { name: "count"; type: "int"; isReadonly: true } Property { name: "backgroundColor"; type: "QColor" } Property { name: "dropShadowEnabled"; type: "bool" } @@ -674,11 +944,11 @@ Property { name: "margins" revision: 2 - type: "QtCharts::DeclarativeMargins" + type: "DeclarativeMargins" isReadonly: true isPointer: true } - Property { name: "plotArea"; revision: 1; type: "QRectF" } + Property { name: "plotArea"; revision: 1; type: "QRectF"; isReadonly: true } Property { name: "plotAreaColor"; revision: 3; type: "QColor" } Property { name: "axes"; revision: 2; type: "QAbstractAxis"; isList: true; isReadonly: true } Property { name: "localizeNumbers"; revision: 4; type: "bool" } @@ -862,10 +1132,10 @@ "QtCharts/HorizontalBarSeries 2.0" ] exportMetaObjectRevisions: [1, 2, 2] - Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } + Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true } Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true } Signal { name: "axisXChanged" @@ -927,10 +1197,10 @@ "QtCharts/HorizontalPercentBarSeries 2.0" ] exportMetaObjectRevisions: [1, 2, 2] - Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } + Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true } Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true } Signal { name: "axisXChanged" @@ -992,10 +1262,10 @@ "QtCharts/HorizontalStackedBarSeries 2.0" ] exportMetaObjectRevisions: [1, 2, 2] - Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } + Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true } Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true } Signal { name: "axisXChanged" @@ -1061,12 +1331,12 @@ ] exportMetaObjectRevisions: [0, 1, 2, 3, 3, 4] Property { name: "count"; type: "int"; isReadonly: true } - Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisAngular"; revision: 3; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisRadial"; revision: 3; type: "QtCharts::QAbstractAxis"; isPointer: true } + Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisAngular"; revision: 3; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisRadial"; revision: 3; type: "QAbstractAxis"; isPointer: true } Property { name: "width"; revision: 1; type: "double" } Property { name: "style"; revision: 1; type: "Qt::PenStyle" } Property { name: "capStyle"; revision: 1; type: "Qt::PenCapStyle" } @@ -1227,10 +1497,10 @@ "QtCharts/PercentBarSeries 2.0" ] exportMetaObjectRevisions: [0, 1, 2, 2] - Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } + Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true } Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true } Signal { name: "axisXChanged" @@ -1373,12 +1643,12 @@ ] exportMetaObjectRevisions: [0, 1, 2, 3, 4, 4, 5] Property { name: "count"; type: "int"; isReadonly: true } - Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisAngular"; revision: 3; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisRadial"; revision: 3; type: "QtCharts::QAbstractAxis"; isPointer: true } + Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisAngular"; revision: 3; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisRadial"; revision: 3; type: "QAbstractAxis"; isPointer: true } Property { name: "borderWidth"; revision: 1; type: "double" } Property { name: "declarativeChildren"; type: "QObject"; isList: true; isReadonly: true } Property { name: "brushFilename"; revision: 4; type: "string" } @@ -1499,12 +1769,12 @@ ] exportMetaObjectRevisions: [0, 1, 2, 3, 3, 4] Property { name: "count"; type: "int"; isReadonly: true } - Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisAngular"; revision: 3; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisRadial"; revision: 3; type: "QtCharts::QAbstractAxis"; isPointer: true } + Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisAngular"; revision: 3; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisRadial"; revision: 3; type: "QAbstractAxis"; isPointer: true } Property { name: "width"; revision: 1; type: "double" } Property { name: "style"; revision: 1; type: "Qt::PenStyle" } Property { name: "capStyle"; revision: 1; type: "Qt::PenCapStyle" } @@ -1626,10 +1896,10 @@ "QtCharts/StackedBarSeries 2.0" ] exportMetaObjectRevisions: [0, 1, 2, 2] - Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } - Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true } + Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true } + Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true } Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true } Signal { name: "axisXChanged" @@ -1690,11 +1960,6 @@ Property { name: "y"; type: "double" } } Component { - name: "QtCharts::LegendScroller" - defaultProperty: "children" - prototype: "QtCharts::QLegend" - } - Component { name: "QtCharts::QAbstractAxis" prototype: "QObject" exports: [ @@ -1856,7 +2121,6 @@ Property { name: "labelsFormat"; type: "string" } Property { name: "labelsPosition"; type: "LabelsPosition" } Property { name: "labelsAngle"; type: "double" } - Property { name: "labelsPrecision"; type: "int" } Signal { name: "clicked" Parameter { name: "index"; type: "int" } @@ -1896,10 +2160,6 @@ Parameter { name: "angle"; type: "double" } } Signal { - name: "labelsPrecisionChanged" - Parameter { name: "precision"; type: "int" } - } - Signal { name: "barsetsAdded" Parameter { name: "sets"; type: "QList" } } @@ -1944,8 +2204,8 @@ Component { name: "QtCharts::QAreaSeries" prototype: "QtCharts::QAbstractSeries" - Property { name: "upperSeries"; type: "QtCharts::QLineSeries"; isReadonly: true; isPointer: true } - Property { name: "lowerSeries"; type: "QtCharts::QLineSeries"; isReadonly: true; isPointer: true } + Property { name: "upperSeries"; type: "QLineSeries"; isReadonly: true; isPointer: true } + Property { name: "lowerSeries"; type: "QLineSeries"; isReadonly: true; isPointer: true } Property { name: "color"; type: "QColor" } Property { name: "borderColor"; type: "QColor" } Property { name: "pointLabelsFormat"; type: "string" } @@ -2178,7 +2438,7 @@ isCreatable: false exportMetaObjectRevisions: [0] Property { name: "model"; type: "QAbstractItemModel"; isPointer: true } - Property { name: "series"; type: "QtCharts::QCandlestickSeries"; isPointer: true } + Property { name: "series"; type: "QCandlestickSeries"; isPointer: true } Signal { name: "modelReplaced" } Signal { name: "seriesReplaced" } } @@ -2306,7 +2566,7 @@ "QtCharts/HBarModelMapper 2.0" ] exportMetaObjectRevisions: [0, 0] - Property { name: "series"; type: "QtCharts::QAbstractBarSeries"; isPointer: true } + Property { name: "series"; type: "QAbstractBarSeries"; isPointer: true } Property { name: "model"; type: "QAbstractItemModel"; isPointer: true } Property { name: "firstBarSetRow"; type: "int" } Property { name: "lastBarSetRow"; type: "int" } @@ -2320,7 +2580,7 @@ prototype: "QtCharts::QBoxPlotModelMapper" exports: ["QtCharts/HBoxPlotModelMapper 2.0"] exportMetaObjectRevisions: [0] - Property { name: "series"; type: "QtCharts::QBoxPlotSeries"; isPointer: true } + Property { name: "series"; type: "QBoxPlotSeries"; isPointer: true } Property { name: "model"; type: "QAbstractItemModel"; isPointer: true } Property { name: "firstBoxSetRow"; type: "int" } Property { name: "lastBoxSetRow"; type: "int" } @@ -2350,7 +2610,7 @@ "QtCharts/HPieModelMapper 2.0" ] exportMetaObjectRevisions: [0, 0] - Property { name: "series"; type: "QtCharts::QPieSeries"; isPointer: true } + Property { name: "series"; type: "QPieSeries"; isPointer: true } Property { name: "model"; type: "QAbstractItemModel"; isPointer: true } Property { name: "valuesRow"; type: "int" } Property { name: "labelsRow"; type: "int" } @@ -2367,7 +2627,7 @@ "QtCharts/HXYModelMapper 2.0" ] exportMetaObjectRevisions: [0, 0] - Property { name: "series"; type: "QtCharts::QXYSeries"; isPointer: true } + Property { name: "series"; type: "QXYSeries"; isPointer: true } Property { name: "model"; type: "QAbstractItemModel"; isPointer: true } Property { name: "xRow"; type: "int" } Property { name: "yRow"; type: "int" } @@ -2392,15 +2652,6 @@ exports: ["QtCharts/Legend 1.0", "QtCharts/Legend 2.0"] isCreatable: false exportMetaObjectRevisions: [0, 0] - Enum { - name: "MarkerShape" - values: { - "MarkerShapeDefault": 0, - "MarkerShapeRectangle": 1, - "MarkerShapeCircle": 2, - "MarkerShapeFromSeries": 3 - } - } Property { name: "alignment"; type: "Qt::Alignment" } Property { name: "backgroundVisible"; type: "bool" } Property { name: "color"; type: "QColor" } @@ -2409,7 +2660,6 @@ Property { name: "labelColor"; type: "QColor" } Property { name: "reverseMarkers"; type: "bool" } Property { name: "showToolTips"; type: "bool" } - Property { name: "markerShape"; type: "MarkerShape" } Signal { name: "backgroundVisibleChanged" Parameter { name: "visible"; type: "bool" } @@ -2438,10 +2688,6 @@ name: "showToolTipsChanged" Parameter { name: "showToolTips"; type: "bool" } } - Signal { - name: "markerShapeChanged" - Parameter { name: "shape"; type: "MarkerShape" } - } } Component { name: "QtCharts::QLineSeries"; prototype: "QtCharts::QXYSeries" } Component { @@ -2453,8 +2699,6 @@ Property { name: "max"; type: "double" } Property { name: "labelFormat"; type: "string" } Property { name: "base"; type: "double" } - Property { name: "tickCount"; type: "int"; isReadonly: true } - Property { name: "minorTickCount"; type: "int" } Signal { name: "minChanged" Parameter { name: "min"; type: "double" } @@ -2476,14 +2720,6 @@ name: "baseChanged" Parameter { name: "base"; type: "double" } } - Signal { - name: "tickCountChanged" - Parameter { name: "tickCount"; type: "int" } - } - Signal { - name: "minorTickCountChanged" - Parameter { name: "minorTickCount"; type: "int" } - } } Component { name: "QtCharts::QPercentBarSeries"; prototype: "QtCharts::QAbstractBarSeries" } Component { @@ -2623,7 +2859,7 @@ "QtCharts/VBarModelMapper 2.0" ] exportMetaObjectRevisions: [0, 0] - Property { name: "series"; type: "QtCharts::QAbstractBarSeries"; isPointer: true } + Property { name: "series"; type: "QAbstractBarSeries"; isPointer: true } Property { name: "model"; type: "QAbstractItemModel"; isPointer: true } Property { name: "firstBarSetColumn"; type: "int" } Property { name: "lastBarSetColumn"; type: "int" } @@ -2637,7 +2873,7 @@ prototype: "QtCharts::QBoxPlotModelMapper" exports: ["QtCharts/VBoxPlotModelMapper 2.0"] exportMetaObjectRevisions: [0] - Property { name: "series"; type: "QtCharts::QBoxPlotSeries"; isPointer: true } + Property { name: "series"; type: "QBoxPlotSeries"; isPointer: true } Property { name: "model"; type: "QAbstractItemModel"; isPointer: true } Property { name: "firstBoxSetColumn"; type: "int" } Property { name: "lastBoxSetColumn"; type: "int" } @@ -2667,7 +2903,7 @@ "QtCharts/VPieModelMapper 2.0" ] exportMetaObjectRevisions: [0, 0] - Property { name: "series"; type: "QtCharts::QPieSeries"; isPointer: true } + Property { name: "series"; type: "QPieSeries"; isPointer: true } Property { name: "model"; type: "QAbstractItemModel"; isPointer: true } Property { name: "valuesColumn"; type: "int" } Property { name: "labelsColumn"; type: "int" } @@ -2684,7 +2920,7 @@ "QtCharts/VXYModelMapper 2.0" ] exportMetaObjectRevisions: [0, 0] - Property { name: "series"; type: "QtCharts::QXYSeries"; isPointer: true } + Property { name: "series"; type: "QXYSeries"; isPointer: true } Property { name: "model"; type: "QAbstractItemModel"; isPointer: true } Property { name: "xColumn"; type: "int" } Property { name: "yColumn"; type: "int" } @@ -2699,25 +2935,14 @@ exports: [ "QtCharts/ValueAxis 1.1", "QtCharts/ValueAxis 2.0", - "QtCharts/ValueAxis 2.3", "QtCharts/ValuesAxis 1.0" ] - exportMetaObjectRevisions: [0, 0, 1, 0] - Enum { - name: "TickType" - values: { - "TicksDynamic": 0, - "TicksFixed": 1 - } - } + exportMetaObjectRevisions: [0, 0, 0] Property { name: "tickCount"; type: "int" } Property { name: "min"; type: "double" } Property { name: "max"; type: "double" } Property { name: "labelFormat"; type: "string" } Property { name: "minorTickCount"; type: "int" } - Property { name: "tickAnchor"; revision: 1; type: "double" } - Property { name: "tickInterval"; revision: 1; type: "double" } - Property { name: "tickType"; revision: 1; type: "TickType" } Signal { name: "minChanged" Parameter { name: "min"; type: "double" } @@ -2743,21 +2968,6 @@ name: "labelFormatChanged" Parameter { name: "format"; type: "string" } } - Signal { - name: "tickIntervalChanged" - revision: 1 - Parameter { name: "interval"; type: "double" } - } - Signal { - name: "tickAnchorChanged" - revision: 1 - Parameter { name: "anchor"; type: "double" } - } - Signal { - name: "tickTypeChanged" - revision: 1 - Parameter { name: "type"; type: "QValueAxis::TickType" } - } Method { name: "applyNiceNumbers" } } Component { diff -Nru qtcharts-opensource-src-5.12.5/sync.profile qtcharts-opensource-src-5.9.5/sync.profile --- qtcharts-opensource-src-5.12.5/sync.profile 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/sync.profile 2018-03-19 05:05:55.000000000 +0000 @@ -1,5 +1,5 @@ %modules = ( # path to module name map - "QtCharts" => "$basedir/src/charts;^$basedir/src/chartsqml2", + "QtCharts" => "$basedir/src/charts", ); %moduleheaders = ( # restrict the module headers to those found in relative path ); diff -Nru qtcharts-opensource-src-5.12.5/.tag qtcharts-opensource-src-5.9.5/.tag --- qtcharts-opensource-src-5.12.5/.tag 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/.tag 2018-03-19 05:05:55.000000000 +0000 @@ -1 +1 @@ -dd65e383b2f900b8e661b678c746cd71fdef697e +0044a3519fb8be4ddab16b56fd33cf9835fdfe57 diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/auto.pro qtcharts-opensource-src-5.9.5/tests/auto/auto.pro --- qtcharts-opensource-src-5.12.5/tests/auto/auto.pro 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/auto.pro 2018-03-19 05:05:55.000000000 +0000 @@ -37,6 +37,9 @@ qtHaveModule(quick) { SUBDIRS += qml \ qml-qtquicktest + + # QTBUG-20268 + boot2qt: SUBDIRS -= qml-qtquicktest } !contains(QT_CONFIG, private_tests): SUBDIRS -= \ diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qabstractaxis/tst_qabstractaxis.cpp qtcharts-opensource-src-5.9.5/tests/auto/qabstractaxis/tst_qabstractaxis.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qabstractaxis/tst_qabstractaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qabstractaxis/tst_qabstractaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -41,7 +41,7 @@ QTest::qWait(1); // Allow final deleteLaters to run } -void tst_QAbstractAxis::initAxes(QAbstractAxis *axis, QAbstractSeries *series) +void tst_QAbstractAxis::init(QAbstractAxis* axis, QAbstractSeries* series) { m_axis = axis; m_series = series; @@ -144,10 +144,9 @@ QCOMPARE(spy10.count(), 0); QCOMPARE(spy11.count(), 0); - m_chart->addAxis(m_axis, Qt::AlignBottom); - m_series->attachAxis(m_axis); + m_chart->setAxisX(m_axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); //TODO QCOMPARE(m_axis->axisPen(), axisPen); } @@ -204,10 +203,9 @@ QCOMPARE(spy10.count(), 0); QCOMPARE(spy11.count(), 0); - m_chart->addAxis(m_axis, Qt::AlignBottom); - m_series->attachAxis(m_axis); + m_chart->setAxisX(m_axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); //TODO QCOMPARE(m_axis->gridLinePen(), gridLinePen); } @@ -255,10 +253,9 @@ QCOMPARE(spy10.count(), 0); QCOMPARE(spy11.count(), 0); - m_chart->addAxis(m_axis, Qt::AlignBottom); - m_series->attachAxis(m_axis); + m_chart->setAxisX(m_axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); } @@ -304,10 +301,9 @@ QCOMPARE(spy10.count(), 0); QCOMPARE(spy11.count(), 0); - m_chart->addAxis(m_axis, Qt::AlignBottom); - m_series->attachAxis(m_axis); + m_chart->setAxisX(m_axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_axis->isLineVisible(), lineVisible); } @@ -349,10 +345,9 @@ QCOMPARE(spy8.count(), 0); QCOMPARE(spy9.count(), 0); - m_chart->addAxis(m_axis, Qt::AlignBottom); - m_series->attachAxis(m_axis); + m_chart->setAxisX(m_axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_axis->isGridLineVisible(), gridLineVisible); } @@ -399,10 +394,9 @@ QCOMPARE(spy10.count(), 0); QCOMPARE(spy11.count(), 0); - m_chart->addAxis(m_axis, Qt::AlignBottom); - m_series->attachAxis(m_axis); + m_chart->setAxisX(m_axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_axis->isMinorGridLineVisible(), minorGridLineVisible); } @@ -448,10 +442,9 @@ QCOMPARE(spy10.count(), 1); QCOMPARE(spy11.count(), 0); - m_chart->addAxis(m_axis, Qt::AlignBottom); - m_series->attachAxis(m_axis); + m_chart->setAxisX(m_axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); } @@ -496,10 +489,9 @@ QCOMPARE(spy10.count(), 0); QCOMPARE(spy11.count(), 1); - m_chart->addAxis(m_axis, Qt::AlignBottom); - m_series->attachAxis(m_axis); + m_chart->setAxisX(m_axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); } @@ -545,10 +537,9 @@ QCOMPARE(spy10.count(), 0); QCOMPARE(spy11.count(), 0); - m_chart->addAxis(m_axis, Qt::AlignBottom); - m_series->attachAxis(m_axis); + m_chart->setAxisX(m_axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_axis->isVisible(), visible); } @@ -593,10 +584,9 @@ QCOMPARE(spy10.count(), 0); QCOMPARE(spy11.count(), 0); - m_chart->addAxis(m_axis, Qt::AlignBottom); - m_series->attachAxis(m_axis); + m_chart->setAxisX(m_axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_axis->labelsAngle(), labelsAngle); } @@ -644,7 +634,7 @@ QCOMPARE(spy11.count(), 0); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_axis->labelsBrush(), labelsBrush); } @@ -701,7 +691,7 @@ QCOMPARE(spy11.count(), 0); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_axis->labelsFont(), labelsFont); } @@ -748,10 +738,9 @@ QCOMPARE(spy10.count(), 0); QCOMPARE(spy11.count(), 0); - m_chart->addAxis(m_axis, Qt::AlignBottom); - m_series->attachAxis(m_axis); + m_chart->setAxisX(m_axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_axis->labelsVisible(), labelsVisible); } @@ -780,11 +769,9 @@ QSignalSpy spy11(m_axis, SIGNAL(minorGridLineColorChanged(QColor))); if(orientation==Qt::Vertical){ - m_chart->addAxis(m_axis, Qt::AlignLeft); - m_series->attachAxis(m_axis); + m_chart->setAxisY(m_axis,m_series); }else{ - m_chart->addAxis(m_axis, Qt::AlignBottom); - m_series->attachAxis(m_axis); + m_chart->setAxisX(m_axis,m_series); } QCOMPARE(m_axis->orientation(), orientation); @@ -802,7 +789,7 @@ QCOMPARE(spy11.count(), 0); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_axis->orientation(), orientation); } @@ -905,7 +892,7 @@ QCOMPARE(spy11.count(), 0); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_axis->shadesBrush(), shadesBrush); } @@ -961,10 +948,9 @@ QCOMPARE(spy10.count(), 0); QCOMPARE(spy11.count(), 0); - m_chart->addAxis(m_axis, Qt::AlignBottom); - m_series->attachAxis(m_axis); + m_chart->setAxisX(m_axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_axis->shadesPen(), shadesPen); } @@ -1010,10 +996,9 @@ QCOMPARE(spy10.count(), 0); QCOMPARE(spy11.count(), 0); - m_chart->addAxis(m_axis, Qt::AlignBottom); - m_series->attachAxis(m_axis); + m_chart->setAxisX(m_axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_axis->shadesVisible(), shadesVisible); } diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qabstractaxis/tst_qabstractaxis.h qtcharts-opensource-src-5.9.5/tests/auto/qabstractaxis/tst_qabstractaxis.h --- qtcharts-opensource-src-5.12.5/tests/auto/qabstractaxis/tst_qabstractaxis.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qabstractaxis/tst_qabstractaxis.h 2018-03-19 05:05:55.000000000 +0000 @@ -44,11 +44,9 @@ public slots: virtual void initTestCase(); virtual void cleanupTestCase(); + virtual void init(QAbstractAxis* axis,QAbstractSeries* series); virtual void cleanup(); -protected: - void initAxes(QAbstractAxis *axis, QAbstractSeries *series); - private slots: void axisPen_data(); void axisPen(); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qareaseries/tst_qareaseries.cpp qtcharts-opensource-src-5.9.5/tests/auto/qareaseries/tst_qareaseries.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qareaseries/tst_qareaseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qareaseries/tst_qareaseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -123,7 +123,7 @@ series->attachAxis(m_axisX); series->attachAxis(m_axisY); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); checkPixels(m_backgroundColor, m_brushColor, m_backgroundColor); } @@ -137,7 +137,7 @@ series->attachAxis(m_axisX); series->attachAxis(m_axisY); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); checkPixels(m_backgroundColor, m_backgroundColor, m_backgroundColor); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp qtcharts-opensource-src-5.9.5/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -37,8 +37,10 @@ Q_OBJECT public slots: + void initTestCase(); + void cleanupTestCase(); void init(); - void cleanup() override; + void cleanup(); private slots: void qbarcategoryaxis_data(); @@ -88,6 +90,15 @@ QBarSeries* m_series; }; +void tst_QBarCategoriesAxis::initTestCase() +{ +} + +void tst_QBarCategoriesAxis::cleanupTestCase() +{ + QTest::qWait(1); // Allow final deleteLaters to run +} + void tst_QBarCategoriesAxis::init() { m_baraxis = new QBarCategoryAxis(); @@ -117,7 +128,7 @@ foreach(QString category, categories) m_baraxis->append(category); - tst_QAbstractAxis::initAxes(m_baraxis, m_series); + tst_QAbstractAxis::init(m_baraxis, m_series); m_chart->addSeries(m_series); m_chart->createDefaultAxes(); } @@ -183,10 +194,9 @@ QCOMPARE(spy2.count(), 1); QCOMPARE(spy3.count(), 1); - m_chart->addAxis(&axis, Qt::AlignBottom); - m_series->attachAxis(&axis); + m_chart->setAxisX(&axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(axis.categories(), categories); QCOMPARE(spy0.count(), 1); @@ -223,10 +233,9 @@ QCOMPARE(spy2.count(), 1); QCOMPARE(spy3.count(), categories.count()); - m_chart->addAxis(&axis, Qt::AlignBottom); - m_series->attachAxis(&axis); + m_chart->setAxisX(&axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(axis.categories(), categories); QCOMPARE(spy0.count(), categories.count()); @@ -268,10 +277,9 @@ QCOMPARE(spy2.count(), 0); QCOMPARE(spy3.count(), 0); - m_chart->addAxis(&axis, Qt::AlignBottom); - m_series->attachAxis(&axis); + m_chart->setAxisX(&axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(axis.at(index), string); QCOMPARE(spy0.count(), 0); @@ -307,10 +315,9 @@ QCOMPARE(spy2.count(), 1); QCOMPARE(spy3.count(), 1); - m_chart->addAxis(&axis, Qt::AlignBottom); - m_series->attachAxis(&axis); + m_chart->setAxisX(&axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(axis.categories(), categories); QCOMPARE(spy0.count(), 1); @@ -349,10 +356,9 @@ QCOMPARE(spy2.count(), 1); QCOMPARE(spy3.count(), 1); - m_chart->addAxis(&axis, Qt::AlignBottom); - m_series->attachAxis(&axis); + m_chart->setAxisX(&axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(spy0.count(), 2); QCOMPARE(spy1.count(), 2); @@ -398,10 +404,9 @@ QCOMPARE(spy3.count(), 0); QCOMPARE(spy4.count(), 0); - m_chart->addAxis(&axis, Qt::AlignBottom); - m_series->attachAxis(&axis); + m_chart->setAxisX(&axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(axis.count(), count); } @@ -438,10 +443,9 @@ QCOMPARE(spy3.count(), 0); QCOMPARE(spy4.count(), 1); - m_chart->addAxis(&axis, Qt::AlignBottom); - m_series->attachAxis(&axis); + m_chart->setAxisX(&axis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); } void tst_QBarCategoriesAxis::remove_data() @@ -518,10 +522,9 @@ void tst_QBarCategoriesAxis::max() { - m_chart->addAxis(m_baraxis, Qt::AlignBottom); - m_series->attachAxis(m_baraxis); + m_chart->setAxisX(m_baraxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); max_raw(); } @@ -573,10 +576,9 @@ void tst_QBarCategoriesAxis::min() { min_raw(); - m_chart->addAxis(m_baraxis, Qt::AlignBottom); - m_series->attachAxis(m_baraxis); + m_chart->setAxisX(m_baraxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); } @@ -632,10 +634,9 @@ void tst_QBarCategoriesAxis::range() { range_raw(); - m_chart->addAxis(m_baraxis, Qt::AlignBottom); - m_series->attachAxis(m_baraxis); + m_chart->setAxisX(m_baraxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); } @@ -677,10 +678,9 @@ QCOMPARE(spy1.count(), 1); QCOMPARE(spy2.count(), 1); - m_chart->addAxis(m_baraxis, Qt::AlignBottom); - m_series->attachAxis(m_baraxis); + m_chart->setAxisX(m_baraxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_baraxis->min(),min); QCOMPARE(m_baraxis->max(),max); } @@ -701,15 +701,14 @@ QCOMPARE(m_baraxis->min(),QString()); QCOMPARE(m_baraxis->max(),QString()); - m_chart->addAxis(m_baraxis, Qt::AlignBottom); - m_series->attachAxis(m_baraxis); + m_chart->setAxisX(m_baraxis, m_series); QCOMPARE(spy0.count(), 1); QCOMPARE(spy1.count(), 1); QCOMPARE(spy2.count(), 1); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_baraxis->min(),QString("1")); QCOMPARE(m_baraxis->max(),QString("6")); } diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qbarseries/tst_qbarseries.cpp qtcharts-opensource-src-5.9.5/tests/auto/qbarseries/tst_qbarseries.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qbarseries/tst_qbarseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qbarseries/tst_qbarseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -72,7 +72,6 @@ void setLabelsFormat(); void setLabelsPosition(); void setLabelsAngle(); - void setLabelsPrecision(); void opacity(); void mouseclicked_data(); void mouseclicked(); @@ -431,19 +430,6 @@ QCOMPARE(m_barseries->labelsAngle(), 55.0); } -void tst_QBarSeries::setLabelsPrecision() -{ - QSignalSpy labelsPrecisionSpy(m_barseries, - SIGNAL(labelsPrecisionChanged(int))); - QCOMPARE(m_barseries->labelsPrecision(), 6); - - m_barseries->setLabelsPrecision(9); - TRY_COMPARE(labelsPrecisionSpy.count(), 1); - QList arguments = labelsPrecisionSpy.takeFirst(); - QVERIFY(arguments.at(0).value() == 9); - QCOMPARE(m_barseries->labelsPrecision(), 9); -} - void tst_QBarSeries::opacity() { QSignalSpy opacitySpy(m_barseries, SIGNAL(opacityChanged())); @@ -491,7 +477,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -670,7 +656,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); //this is hack since view does not get events otherwise view.setMouseTracking(true); @@ -1017,7 +1003,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -1182,7 +1168,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -1347,7 +1333,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qbarset/tst_qbarset.cpp qtcharts-opensource-src-5.9.5/tests/auto/qbarset/tst_qbarset.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qbarset/tst_qbarset.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qbarset/tst_qbarset.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -447,7 +447,7 @@ view.resize(200, 200); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Test adding data to the sets *set1 << 1 << 2 << 1 << 3; diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp qtcharts-opensource-src-5.9.5/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -81,15 +81,8 @@ void mouseDoubleClicked(); private: - QPointer m_series; - struct SetList : QList> { - operator QList () const { - QList list; - for (int i = 0; i < count(); ++i) - list.append(at(i)); - return list; - } - }; SetList m_sets; + QCandlestickSeries *m_series; + QList m_sets; }; void tst_QCandlestickSeries::initTestCase() @@ -126,9 +119,14 @@ void tst_QCandlestickSeries::cleanup() { + foreach (QCandlestickSet *set, m_sets) { + m_series->remove(set); + m_sets.removeAll(set); + delete set; + } + delete m_series; - qDeleteAll(m_sets); - m_sets.clear(); + m_series = nullptr; } void tst_QCandlestickSeries::qCandlestickSeries() @@ -179,20 +177,16 @@ // Remove some sets const int removeCount = 3; - for (int i = 0; i < removeCount; ++i) { + for (int i = 0; i < removeCount; ++i) QVERIFY(m_series->remove(m_sets.at(i))); - QVERIFY(!m_sets.at(i)); - } QCOMPARE(m_series->count(), m_sets.count() - removeCount); for (int i = removeCount; i < m_sets.count(); ++i) QCOMPARE(m_series->sets().at(i - removeCount), m_sets.at(i)); // Try removing all sets again (should be ok, even if some sets have already been removed) - for (int i = 0; i < m_sets.count(); ++i) { + for (int i = 0; i < m_sets.count(); ++i) m_series->remove(m_sets.at(i)); - QVERIFY(!m_sets.at(i)); - } QCOMPARE(m_series->count(), 0); } @@ -604,7 +598,7 @@ view.chart()->addSeries(m_series); view.chart()->createDefaultAxes(); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for candlesticks QRectF plotArea = view.chart()->plotArea(); @@ -668,7 +662,7 @@ view.chart()->addSeries(m_series); view.chart()->createDefaultAxes(); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // This is hack since view does not get events otherwise view.setMouseTracking(true); @@ -783,7 +777,7 @@ view.chart()->addSeries(m_series); view.chart()->createDefaultAxes(); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for candlesticks QRectF plotArea = view.chart()->plotArea(); @@ -846,7 +840,7 @@ view.chart()->addSeries(m_series); view.chart()->createDefaultAxes(); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for candlesticks QRectF plotArea = view.chart()->plotArea(); @@ -909,7 +903,7 @@ view.chart()->addSeries(m_series); view.chart()->createDefaultAxes(); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for candlesticks QRectF plotArea = view.chart()->plotArea(); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp qtcharts-opensource-src-5.9.5/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -89,7 +89,7 @@ m_categoryaxis = new QCategoryAxis(); m_series = new QLineSeries(); *m_series << QPointF(-100, -100) << QPointF(0, 0) << QPointF(100, 100); - tst_QAbstractAxis::initAxes(m_categoryaxis, m_series); + tst_QAbstractAxis::init(m_categoryaxis, m_series); m_chart->addSeries(m_series); m_chart->createDefaultAxes(); } @@ -116,10 +116,9 @@ QCOMPARE(m_categoryaxis->type(), QAbstractAxis::AxisTypeCategory); QCOMPARE(m_categoryaxis->labelsPosition(), QCategoryAxis::AxisLabelsPositionCenter); - m_chart->addAxis(m_categoryaxis, Qt::AlignBottom); - m_series->attachAxis(m_categoryaxis); + m_chart->setAxisX(m_categoryaxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QVERIFY(!qFuzzyCompare(m_categoryaxis->max(), 0)); QVERIFY(!qFuzzyCompare(m_categoryaxis->min(), 0)); @@ -158,10 +157,9 @@ void tst_QCategoryAxis::max() { - m_chart->addAxis(m_categoryaxis, Qt::AlignBottom); - m_series->attachAxis(m_categoryaxis); + m_chart->setAxisX(m_categoryaxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); max_raw(); } @@ -207,10 +205,9 @@ void tst_QCategoryAxis::min() { - m_chart->addAxis(m_categoryaxis, Qt::AlignBottom); - m_series->attachAxis(m_categoryaxis); + m_chart->setAxisX(m_categoryaxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); min_raw(); } @@ -262,10 +259,9 @@ void tst_QCategoryAxis::range() { - m_chart->addAxis(m_categoryaxis, Qt::AlignBottom); - m_series->attachAxis(m_categoryaxis); + m_chart->setAxisX(m_categoryaxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); range_raw(); } @@ -339,12 +335,11 @@ m_categoryaxis->setReverse(); QCOMPARE(m_categoryaxis->isReverse(), true); - m_chart->addAxis(m_categoryaxis, Qt::AlignBottom); - m_series->attachAxis(m_categoryaxis); + m_chart->setAxisX(m_categoryaxis, m_series); QCOMPARE(spy.count(), 1); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_categoryaxis->isReverse(), true); } diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qchart/BLACKLIST qtcharts-opensource-src-5.9.5/tests/auto/qchart/BLACKLIST --- qtcharts-opensource-src-5.12.5/tests/auto/qchart/BLACKLIST 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qchart/BLACKLIST 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,3 @@ +[zoomOut] +# QTBUG-20268 +b2qt diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qchart/tst_qchart.cpp qtcharts-opensource-src-5.9.5/tests/auto/qchart/tst_qchart.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qchart/tst_qchart.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qchart/tst_qchart.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -125,7 +125,6 @@ void backgroundRoundness(); void zoomInAndOut_data(); void zoomInAndOut(); - void fixedPlotArea(); private: void createTestData(); @@ -165,7 +164,7 @@ *series0 << QPointF(0, 0) << QPointF(100, 100); m_chart->addSeries(series0); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); } void tst_QChart::qchart_data() @@ -181,8 +180,8 @@ QCOMPARE(m_chart->animationOptions(), QChart::NoAnimation); QCOMPARE(m_chart->animationDuration(), 1000); QCOMPARE(m_chart->animationEasingCurve(), QEasingCurve(QEasingCurve::OutQuart)); - QVERIFY(m_chart->axes(Qt::Horizontal).isEmpty()); - QVERIFY(m_chart->axes(Qt::Vertical).isEmpty()); + QVERIFY(!m_chart->axisX()); + QVERIFY(!m_chart->axisY()); QVERIFY(m_chart->backgroundBrush()!=QBrush()); QVERIFY(m_chart->backgroundPen()!=QPen()); QCOMPARE(m_chart->isBackgroundVisible(), true); @@ -241,7 +240,7 @@ { QFETCH(QAbstractSeries *, series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QVERIFY(!series->chart()); QCOMPARE(m_chart->series().count(), 0); m_chart->addSeries(series); @@ -250,11 +249,11 @@ QVERIFY(series->chart() == m_chart); m_chart->createDefaultAxes(); if(series->type()!=QAbstractSeries::SeriesTypePie){ - QVERIFY(!m_chart->axes(Qt::Vertical, series).isEmpty()); - QVERIFY(!m_chart->axes(Qt::Horizontal, series).isEmpty()); + QVERIFY(m_chart->axisY(series)); + QVERIFY(m_chart->axisX(series)); }else{ - QVERIFY(m_chart->axes(Qt::Vertical, series).isEmpty()); - QVERIFY(m_chart->axes(Qt::Horizontal, series).isEmpty()); + QVERIFY(!m_chart->axisY(series)); + QVERIFY(!m_chart->axisX(series)); } m_chart->removeSeries(series); QVERIFY(!series->chart()); @@ -336,13 +335,12 @@ { QFETCH(QAbstractAxis*, axis); QFETCH(QAbstractSeries*, series); - QVERIFY(m_chart->axes(Qt::Horizontal).isEmpty()); + QVERIFY(!m_chart->axisX()); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); m_chart->addSeries(series); - m_chart->addAxis(axis, Qt::AlignBottom); - series->attachAxis(axis); - QCOMPARE(m_chart->axes(Qt::Horizontal, series).value(0), axis); + m_chart->setAxisX(axis,series); + QVERIFY(m_chart->axisX(series)==axis); } void tst_QChart::axisY_data() @@ -355,13 +353,12 @@ { QFETCH(QAbstractAxis*, axis); QFETCH(QAbstractSeries*, series); - QVERIFY(m_chart->axes(Qt::Vertical).isEmpty()); + QVERIFY(!m_chart->axisY()); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); m_chart->addSeries(series); - m_chart->addAxis(axis, Qt::AlignLeft); - series->attachAxis(axis); - QCOMPARE(m_chart->axes(Qt::Vertical, series).value(0), axis); + m_chart->setAxisY(axis,series); + QVERIFY(m_chart->axisY(series)==axis); } void tst_QChart::backgroundBrush_data() @@ -544,17 +541,17 @@ m_chart->addSeries(series1); m_chart->addSeries(series2); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); m_chart->createDefaultAxes(); QCOMPARE(m_chart->axes().count(), 2); - QVERIFY(!m_chart->axes(Qt::Vertical, series0).isEmpty()); - QVERIFY(!m_chart->axes(Qt::Vertical, series1).isEmpty()); - QVERIFY(!m_chart->axes(Qt::Vertical, series2).isEmpty()); + QVERIFY(m_chart->axisY(series0)!=0); + QVERIFY(m_chart->axisY(series1)!=0); + QVERIFY(m_chart->axisY(series2)!=0); m_chart->removeAllSeries(); QCOMPARE(m_chart->axes().count(), 2); - QVERIFY(!m_chart->axes(Qt::Horizontal).isEmpty()); - QVERIFY(!m_chart->axes(Qt::Vertical).isEmpty()); + QVERIFY(m_chart->axisX() != 0); + QVERIFY(m_chart->axisY() != 0); QCOMPARE(deleteSpy1.count(), 1); QCOMPARE(deleteSpy2.count(), 1); QCOMPARE(deleteSpy3.count(), 1); @@ -571,18 +568,15 @@ QFETCH(QAbstractSeries *, series); QSignalSpy deleteSpy(series, SIGNAL(destroyed())); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); - if (!axis) - axis = m_chart->axes(Qt::Vertical).value(0); - QVERIFY(axis); + QTest::qWaitForWindowShown(m_view); + if(!axis) axis = m_chart->axisY(); m_chart->addSeries(series); - m_chart->addAxis(axis, Qt::AlignLeft); - series->attachAxis(axis); - QCOMPARE(m_chart->axes(Qt::Vertical, series).value(0), axis); + m_chart->setAxisY(axis,series); + QCOMPARE(m_chart->axisY(series),axis); m_chart->removeSeries(series); QCOMPARE(m_chart->axes().count(), 1); - QVERIFY(!m_chart->axes(Qt::Vertical).isEmpty()); - QVERIFY(m_chart->axes(Qt::Vertical, series).isEmpty()); + QVERIFY(m_chart->axisY() != 0); + QVERIFY(m_chart->axisY(series)==0); QCOMPARE(deleteSpy.count(), 0); delete series; } @@ -605,9 +599,9 @@ m_chart->addSeries(series); m_chart->createDefaultAxes(); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); - QAbstractAxis *axis = m_chart->axes(Qt::Horizontal).value(0); - QVERIFY(axis); + QTest::qWaitForWindowShown(m_view); + QAbstractAxis * axis = m_chart->axisX(); + QVERIFY(axis!=0); switch(axis->type()) { @@ -649,9 +643,9 @@ m_chart->addSeries(series); m_chart->createDefaultAxes(); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); - QAbstractAxis *axis = m_chart->axes(Qt::Horizontal).value(0); - QVERIFY(axis); + QTest::qWaitForWindowShown(m_view); + QAbstractAxis * axis = m_chart->axisX(); + QVERIFY(axis!=0); switch(axis->type()) { @@ -692,9 +686,9 @@ m_chart->addSeries(series); m_chart->createDefaultAxes(); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); - QAbstractAxis *axis = m_chart->axes(Qt::Vertical).value(0); - QVERIFY(axis); + QTest::qWaitForWindowShown(m_view); + QAbstractAxis * axis = m_chart->axisY(); + QVERIFY(axis!=0); switch(axis->type()) { @@ -735,9 +729,9 @@ m_chart->addSeries(series); m_chart->createDefaultAxes(); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); - QAbstractAxis *axis = m_chart->axes(Qt::Vertical).value(0); - QVERIFY(axis); + QTest::qWaitForWindowShown(m_view); + QAbstractAxis * axis = m_chart->axisY(); + QVERIFY(axis!=0); switch(axis->type()) { @@ -849,10 +843,10 @@ m_chart->createDefaultAxes(); QRectF marigns = m_chart->plotArea(); rect.adjust(marigns.left(),marigns.top(),-marigns.right(),-marigns.bottom()); - auto axisX = qobject_cast(m_chart->axes(Qt::Horizontal).value(0)); - QVERIFY(axisX); - auto axisY = qobject_cast(m_chart->axes(Qt::Vertical).value(0)); - QVERIFY(axisY); + QValueAxis* axisX = qobject_cast(m_chart->axisX()); + QVERIFY(axisX!=0); + QValueAxis* axisY = qobject_cast(m_chart->axisY()); + QVERIFY(axisY!=0); qreal minX = axisX->min(); qreal minY = axisY->min(); qreal maxX = axisX->max(); @@ -877,10 +871,10 @@ createTestData(); m_chart->createDefaultAxes(); - auto axisX = qobject_cast(m_chart->axes(Qt::Horizontal).value(0)); - QVERIFY(axisX); - auto axisY = qobject_cast(m_chart->axes(Qt::Vertical).value(0)); - QVERIFY(axisY); + QValueAxis* axisX = qobject_cast(m_chart->axisX()); + QVERIFY(axisX!=0); + QValueAxis* axisY = qobject_cast(m_chart->axisY()); + QVERIFY(axisY!=0); qreal minX = axisX->min(); qreal minY = axisY->min(); @@ -908,8 +902,8 @@ else QCOMPARE(minY, axisY->min()); - QCOMPARE(maxX, axisX->max()); - QCOMPARE(maxY, axisY->max()); + QVERIFY(maxX == axisX->max()); + QVERIFY(maxY == axisY->max()); } @@ -917,10 +911,10 @@ { createTestData(); m_chart->createDefaultAxes(); - auto axisX = qobject_cast(m_chart->axes(Qt::Horizontal).value(0)); - QVERIFY(axisX); - auto axisY = qobject_cast(m_chart->axes(Qt::Vertical).value(0)); - QVERIFY(axisY); + QValueAxis *axisX = qobject_cast(m_chart->axisX()); + QVERIFY(axisX != 0); + QValueAxis *axisY = qobject_cast(m_chart->axisY()); + QVERIFY(axisY != 0); qreal minX = axisX->min(); qreal minY = axisY->min(); @@ -1044,12 +1038,10 @@ chart->addSeries(series1); chart->addSeries(series2); chart->createDefaultAxes(); - auto xAxis = qobject_cast(chart->axes(Qt::Horizontal).value(0)); - QVERIFY(xAxis); + QValueAxis *xAxis = (QValueAxis *)chart->axisX(); QCOMPARE(xAxis->min(), overallminX); QCOMPARE(xAxis->max(), overallmaxX); - auto yAxis = qobject_cast(chart->axes(Qt::Vertical).value(0)); - QVERIFY(yAxis); + QValueAxis *yAxis = (QValueAxis *)chart->axisY(); QCOMPARE(yAxis->min(), overallminY); QCOMPARE(yAxis->max(), overallmaxY); QLineSeries *series3 = new QLineSeries(this); @@ -1170,11 +1162,8 @@ dateTimeAxisY->setRange(QDateTime::fromMSecsSinceEpoch(minY), QDateTime::fromMSecsSinceEpoch(maxY)); } - const auto series = m_chart->series().constFirst(); - m_chart->addAxis(axisX, Qt::AlignBottom); - series->attachAxis(axisX); - m_chart->addAxis(axisY, Qt::AlignLeft); - series->attachAxis(axisY); + m_chart->setAxisX(axisX, m_chart->series().first()); + m_chart->setAxisY(axisY, m_chart->series().first()); CHECK_AXIS_RANGES_MATCH m_chart->zoomIn(); @@ -1211,24 +1200,6 @@ CHECK_AXIS_RANGES_MATCH } -void tst_QChart::fixedPlotArea() -{ - createTestData(); - const QRectF originalPlotArea = m_chart->plotArea(); - m_chart->setPlotArea(originalPlotArea); - QCOMPARE(m_chart->plotArea(), originalPlotArea); - m_view->resize(400, 400); - // Should still be the same size - QCOMPARE(m_chart->plotArea(), originalPlotArea); - m_chart->setPlotArea(QRectF()); - // Should still be the same size as we have not triggered an update - QCOMPARE(m_chart->plotArea(), originalPlotArea); - m_view->resize(401, 401); - QVERIFY(m_chart->plotArea() != originalPlotArea); - m_chart->setPlotArea(originalPlotArea); - QCOMPARE(m_chart->plotArea(), originalPlotArea); -} - QTEST_MAIN(tst_QChart) #include "tst_qchart.moc" diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qchartview/tst_qchartview.cpp qtcharts-opensource-src-5.9.5/tests/auto/qchartview/tst_qchartview.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qchartview/tst_qchartview.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qchartview/tst_qchartview.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -98,7 +98,7 @@ QVERIFY(m_view->chart()); QCOMPARE(m_view->rubberBand(), QChartView::NoRubberBand); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); delete(new QChartView()); @@ -163,17 +163,15 @@ m_view->chart()->addSeries(line); m_view->chart()->createDefaultAxes(); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QRectF plotArea = m_view->chart()->plotArea(); //this is hack since view does not get events otherwise m_view->setMouseTracking(true); - QAbstractAxis *axisY = m_view->chart()->axes(Qt::Vertical).value(0); - QVERIFY(axisY); + QAbstractAxis* axisY = m_view->chart()->axisY(); QSignalSpy spy0(axisY, SIGNAL(rangeChanged(qreal,qreal))); - QAbstractAxis *axisX = m_view->chart()->axes(Qt::Horizontal).value(0); - QVERIFY(axisX); + QAbstractAxis* axisX = m_view->chart()->axisX(); QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal,qreal))); QValueAxis* vaxisX = qobject_cast(axisX); QValueAxis* vaxisY = qobject_cast(axisY); @@ -225,7 +223,7 @@ // show current chart m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QTest::qWait(1000); // set new chart diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp qtcharts-opensource-src-5.9.5/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -88,16 +88,14 @@ m_dateTimeAxisY = new QDateTimeAxis(); m_series = new QLineSeries(); *m_series << QPointF(-100, -100) << QPointF(0, 0) << QPointF(100, 100); - // tst_QAbstractAxis::initAxes(m_datetimeaxis, m_series); + // tst_QAbstractAxis::init(m_datetimeaxis, m_series); m_view = new QChartView; m_view->resize(200, 200); m_chart = m_view->chart(); m_chart->addSeries(m_series); - m_chart->addAxis(m_dateTimeAxisY, Qt::AlignLeft); - m_series->attachAxis(m_dateTimeAxisY); - m_chart->addAxis(m_dateTimeAxisX, Qt::AlignBottom); - m_series->attachAxis(m_dateTimeAxisX); + m_chart->setAxisY(m_dateTimeAxisY, m_series); + m_chart->setAxisX(m_dateTimeAxisX, m_series); } void tst_QDateTimeAxis::cleanup() @@ -124,7 +122,7 @@ QCOMPARE(m_dateTimeAxisX->type(), QAbstractAxis::AxisTypeDateTime); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QVERIFY(m_dateTimeAxisX->max().toMSecsSinceEpoch() != 0); QVERIFY(m_dateTimeAxisX->min().toMSecsSinceEpoch() != 0); @@ -177,7 +175,7 @@ { // m_chart->setAxisX(m_dateTimeAxisX, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); max_raw(); } @@ -236,7 +234,7 @@ { // m_chart->setAxisX(m_dateTimeAxisX, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); min_raw(); } @@ -310,7 +308,7 @@ { // m_chart->setAxisX(m_dateTimeAxisX, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); range_raw(); } @@ -335,7 +333,7 @@ QCOMPARE(spy.count(), 1); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_dateTimeAxisX->isReverse(), true); } diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp qtcharts-opensource-src-5.9.5/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -424,7 +424,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -596,7 +596,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); //this is hack since view does not get events otherwise view.setMouseTracking(true); @@ -909,7 +909,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -1074,7 +1074,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -1239,7 +1239,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp qtcharts-opensource-src-5.9.5/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -207,7 +207,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -343,7 +343,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); //this is hack since view does not get events otherwise view.setMouseTracking(true); @@ -629,7 +629,7 @@ view.chart()->createDefaultAxes(); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); } @@ -656,7 +656,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -821,7 +821,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -986,7 +986,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp qtcharts-opensource-src-5.9.5/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -206,7 +206,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -347,7 +347,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); //this is hack since view does not get events otherwise view.setMouseTracking(true); @@ -644,7 +644,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -814,7 +814,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -984,7 +984,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qlegend/tst_qlegend.cpp qtcharts-opensource-src-5.9.5/tests/auto/qlegend/tst_qlegend.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qlegend/tst_qlegend.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qlegend/tst_qlegend.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -557,7 +557,7 @@ QChartView view(chart); view.resize(400, 400); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Sweep mouse over all legend items for (int i = 0; i < 400; i++) diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qlineseries/tst_qlineseries.cpp qtcharts-opensource-src-5.9.5/tests/auto/qlineseries/tst_qlineseries.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qlineseries/tst_qlineseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qlineseries/tst_qlineseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -114,7 +114,7 @@ m_chart->addSeries(&series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); } void tst_QLineSeries::pressedSignal() @@ -132,7 +132,7 @@ view.chart()->legend()->setVisible(false); view.chart()->addSeries(lineSeries); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); QSignalSpy seriesSpy(lineSeries, SIGNAL(pressed(QPointF))); @@ -164,7 +164,7 @@ view.chart()->legend()->setVisible(false); view.chart()->addSeries(lineSeries); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); QSignalSpy seriesSpy(lineSeries, SIGNAL(released(QPointF))); @@ -218,7 +218,7 @@ view.chart()->legend()->setVisible(false); view.chart()->addSeries(lineSeries); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); QSignalSpy seriesSpy(lineSeries, SIGNAL(doubleClicked(QPointF))); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp qtcharts-opensource-src-5.9.5/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -37,8 +37,10 @@ Q_OBJECT public slots: + void initTestCase(); + void cleanupTestCase(); void init(); - void cleanup() override; + void cleanup(); private slots: void qlogvalueaxis_data(); @@ -75,12 +77,21 @@ QLineSeries* m_series; }; +void tst_QLogValueAxis::initTestCase() +{ +} + +void tst_QLogValueAxis::cleanupTestCase() +{ + QTest::qWait(1); // Allow final deleteLaters to run +} + void tst_QLogValueAxis::init() { m_logvaluesaxis = new QLogValueAxis(); m_series = new QLineSeries(); *m_series << QPointF(1, 1) << QPointF(100, 100); - tst_QAbstractAxis::initAxes(m_logvaluesaxis, m_series); + tst_QAbstractAxis::init(m_logvaluesaxis,m_series); m_chart->addSeries(m_series); m_chart->createDefaultAxes(); } @@ -106,14 +117,9 @@ QCOMPARE(m_logvaluesaxis->min(), (qreal)1); QCOMPARE(m_logvaluesaxis->type(), QAbstractAxis::AxisTypeLogValue); - const auto oldXAxes = m_chart->axes(Qt::Horizontal); - for (auto oldXAxis : oldXAxes) - m_chart->removeAxis(oldXAxis); - - m_chart->addAxis(m_logvaluesaxis, Qt::AlignBottom); - m_series->attachAxis(m_logvaluesaxis); + m_chart->setAxisX(m_logvaluesaxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_logvaluesaxis->max(), (qreal)100); QCOMPARE(m_logvaluesaxis->min(), (qreal)1); @@ -164,10 +170,9 @@ void tst_QLogValueAxis::max() { - m_chart->addAxis(m_logvaluesaxis, Qt::AlignBottom); - m_series->attachAxis(m_logvaluesaxis); + m_chart->setAxisX(m_logvaluesaxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); max_raw(); } @@ -220,10 +225,9 @@ void tst_QLogValueAxis::min() { - m_chart->addAxis(m_logvaluesaxis, Qt::AlignBottom); - m_series->attachAxis(m_logvaluesaxis); + m_chart->setAxisX(m_logvaluesaxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); min_raw(); } @@ -285,10 +289,9 @@ void tst_QLogValueAxis::range() { - m_chart->addAxis(m_logvaluesaxis, Qt::AlignBottom); - m_series->attachAxis(m_logvaluesaxis); + m_chart->setAxisX(m_logvaluesaxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); range_raw(); } @@ -301,10 +304,9 @@ { range_raw(); - m_chart->addAxis(m_logvaluesaxis, Qt::AlignBottom); - m_series->attachAxis(m_logvaluesaxis); + m_chart->setAxisX(m_logvaluesaxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); } void tst_QLogValueAxis::range_animation_data() @@ -343,7 +345,7 @@ QCOMPARE(spy1.count(), 1); QCOMPARE(spy2.count(), 1); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_logvaluesaxis->min(), min); QCOMPARE(m_logvaluesaxis->max(), max); } @@ -361,31 +363,23 @@ QCOMPARE(m_logvaluesaxis->min(), (qreal)1); QCOMPARE(m_logvaluesaxis->max(), (qreal)1); - const auto oldXAxes = m_chart->axes(Qt::Horizontal); - for (auto oldXAxis : oldXAxes) - m_chart->removeAxis(oldXAxis); - m_chart->addAxis(m_logvaluesaxis, Qt::AlignBottom); - m_series->attachAxis(m_logvaluesaxis); + m_chart->setAxisX(m_logvaluesaxis, m_series); QCOMPARE(spy0.count(), 1); QCOMPARE(spy1.count(), 0); QCOMPARE(spy2.count(), 1); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_logvaluesaxis->min(), (qreal)1); QCOMPARE(m_logvaluesaxis->max(), (qreal)100); } void tst_QLogValueAxis::zoom() { - const auto oldXAxes = m_chart->axes(Qt::Horizontal); - for (auto oldXAxis : oldXAxes) - m_chart->removeAxis(oldXAxis); - m_chart->addAxis(m_logvaluesaxis, Qt::AlignBottom); - m_series->attachAxis(m_logvaluesaxis); + m_chart->setAxisX(m_logvaluesaxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); m_logvaluesaxis->setBase(2); m_logvaluesaxis->setRange(0.5, 2); @@ -426,7 +420,7 @@ QCOMPARE(spy.count(), 1); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_logvaluesaxis->isReverse(), true); } diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qml-qtquicktest/tst_boxplotseries_1_3.qml qtcharts-opensource-src-5.9.5/tests/auto/qml-qtquicktest/tst_boxplotseries_1_3.qml --- qtcharts-opensource-src-5.12.5/tests/auto/qml-qtquicktest/tst_boxplotseries_1_3.qml 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qml-qtquicktest/tst_boxplotseries_1_3.qml 2018-03-19 05:05:55.000000000 +0000 @@ -55,7 +55,7 @@ countChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - boxPlotSeries.append("boxplot" + i, [1, 3, 5, 7, 9]); + boxPlotSeries.append("boxplot" + i, Math.random()); compare(addedSpy.count, count); compare(countChangedSpy.count, count); boxPlotSeries.clear(); @@ -66,7 +66,7 @@ countChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - boxPlotSeries.append("boxplot" + i, [1, 3, 5, 7, 9]); + boxPlotSeries.append("boxplot" + i, Math.random()); for (var j = 0; j < count; j++) boxPlotSeries.remove(boxPlotSeries.at(0)); compare(removedSpy.count, count); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qml-qtquicktest/tst_boxplotseries_1_4.qml qtcharts-opensource-src-5.9.5/tests/auto/qml-qtquicktest/tst_boxplotseries_1_4.qml --- qtcharts-opensource-src-5.12.5/tests/auto/qml-qtquicktest/tst_boxplotseries_1_4.qml 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qml-qtquicktest/tst_boxplotseries_1_4.qml 2018-03-19 05:05:55.000000000 +0000 @@ -58,7 +58,7 @@ countChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - boxPlotSeries.append("boxplot" + i, [1, 3, 5, 7, 9]); + boxPlotSeries.append("boxplot" + i, Math.random()); compare(addedSpy.count, count); compare(countChangedSpy.count, count); compare(boxPlotSeries.count, count) @@ -71,7 +71,7 @@ countChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - boxPlotSeries.append("boxplot" + i, [1, 3, 5, 7, 9]); + boxPlotSeries.append("boxplot" + i, Math.random()); for (var j = 0; j < count; j++) boxPlotSeries.remove(boxPlotSeries.at(0)); compare(removedSpy.count, count); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qml-qtquicktest/tst_boxplotseries_2_0.qml qtcharts-opensource-src-5.9.5/tests/auto/qml-qtquicktest/tst_boxplotseries_2_0.qml --- qtcharts-opensource-src-5.12.5/tests/auto/qml-qtquicktest/tst_boxplotseries_2_0.qml 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qml-qtquicktest/tst_boxplotseries_2_0.qml 2018-03-19 05:05:55.000000000 +0000 @@ -58,7 +58,7 @@ countChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - boxPlotSeries.append("boxplot" + i, [1, 3, 5, 7, 9]); + boxPlotSeries.append("boxplot" + i, Math.random()); compare(addedSpy.count, count); compare(countChangedSpy.count, count); compare(boxPlotSeries.count, count) @@ -71,7 +71,7 @@ countChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - boxPlotSeries.append("boxplot" + i, [1, 3, 5, 7, 9]); + boxPlotSeries.append("boxplot" + i, Math.random()); for (var j = 0; j < count; j++) boxPlotSeries.remove(boxPlotSeries.at(0)); compare(removedSpy.count, count); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qml-qtquicktest/tst_boxplotseries.qml qtcharts-opensource-src-5.9.5/tests/auto/qml-qtquicktest/tst_boxplotseries.qml --- qtcharts-opensource-src-5.12.5/tests/auto/qml-qtquicktest/tst_boxplotseries.qml 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qml-qtquicktest/tst_boxplotseries.qml 2018-03-19 05:05:55.000000000 +0000 @@ -58,7 +58,7 @@ countChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - boxPlotSeries.append("boxplot" + i, [1, 3, 5, 7, 9]); + boxPlotSeries.append("boxplot" + i, Math.random()); compare(addedSpy.count, count); compare(countChangedSpy.count, count); compare(boxPlotSeries.count, count) @@ -71,7 +71,7 @@ countChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - boxPlotSeries.append("boxplot" + i, [1, 3, 5, 7, 9]); + boxPlotSeries.append("boxplot" + i, Math.random()); for (var j = 0; j < count; j++) boxPlotSeries.remove(boxPlotSeries.at(0)); compare(removedSpy.count, count); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp qtcharts-opensource-src-5.9.5/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -207,7 +207,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -345,7 +345,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); //this is hack since view does not get events otherwise view.setMouseTracking(true); @@ -633,7 +633,7 @@ view.chart()->createDefaultAxes(); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); } void tst_QPercentBarSeries::mousePressed() @@ -659,7 +659,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -826,7 +826,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -993,7 +993,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qpieseries/tst_qpieseries.cpp qtcharts-opensource-src-5.9.5/tests/auto/qpieseries/tst_qpieseries.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qpieseries/tst_qpieseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qpieseries/tst_qpieseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -96,7 +96,7 @@ m_view->resize(200, 200); m_series = new QPieSeries(m_view); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); } @@ -523,7 +523,7 @@ m_view->chart()->legend()->setVisible(false); m_view->chart()->addSeries(m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); // test maximum size m_series->setPieSize(1.0); @@ -576,7 +576,7 @@ m_view->chart()->legend()->setVisible(false); m_view->chart()->addSeries(m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); // move inside the slices m_series->setPieSize(1.0); @@ -678,7 +678,7 @@ m_view->chart()->legend()->setVisible(false); m_view->chart()->addSeries(m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); // test maximum size m_series->setPieSize(1.0); @@ -731,7 +731,7 @@ m_view->chart()->legend()->setVisible(false); m_view->chart()->addSeries(m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); // test maximum size m_series->setPieSize(1.0); @@ -781,7 +781,7 @@ m_view->chart()->legend()->setVisible(false); m_view->chart()->addSeries(m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); // test maximum size m_series->setPieSize(1.0); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qpieslice/tst_qpieslice.cpp qtcharts-opensource-src-5.9.5/tests/auto/qpieslice/tst_qpieslice.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qpieslice/tst_qpieslice.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qpieslice/tst_qpieslice.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -31,8 +31,6 @@ #include #include #include -#include -#include #include #include @@ -195,7 +193,7 @@ view.resize(200, 200); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); //QTest::qWait(1000); // check that customizations persist @@ -219,20 +217,12 @@ QCOMPARE(s1->labelFont(), f1); // insert a slice - series->insert(0, new QPieSlice("slice 0", 5)); + series->insert(0, new QPieSlice("slice 5", 5)); QCOMPARE(s1->pen(), p1); QCOMPARE(s1->brush(), b1); QCOMPARE(s1->labelBrush(), b1); QCOMPARE(s1->labelFont(), f1); - // QTBUG-62082, verify correct insertion at 0. - const QStringList expectedLabels{"slice 0", "slice 1", "slice 3", "slice 4"}; - const auto legendMarkers = view.chart()->legend()->markers(); - const int legendMarkersSize = legendMarkers.size(); - QCOMPARE(legendMarkersSize, expectedLabels.size()); - for (int m = 0; m < legendMarkersSize; ++m) - QCOMPARE(legendMarkers.at(m)->label(), expectedLabels.at(m)); - // change theme // theme will overwrite customizations view.chart()->setTheme(QChart::ChartThemeHighContrast); @@ -267,7 +257,7 @@ view.chart()->legend()->setVisible(false); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // simulate clicks series->setPieSize(1.0); @@ -305,7 +295,7 @@ view.chart()->legend()->setVisible(false); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // try to ensure focus QApplication::setActiveWindow(&view); @@ -385,7 +375,7 @@ view.chart()->legend()->setVisible(false); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // simulate clicks series->setPieSize(1.0); @@ -426,7 +416,7 @@ view.chart()->legend()->setVisible(false); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // simulate clicks series->setPieSize(1.0); @@ -461,7 +451,7 @@ view.chart()->legend()->setVisible(false); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // simulate clicks series->setPieSize(1.0); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qscatterseries/tst_qscatterseries.cpp qtcharts-opensource-src-5.9.5/tests/auto/qscatterseries/tst_qscatterseries.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qscatterseries/tst_qscatterseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qscatterseries/tst_qscatterseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -108,7 +108,7 @@ m_chart->addSeries(&series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); } void tst_QScatterSeries::scatterChangedSignals() @@ -155,7 +155,7 @@ view.chart()->legend()->setVisible(false); view.chart()->addSeries(scatterSeries); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); QSignalSpy seriesSpy(scatterSeries, SIGNAL(pressed(QPointF))); @@ -187,7 +187,7 @@ view.chart()->legend()->setVisible(false); view.chart()->addSeries(scatterSeries); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); QSignalSpy seriesSpy(scatterSeries, SIGNAL(released(QPointF))); @@ -219,7 +219,7 @@ view.chart()->legend()->setVisible(false); view.chart()->addSeries(scatterSeries); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); QSignalSpy seriesSpy(scatterSeries, SIGNAL(doubleClicked(QPointF))); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qsplineseries/tst_qsplineseries.cpp qtcharts-opensource-src-5.9.5/tests/auto/qsplineseries/tst_qsplineseries.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qsplineseries/tst_qsplineseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qsplineseries/tst_qsplineseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -106,7 +106,7 @@ m_chart->addSeries(&series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); } void tst_QSplineSeries::pressedSignal() @@ -124,7 +124,7 @@ view.chart()->legend()->setVisible(false); view.chart()->addSeries(splineSeries); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); QSignalSpy seriesSpy(splineSeries, SIGNAL(pressed(QPointF))); @@ -156,7 +156,7 @@ view.chart()->legend()->setVisible(false); view.chart()->addSeries(splineSeries); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); QSignalSpy seriesSpy(splineSeries, SIGNAL(released(QPointF))); @@ -188,7 +188,7 @@ view.chart()->legend()->setVisible(false); view.chart()->addSeries(splineSeries); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); QSignalSpy seriesSpy(splineSeries, SIGNAL(doubleClicked(QPointF))); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp qtcharts-opensource-src-5.9.5/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -206,7 +206,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -347,7 +347,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); //this is hack since view does not get events otherwise view.setMouseTracking(true); @@ -645,7 +645,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -815,7 +815,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); @@ -985,7 +985,7 @@ view.resize(400,300); view.chart()->addSeries(series); view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); + QTest::qWaitForWindowShown(&view); // Calculate expected layout for bars QRectF plotArea = view.chart()->plotArea(); diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qvalueaxis/tst_qvalueaxis.cpp qtcharts-opensource-src-5.9.5/tests/auto/qvalueaxis/tst_qvalueaxis.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qvalueaxis/tst_qvalueaxis.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qvalueaxis/tst_qvalueaxis.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -36,8 +36,10 @@ Q_OBJECT public slots: + void initTestCase(); + void cleanupTestCase(); void init(); - void cleanup() override; + void cleanup(); private slots: void qvalueaxis_data(); @@ -70,28 +72,33 @@ void autoscale(); void reverse(); void labels(); - void dynamicTicks(); private: - void removeAxes(); - QValueAxis* m_valuesaxis; QLineSeries* m_series; }; +void tst_QValueAxis::initTestCase() +{ +} + +void tst_QValueAxis::cleanupTestCase() +{ + QTest::qWait(1); // Allow final deleteLaters to run +} + void tst_QValueAxis::init() { m_valuesaxis = new QValueAxis(); m_series = new QLineSeries(); *m_series << QPointF(-100, -100) << QPointF(0, 0) << QPointF(100, 100); - tst_QAbstractAxis::initAxes(m_valuesaxis,m_series); + tst_QAbstractAxis::init(m_valuesaxis,m_series); m_chart->addSeries(m_series); m_chart->createDefaultAxes(); } void tst_QValueAxis::cleanup() { - removeAxes(); delete m_series; delete m_valuesaxis; m_series = 0; @@ -99,13 +106,6 @@ tst_QAbstractAxis::cleanup(); } -void tst_QValueAxis::removeAxes() -{ - const auto oldAxes = m_chart->axes(Qt::Horizontal) + m_chart->axes(Qt::Vertical); - for (auto oldAxis : oldAxes) - m_chart->removeAxis(oldAxis); -} - void tst_QValueAxis::qvalueaxis_data() { } @@ -119,10 +119,9 @@ QCOMPARE(m_valuesaxis->tickCount(), 5); QCOMPARE(m_valuesaxis->type(), QAbstractAxis::AxisTypeValue); - m_chart->addAxis(m_valuesaxis, Qt::AlignBottom); - m_series->attachAxis(m_valuesaxis); + m_chart->setAxisX(m_valuesaxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QVERIFY(!qFuzzyCompare(m_valuesaxis->max(), 0)); QVERIFY(!qFuzzyCompare(m_valuesaxis->min(), 0)); @@ -163,10 +162,9 @@ void tst_QValueAxis::max() { - m_chart->addAxis(m_valuesaxis, Qt::AlignBottom); - m_series->attachAxis(m_valuesaxis); + m_chart->setAxisX(m_valuesaxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); max_raw(); } @@ -212,10 +210,9 @@ void tst_QValueAxis::min() { - m_chart->addAxis(m_valuesaxis, Qt::AlignBottom); - m_series->attachAxis(m_valuesaxis); + m_chart->setAxisX(m_valuesaxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); min_raw(); } @@ -317,10 +314,9 @@ void tst_QValueAxis::range() { - m_chart->addAxis(m_valuesaxis, Qt::AlignBottom); - m_series->attachAxis(m_valuesaxis); + m_chart->setAxisX(m_valuesaxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); range_raw(); } @@ -361,10 +357,9 @@ QCOMPARE(spy1.count(), 0); QCOMPARE(spy2.count(), 0); - m_chart->addAxis(m_valuesaxis, Qt::AlignBottom); - m_series->attachAxis(m_valuesaxis); + m_chart->setAxisX(m_valuesaxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_valuesaxis->tickCount(), ticksCount); } @@ -395,10 +390,9 @@ QCOMPARE(spy1.count(), 1); QCOMPARE(spy2.count(), 1); - m_chart->addAxis(m_valuesaxis, Qt::AlignBottom); - m_series->attachAxis(m_valuesaxis); + m_chart->setAxisX(m_valuesaxis, m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QVERIFY2(qFuzzyCompare(m_valuesaxis->min(), min), "Min not equal"); QVERIFY2(qFuzzyCompare(m_valuesaxis->max(), max), "Max not equal"); } @@ -416,15 +410,14 @@ QVERIFY2(qFuzzyCompare(m_valuesaxis->min(), 0), "Min not equal"); QVERIFY2(qFuzzyCompare(m_valuesaxis->max(), 0), "Max not equal"); - m_chart->addAxis(m_valuesaxis, Qt::AlignBottom); - m_series->attachAxis(m_valuesaxis); + m_chart->setAxisX(m_valuesaxis, m_series); QCOMPARE(spy0.count(), 1); QCOMPARE(spy1.count(), 1); QCOMPARE(spy2.count(), 1); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QVERIFY2(qFuzzyCompare(m_valuesaxis->min(), -100), "Min not equal"); QVERIFY2(qFuzzyCompare(m_valuesaxis->max(), 100), "Max not equal"); } @@ -437,22 +430,20 @@ m_valuesaxis->setReverse(); QCOMPARE(m_valuesaxis->isReverse(), true); - m_chart->addAxis(m_valuesaxis, Qt::AlignBottom); - m_series->attachAxis(m_valuesaxis); + m_chart->setAxisX(m_valuesaxis, m_series); QCOMPARE(spy.count(), 1); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QCOMPARE(m_valuesaxis->isReverse(), true); } void tst_QValueAxis::labels() { - m_chart->addAxis(m_valuesaxis, Qt::AlignBottom); - m_series->attachAxis(m_valuesaxis); + m_chart->setAxisX(m_valuesaxis, m_series); m_view->resize(300, 300); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); QList childItems = m_chart->scene()->items(); QList textItems; @@ -482,46 +473,6 @@ QCOMPARE(originalStrings, updatedStrings); } -void tst_QValueAxis::dynamicTicks() -{ - removeAxes(); // remove default axes created by init() - QValueAxis *valuesaxis = new QValueAxis(); - m_chart->addAxis(m_valuesaxis, Qt::AlignBottom); - m_series->attachAxis(m_valuesaxis); - m_chart->addAxis(valuesaxis, Qt::AlignLeft); - m_series->attachAxis(valuesaxis); - m_view->resize(400, 400); - m_valuesaxis->setRange(-111.0, 111); - m_valuesaxis->setTickType(QValueAxis::TicksDynamic); - m_valuesaxis->setTickAnchor(100.0); - m_valuesaxis->setTickInterval(100.0); - valuesaxis->setRange(-111.0, 111); - valuesaxis->setTickType(QValueAxis::TicksDynamic); - valuesaxis->setTickAnchor(100.0); - valuesaxis->setTickInterval(50.0); - valuesaxis->setLabelFormat("%.2f"); - m_view->show(); - QTest::qWaitForWindowShown(m_view); - - QStringList expectedList; - expectedList << "" << "100.00" << "50.00" << "0.00" << "-50.00" << "-100.00" << - "100.0" << "0.0" << "-100.0"; - - QList childItems = m_chart->scene()->items(); - QList textItems; - QStringList observedStrings; - for (QGraphicsItem *i : childItems) { - if (QGraphicsTextItem *text = qgraphicsitem_cast(i)) { - if (text->parentItem() != m_chart) { - textItems << text; - observedStrings << text->toPlainText(); - } - } - } - - QCOMPARE(observedStrings, expectedList); -} - QTEST_MAIN(tst_QValueAxis) #include "tst_qvalueaxis.moc" diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qxyseries/qlineseries.pro qtcharts-opensource-src-5.9.5/tests/auto/qxyseries/qlineseries.pro --- qtcharts-opensource-src-5.12.5/tests/auto/qxyseries/qlineseries.pro 1970-01-01 00:00:00.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qxyseries/qlineseries.pro 2018-03-19 05:05:55.000000000 +0000 @@ -0,0 +1,6 @@ +!include( ../auto.pri ) { + error( "Couldn't find the auto.pri file!" ) +} +SOURCES += tst_qlineseries.cpp + +!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff -Nru qtcharts-opensource-src-5.12.5/tests/auto/qxyseries/tst_qxyseries.cpp qtcharts-opensource-src-5.9.5/tests/auto/qxyseries/tst_qxyseries.cpp --- qtcharts-opensource-src-5.12.5/tests/auto/qxyseries/tst_qxyseries.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/auto/qxyseries/tst_qxyseries.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -229,7 +229,7 @@ append_raw(); m_chart->addSeries(m_series); m_view->show(); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); } void tst_QXYSeries::append_chart_data() @@ -241,7 +241,7 @@ { m_view->show(); m_chart->addSeries(m_series); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); append_raw(); } @@ -325,7 +325,7 @@ // (simulate e.g. spamming a hypothetical "remove last point"-button) QList bunchOfPoints; for (int i = 0; i < 10; i++) - bunchOfPoints.append(QPointF(i, QRandomGenerator::global()->generateDouble())); + bunchOfPoints.append(QPointF(i, (qreal) rand() / (qreal) RAND_MAX)); m_series->replace(bunchOfPoints); QCOMPARE(m_series->points(), bunchOfPoints); QTest::qWait(1500); // Wait for append animations to be over @@ -337,7 +337,7 @@ // Removal using index for (int i = 0; i < 10; i++) - bunchOfPoints.append(QPointF(i, QRandomGenerator::global()->generateDouble())); + bunchOfPoints.append(QPointF(i, (qreal) rand() / (qreal) RAND_MAX)); m_series->replace(bunchOfPoints); m_series->remove(5); m_series->remove(0); @@ -350,7 +350,7 @@ // Multiple removal using index for (int i = 0; i < 10; i++) - bunchOfPoints.append(QPointF(i, QRandomGenerator::global()->generateDouble())); + bunchOfPoints.append(QPointF(i, (qreal) rand() / (qreal) RAND_MAX)); m_series->replace(bunchOfPoints); m_series->removePoints(5, 2); m_series->removePoints(0, 3); @@ -368,7 +368,7 @@ { m_view->show(); m_chart->addSeries(m_series); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); remove_raw(); } @@ -412,7 +412,7 @@ { m_view->show(); m_chart->addSeries(m_series); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); clear_raw(); } @@ -463,7 +463,7 @@ // Replace all points QList allPoints; for (int i = 0; i < 10; i++) - allPoints.append(QPointF(i, QRandomGenerator::global()->generateDouble())); + allPoints.append(QPointF(i, (qreal) rand() / (qreal) RAND_MAX)); m_series->replace(allPoints); TRY_COMPARE(pointReplacedSpy.count(), points.count()); TRY_COMPARE(pointsReplacedSpy.count(), 1); @@ -513,7 +513,7 @@ { m_view->show(); m_chart->addSeries(m_series); - QVERIFY(QTest::qWaitForWindowExposed(m_view)); + QTest::qWaitForWindowShown(m_view); replace_raw(); } diff -Nru qtcharts-opensource-src-5.12.5/tests/manual/barcharttester/chart-widget.cpp qtcharts-opensource-src-5.9.5/tests/manual/barcharttester/chart-widget.cpp --- qtcharts-opensource-src-5.12.5/tests/manual/barcharttester/chart-widget.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/manual/barcharttester/chart-widget.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -151,6 +152,8 @@ series->setBarWidth(barWidth); } + qsrand((uint) QTime::currentTime().msec()); + resize(800, 300); m_horizontalLayout = new QHBoxLayout(this); m_horizontalLayout->setSpacing(6); diff -Nru qtcharts-opensource-src-5.12.5/tests/manual/candlesticktester/mainwidget.cpp qtcharts-opensource-src-5.9.5/tests/manual/candlesticktester/mainwidget.cpp --- qtcharts-opensource-src-5.12.5/tests/manual/candlesticktester/mainwidget.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/manual/candlesticktester/mainwidget.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -65,6 +64,8 @@ m_customDecreasingColor(false), m_hModelMapper(new QHCandlestickModelMapper(this)) { + qsrand(QDateTime::currentDateTime().toTime_t()); + m_chartView->setRenderHint(QPainter::Antialiasing, false); m_hModelMapper->setModel(new CustomTableModel(this)); @@ -284,9 +285,7 @@ qreal MainWidget::randomValue(int min, int max) const { - if (min > max) - qSwap(min, max); - return QRandomGenerator::global()->bounded(min, max); + return (qrand() / (qreal(RAND_MAX) + 1)) * ((qMax(min, max) - qMin(min, max)) + qMin(min, max)); } QCandlestickSet *MainWidget::randomSet(qreal timestamp) diff -Nru qtcharts-opensource-src-5.12.5/tests/manual/chartviewer/model.h qtcharts-opensource-src-5.9.5/tests/manual/chartviewer/model.h --- qtcharts-opensource-src-5.12.5/tests/manual/chartviewer/model.h 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/manual/chartviewer/model.h 2018-03-19 05:05:55.000000000 +0000 @@ -33,8 +33,8 @@ #include #include #include -#include #include +#include typedef QPair Data; typedef QList DataList; @@ -51,14 +51,17 @@ { DataTable dataTable; + // set seed for random stuff + qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); + // generate random data for (int i(0); i < listCount; i++) { DataList dataList; qreal yValue(0.1); for (int j(0); j < valueCount; j++) { - yValue = yValue + QRandomGenerator::global()->bounded(valueMax / (qreal) valueCount); + yValue = yValue + (qreal)(qrand() % valueMax) / (qreal) valueCount; QPointF value( - (j + QRandomGenerator::global()->generateDouble()) + (j + (qreal) qrand() / (qreal) RAND_MAX) * ((qreal) valueMax / (qreal) valueCount), yValue); QString label = "Slice " + QString::number(i) + ":" + QString::number(j); dataList << Data(value, label); diff -Nru qtcharts-opensource-src-5.12.5/tests/manual/chartviewer/window.cpp qtcharts-opensource-src-5.9.5/tests/manual/chartviewer/window.cpp --- qtcharts-opensource-src-5.12.5/tests/manual/chartviewer/window.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/manual/chartviewer/window.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -48,7 +48,6 @@ #include #include #include -#include #include #include @@ -273,14 +272,13 @@ if (parameters.contains("chart")) { QString t = parameters["chart"].toString(); - QRegularExpression rx("([a-zA-Z0-9_]*)::([a-zA-Z0-9_]*)::([a-zA-Z0-9_]*)"); - QRegularExpressionMatch rmatch; - int pos = t.indexOf(rx, 0, &rmatch); + QRegExp rx("([a-zA-Z0-9_]*)::([a-zA-Z0-9_]*)::([a-zA-Z0-9_]*)"); + int pos = rx.indexIn(t); if (pos > -1) { - m_category = rmatch.captured(1); - m_subcategory = rmatch.captured(2); - m_name = rmatch.captured(3); + m_category = rx.cap(1); + m_subcategory = rx.cap(2); + m_name = rx.cap(3); m_templateComboBox->setCurrentIndex(0); } else { diff -Nru qtcharts-opensource-src-5.12.5/tests/manual/chartwidgettest/mainwidget.cpp qtcharts-opensource-src-5.9.5/tests/manual/chartwidgettest/mainwidget.cpp --- qtcharts-opensource-src-5.12.5/tests/manual/chartwidgettest/mainwidget.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/manual/chartwidgettest/mainwidget.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -49,12 +49,12 @@ #include #include #include -#include #include #include #include -#include +#include +#include QT_CHARTS_USE_NAMESPACE @@ -218,11 +218,11 @@ QList newColumn; for (int i(0); i < rowCount; i++) { if (dataCharacteristics == "Sin") { - newColumn.append(std::abs(sin(M_PI / 50 * i) * 100)); + newColumn.append(std::abs(sin(3.14159265358979 / 50 * i) * 100)); } else if (dataCharacteristics == "Sin + random") { - newColumn.append(std::abs(sin(M_PI / 50 * i) * 100) + QRandomGenerator::global()->bounded(5)); + newColumn.append(std::abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5)); } else if (dataCharacteristics == "Random") { - newColumn.append(QRandomGenerator::global()->bounded(11.0)); + newColumn.append(rand() % 10 + (qreal) rand() / (qreal) RAND_MAX); } else if (dataCharacteristics == "Linear") { //newColumn.append(i * (j + 1.0)); // TODO: temporary hack to make pie work; prevent zero values: diff -Nru qtcharts-opensource-src-5.12.5/tests/manual/openglseriestest/datasource.cpp qtcharts-opensource-src-5.9.5/tests/manual/openglseriestest/datasource.cpp --- qtcharts-opensource-src-5.12.5/tests/manual/openglseriestest/datasource.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/manual/openglseriestest/datasource.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -29,7 +29,6 @@ #include "datasource.h" #include -#include QT_CHARTS_USE_NAMESPACE @@ -118,8 +117,8 @@ qreal x(0); qreal y(0); // data with sin + random component - y = height + (yMultiplier * qSin(M_PI / 50 * j) - + (yMultiplier * QRandomGenerator::global()->generateDouble())); + y = height + (yMultiplier * qSin(3.14159265358979 / 50 * j) + + (yMultiplier * (qreal) rand() / (qreal) RAND_MAX)); // 0.000001 added to make values logaxis compatible x = 0.000001 + 20.0 * (qreal(j) / qreal(colCount)) + (xAdjustment * qreal(i)); points.append(QPointF(x, y)); diff -Nru qtcharts-opensource-src-5.12.5/tests/manual/openglseriestest/mainwindow.cpp qtcharts-opensource-src-5.9.5/tests/manual/openglseriestest/mainwindow.cpp --- qtcharts-opensource-src-5.12.5/tests/manual/openglseriestest/mainwindow.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/manual/openglseriestest/mainwindow.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -36,7 +36,6 @@ #include #include #include -#include #include #include @@ -549,7 +548,7 @@ if (m_seriesList.size() < maxSeriesCount) { QXYSeries *series; - if (QRandomGenerator::global()->bounded(2)) { + if (qrand() % 2) { series = new QLineSeries; series->setPen(QPen(QBrush(color), width)); } else { diff -Nru qtcharts-opensource-src-5.12.5/tests/manual/presenterchart/chartview.cpp qtcharts-opensource-src-5.9.5/tests/manual/presenterchart/chartview.cpp --- qtcharts-opensource-src-5.12.5/tests/manual/presenterchart/chartview.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/manual/presenterchart/chartview.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -32,7 +32,7 @@ #include #include #include -#include +#include ChartView::ChartView(QChart *chart, QWidget *parent) : QChartView(chart, parent), @@ -62,7 +62,7 @@ int numPoints = 10; for (int x = 0; x <= numPoints; ++x) { - qreal y = QRandomGenerator::global()->bounded(100); + qreal y = qrand() % 100; series0->append(x, y); series1->append(x, y); series2->append(x, y); diff -Nru qtcharts-opensource-src-5.12.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarChart.qml qtcharts-opensource-src-5.9.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarChart.qml --- qtcharts-opensource-src-5.12.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarChart.qml 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarChart.qml 2018-03-19 05:05:55.000000000 +0000 @@ -45,7 +45,7 @@ name: "bar" labelsFormat: "@value"; axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } - BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6.567889] + BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] onClicked: console.log("barset.onClicked: " + index); onHovered: console.log("barset.onHovered: " + status + " " + index); onPenChanged: console.log("barset.onPenChanged: " + pen); @@ -78,7 +78,6 @@ onCountChanged: console.log("barSeries.onCountChanged: " + count); onLabelsFormatChanged: console.log("barSeries.onLabelsFormatChanged: " + format); onLabelsPositionChanged: console.log("barSeries.onLabelsPositionChanged: " + series.labelsPosition); - onLabelsPrecisionChanged: console.log("barSeries.onLabelsPrecisionChanged: " + series.labelsPrecision); onPressed: console.log("barSeries.onPressed: " + barset + " " + index); onReleased: console.log("barSeries.onReleased: " + barset + " " + index); onDoubleClicked: console.log("barSeries.onDoubleClicked: " + barset + " " + index); diff -Nru qtcharts-opensource-src-5.12.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml qtcharts-opensource-src-5.9.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml --- qtcharts-opensource-src-5.12.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml 2018-03-19 05:05:55.000000000 +0000 @@ -205,16 +205,6 @@ text: "labels angle -" onClicked: series.labelsAngle = series.labelsAngle - 5; } - Button { - text: "labels precision" - onClicked: { - if (series.labelsPrecision == 2) - series.labelsPrecision = 4; - else - series.labelsPrecision = 2; - } - } - FontEditor { id: fontEditor fontDescription: "label" diff -Nru qtcharts-opensource-src-5.12.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml qtcharts-opensource-src-5.9.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml --- qtcharts-opensource-src-5.12.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml 2018-03-19 05:05:55.000000000 +0000 @@ -78,9 +78,6 @@ + format); onLabelsPositionChanged: console.log("horizontalBarSeries.onLabelsPositionChanged: " + series.labelsPosition); - onLabelsPrecisionChanged: console.log( - "horizontalBarSeries.onLabelsPrecisionChanged: " - + series.labelsPrecision); onPressed: console.log("horizontalBarSeries.onPressed: " + barset + " " + index); onReleased: console.log("horizontalBarSeries.onReleased: " + barset + " " + index); onDoubleClicked: console.log("horizontalBarSeries.onDoubleClicked: " + barset + " " + index); diff -Nru qtcharts-opensource-src-5.12.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml qtcharts-opensource-src-5.9.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml --- qtcharts-opensource-src-5.12.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml 2018-03-19 05:05:55.000000000 +0000 @@ -80,9 +80,6 @@ onLabelsPositionChanged: console.log( "horizontalPercentBarSeries.onLabelsPositionChanged: " + series.labelsPosition); - onLabelsPrecisionChanged: console.log( - "horizontalPercentBarSeries.onLabelsPrecisionChanged: " - + series.labelsPrecision); onPressed: console.log("horizontalPercentBarSeries.onPressed: " + barset + " " + index); onReleased: console.log("horizontalPercentBarSeries.onReleased: " + barset + " " + index); onDoubleClicked: console.log("horizontalPercentBarSeries.onDoubleClicked: " + barset + " " + index); diff -Nru qtcharts-opensource-src-5.12.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml qtcharts-opensource-src-5.9.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml --- qtcharts-opensource-src-5.12.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml 2018-03-19 05:05:55.000000000 +0000 @@ -80,9 +80,6 @@ onLabelsPositionChanged: console.log( "horizontalStackedBarSeries.onLabelsPositionChanged: " + series.labelsPosition); - onLabelsPrecisionChanged: console.log( - "horizontalPercentBarSeries.onLabelsPrecisionChanged: " - + series.labelsPrecision); onPressed: console.log("horizontalStackedBarSeries.onPressed: " + barset + " " + index); onReleased: console.log("horizontalStackedBarSeries.onReleased: " + barset + " " + index); onDoubleClicked: console.log("horizontalStackedBarSeries.onDoubleClicked: " + barset + " " + index); diff -Nru qtcharts-opensource-src-5.12.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml qtcharts-opensource-src-5.9.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml --- qtcharts-opensource-src-5.12.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml 2018-03-19 05:05:55.000000000 +0000 @@ -79,9 +79,6 @@ + format); onLabelsPositionChanged: console.log("percentBarSeries.onLabelsPositionChanged: " + series.labelsPosition); - onLabelsPrecisionChanged: console.log( - "percentBarSeries.onLabelsPrecisionChanged: " - + series.labelsPrecision); onPressed: console.log("percentBarSeries.onPressed: " + barset + " " + index); onReleased: console.log("percentBarSeries.onReleased: " + barset + " " + index); onDoubleClicked: console.log("percentBarSeries.onDoubleClicked: " + barset + " " + index); diff -Nru qtcharts-opensource-src-5.12.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml qtcharts-opensource-src-5.9.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml --- qtcharts-opensource-src-5.12.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/manual/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml 2018-03-19 05:05:55.000000000 +0000 @@ -78,9 +78,6 @@ + format); onLabelsPositionChanged: console.log("stackedBarSeries.onLabelsPositionChanged: " + series.labelsPosition); - onLabelsPrecisionChanged: console.log( - "stackedBarSeries.onLabelsPrecisionChanged: " - + series.labelsPrecision); onPressed: console.log("stackedBarSeries.onPressed: " + barset + " " + index); onReleased: console.log("stackedBarSeries.onReleased: " + barset + " " + index); onDoubleClicked: console.log("stackedBarSeries.onDoubleClicked: " + barset + " " + index); diff -Nru qtcharts-opensource-src-5.12.5/tests/manual/wavechart/wavechart.cpp qtcharts-opensource-src-5.9.5/tests/manual/wavechart/wavechart.cpp --- qtcharts-opensource-src-5.12.5/tests/manual/wavechart/wavechart.cpp 2019-08-23 11:48:41.000000000 +0000 +++ qtcharts-opensource-src-5.9.5/tests/manual/wavechart/wavechart.cpp 2018-03-19 05:05:55.000000000 +0000 @@ -28,18 +28,18 @@ ****************************************************************************/ #include "wavechart.h" -#include -#include +#include QT_CHARTS_USE_NAMESPACE +#define PI 3.14159265358979 static const int numPoints =100; WaveChart::WaveChart(QChart* chart, QWidget* parent) : QChartView(chart, parent), m_series(new QLineSeries()), m_wave(0), - m_step(2 * M_PI / numPoints) + m_step(2 * PI / numPoints) { QPen blue(Qt::blue); blue.setWidth(3); @@ -47,9 +47,12 @@ chart->legend()->setVisible(false); + QTime now = QTime::currentTime(); + qsrand((uint) now.msec()); + int fluctuate = 100; - for (qreal x = 0; x <= 2 * M_PI; x += m_step) { + for (qreal x = 0; x <= 2 * PI; x += m_step) { m_series->append(x, fabs(sin(x) * fluctuate)); } @@ -66,8 +69,8 @@ int fluctuate; const QList& points = m_series->points(); - for (qreal i = 0, x = 0; x <= 2 * M_PI; x += m_step, i++) { - fluctuate = QRandomGenerator::global()->bounded(100); + for (qreal i = 0, x = 0; x <= 2 * PI; x += m_step, i++) { + fluctuate = qrand() % 100; m_series->replace(x,points[i].y(),x,fabs(sin(x) * fluctuate)); }