summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Port charts to new property registration systemFabian Kosmale2021-06-0330-77/+0
| | | | | | Change-Id: I3d24eb8e5c0fdb718971535c2d2126dcf67a660f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Fix QCOMPARE of deleted object pointers in qpieseries autotestMiikka Heikkinen2021-05-311-3/+3
| | | | | | | | | | QCOMPARE no longer allows comparing deleted object pointers, as it tries to convert the object pointer to a meaningful string, so cast the compared pointers to qint64 first. Change-Id: I9a476c10e5425c2ee7a7b4c90b5ecaaa9139923a Fixes: QTBUG-94084 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* CMake: remove dependency to OpenGL in testsSamuli Piippo2021-05-1438-76/+0
| | | | | | | | | Not all tests need dependency to OpenGL, remove it so tests case be build also when OpenGL is disabled in QtBase. Change-Id: I13034160039a829ca862220262b0af8774582434 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove left-over .pri filesJoerg Bornemann2021-05-051-7/+0
| | | | | | Task-number: QTBUG-88742 Change-Id: I95eef560adfc2bbcd4b9ab42f76f0bb72afdedee Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove qmake project filesJoerg Bornemann2021-05-0365-1025/+0
| | | | | | | Task-number: QTBUG-88742 Change-Id: I49c59fc00a32e11fd27bad26e4206f06e91d3fa9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Rename ambiguous test nameKai Köhne2021-03-311-1/+1
| | | | | | | | | | | | | | | | | | qml is an ambiguous target name, and conflicts with the qml tool in a top-level build: CMake Error at qtbase/cmake/QtExecutableHelpers.cmake:28 (add_executable): add_executable cannot create target "qml" because another target with the same name already exists. The existing target is an executable created in source directory "C:/dev/qt/6.1/src/qtdeclarative/tools/qml". See documentation for policy CMP0002 for more details. Call Stack (most recent call first): qtbase/cmake/QtTestHelpers.cmake:214 (qt_internal_add_executable) qtcharts/tests/auto/qml/CMakeLists.txt:7 (qt_internal_add_test) Pick-to: 6.1 Change-Id: Idc3d3d6a689f46825886a7a3cf58e6d7ac215829 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix manual tests for Qt 6Miikka Heikkinen2021-01-123-2/+6
| | | | | | | | | | | Added missing Qt::Quick library to CMakeLists.txt in manual tests that were missing it. Also fixed the Loader use in qmlchartproperties manual test. Change-Id: Ib2fe70c0ba755feb73dfbcfe6b80984d620182c0 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Remove superfluous checks from test build configMichal Klocek2021-01-072-6/+0
| | | | | | | | | Those checks are not needed since all required configs are in place. This will ends up in better looking auto-generated test cmake config files. Change-Id: I98390b3d9d11269473794923e9426323740f4208 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add cmake buildMichal Klocek2021-01-0677-0/+1933
| | | | | | Task-number: QTBUG-89091 Change-Id: Ie511e6bc262f197b2c21e52ec7696a0d50e06d18 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Do not use include with error, prepare for cmakeMichal Klocek2020-12-0843-145/+44
| | | | | | | | | Reporting errors for every single include does not make so much sense and it complicates cmake port (adds a need for lot of extra #special case). Change-Id: I42cf4d7366798caaba5fd6729691051909a5a0c1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Use qtConfig, prepare for cmake 1/2Michal Klocek2020-11-161-1/+1
| | | | | | | | Use qtConfig for opengl otherwise cmake support scripts will not handle it. Change-Id: I5a52ce91cd81ff82eca6e8d6c8b9e371a5294ec8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove charts namespace for Qt6Michal Klocek2020-11-0650-67/+67
| | | | | | | | | This auto refactor to remove charts namespace, just use qt one. [ChangeLog] Use QT_NAMESPACE as other modules. Change-Id: I7722ed2ff5cd84c594ea96db15e5df50a24f06b4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add datetimeaxis to configure systemMichal Klocek2020-11-066-14/+13
| | | | | | | This handles also qreal as float detection. Change-Id: I6b975f487f4d244849c306a703e5f25172acec8e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add configure systemMichal Klocek2020-11-053-4/+4
| | | | | | | | | Adds configure system to charts. Make basic types as configure features. By default build all types. Change-Id: I00992555de377589cb522d471ad81f30499f93f3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update dependenciesFriedemann Kleint2020-10-309-459/+459
| | | | | | | Fix some warnings about deprecated API. Change-Id: Ic3a454dc5045a6126c3c8460700a2fce3c37352e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Add explicit cast to allow template comparison to work properlyKeith Kyzivat2020-10-221-1/+1
| | | | | | | | | | | The Qt CI Compiler no longer recognizes that SetList can be cast to QList<QCandlestickSet *>. This adds an explicit cast to make it clear to the compiler how to cast it. Change-Id: I50b0cd27e08d40eec09d74e82db7b2f3f004766f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix removed calls to insertMultiMichal Klocek2020-08-145-8/+8
| | | | | | | Use QMultiMap, QMulitHash instead. Change-Id: I0782aa189a4465619757cb8204189bda888d641a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-262-4/+4
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I0d9e3a48056294137f1465f091802b4b7c32c8bf Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-264-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notice the following API changes: -void QXYSeries::replace(QVector<QPointF> points); +void QXYSeries::replace(const QList<QPointF> &points); -bool QAbstractBarSeries::append(QVector<QBarSet *> sets); +bool QAbstractBarSeries::append(const QList<QBarSet *> &sets); -void QAbstractBarSeries::barsetsAdded(QVector<QBarSet *> sets); +void QAbstractBarSeries::barsetsAdded(const QList<QBarSet *> &sets); -void QAbstractBarSeries::barsetsRemoved(QVector<QBarSet *> sets); +void QAbstractBarSeries::barsetsRemoved(const QList<QBarSet *> &sets); -bool QBoxPlotSeries::append(QVector<QBoxSet *> boxes); +bool QBoxPlotSeries::append(const QList<QBoxSet *> &boxes); -bool QBoxPlotSeries::append(QVector<QBoxSet *> boxes); +bool QBoxPlotSeries::append(const QList<QBoxSet *> &boxes); -void QBoxPlotSeries::boxsetsAdded(QVector<QBoxSet *> sets); +void QBoxPlotSeries::boxsetsAdded(const QList<QBoxSet *> &sets); -void QBoxPlotSeries::boxsetsRemoved(QVector<QBoxSet *> sets); +void QBoxPlotSeries::boxsetsRemoved(const QList<QBoxSet *> &sets); -bool QPieSeries::append(QVector<QPieSlice *> slices); +bool QPieSeries::append(const QList<QPieSlice *> &slices); -QPieSlice *QPieSeries::append(QString label, qreal value); +QPieSlice *QPieSeries::append(const QString &label, qreal value); -void QPieSeries::added(QVector<QPieSlice *> slices); +void QPieSeries::added(const QList<QPieSlice *> &slices); -void QPieSeries::removed(QVector<QPieSlice *> slices); +void QPieSeries::removed(const QList<QPieSlice *> &slices); These should be source compatible changes. Task-number: QTBUG-84469 Change-Id: I153796e9d8244c8e22819993ef26aa91e7b71f99 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Use QList instead of QVector in qtcharts testsJarek Kobus2020-06-2316-54/+54
| | | | | | Task-number: QTBUG-84469 Change-Id: I29790393aa11650842acd7b7c522554540270a18 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Remove qWaitForWindowShown hack, use qWaitForWindowExposed insteadVolker Hilsheimer2020-04-202-13/+2
| | | | | | | | The method has been deprecated since Qt 5.0. Change-Id: I59587833d8d31de9345b3005014b06ce3dd53973 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Skip failing QML tests in Qt 6Friedemann Kleint2020-04-0630-0/+77
| | | | | | | | | | | | | | | QML tests in namespaced builds started to fail with g++ 9.2 when updating to qtdeclarative/fb3552e0d152e963d74cccc7b36f4e618638b722: FAIL! : example::tst_qml-qtquicktest BarSeries::test_axes() Uncaught exception: Unknown method return type: QAbstractAxis* Loc: [/home/qt/work/qt/qtcharts/tests/auto/qml-qtquicktest/tst_barseries.qml(55)] Skip the tests for now. Task-number: QTBUG-83320 Task-number: QTBUG-74273 Change-Id: I97c4af03b2ad429533fa8db227addf0ef5356a5b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependenciesFriedemann Kleint2020-04-066-7/+7
| | | | | | | | | qtbase: Adapt to OpenGL split (a64f4b405222527a72fb087226801c52ddf54ef0), add missing Q_MOC_INCLUDE, adapt examples to changed signals. Task-number: QTBUG-74273 Change-Id: I96b7bb67c0403e3aa72debe16fd9965c70f5c806 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-072-4/+12
|\ | | | | | | Change-Id: I2b92426d958965b3f74be7cb21b1d4fb61543104
| * Place minor tickmarks on horizontal axis correctlyPaul Olav Tvete2019-12-052-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like top and bottom was accidentally swapped when the dynamic tickmarks feature was added. This resulted in the minor tickmarks being drawn on the opposite edge of the canvas from the axis and the major tickmarks. Also modified the manual test to make drawing the grid optional, so the position of the tick marks can be seen more easily. Fixes: QTBUG-79349 Change-Id: Ia25c656d3d66ee0e6dd908504ec5c81cd2555bde Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-2614-173/+173
|\| | | | | | | Change-Id: If708fa111c6ea70e5fdaae3f9be40210fb41f86a
| * Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-2514-173/+173
| | | | | | | | | | | | | | It is being deprecated. Change-Id: I1eafbce147e05028c93830bb882611d9eea58586 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Update dependencies on 'dev' in qt/qtchartsQt Submodule Update Bot2019-11-013-3/+0
|/ | | | | | | | Also include build fix for recent qtbase now that QList == QVector. Fix a logic error in qlgend.cpp uncovered by the switch. Change-Id: I05eda954c28bf9928811122afdd0a7cf92bfb1e6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2Simon Hausmann2019-10-161-1/+10
|\ | | | | | | Change-Id: I2570b3c739857b2fc4ffb26e9ccf1101f2803d87
| * Fix removing rows from candlestick model mapperMiikka Heikkinen2019-10-151-1/+10
| | | | | | | | | | | | | | | | | | There is no guarantee removed rows are in correct order or that they are sequential, so don't assume so. Fixes: QTBUG-79188 Change-Id: I6ee6851ce881872d01486c600d4204faeb162d87 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-031-0/+2
|\| | | | | | | Change-Id: I6a227dfd1762f3c551c373cceb0d8b66bd061cde
| * BLACKLIST dynamicEdgeSeriesChange for msvc-2019Heikki Halmet2019-07-301-0/+2
| | | | | | | | | | | | Task-number: QTBUG-77240 Change-Id: I2bbfa696db6528257d911b94e6c56759dd32beb3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | unblacklist passing testsDaniel Smith2019-06-251-1/+1
| | | | | | | | | | | | | | | | These tests have not failed on the removed platforms for at least 60 days Task-number: QTBUG-76608 Change-Id: I5e084eca4b723cbf63b35dbb4546d57135dc8f59 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-039-112/+203
|\| | | | | | | Change-Id: I4d0a887c45dbeb23f7bd826d1e90c823323eb198
| * Fix deprecation warnings about QtCharts::setAxisX(), setAxisY()Friedemann Kleint2019-05-287-58/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new API, fixing warnings like: tst_qchart.cpp:343:34: warning: 'void QtCharts::QChart::setAxisX(QtCharts::QAbstractAxis*, QtCharts::QAbstractSeries*)' is deprecated [-Wdeprecated-declarations] ... tst_qchart.cpp:361:34: warning: 'void QtCharts::QChart::setAxisY(QtCharts::QAbstractAxis*, QtCharts::QAbstractSeries*)' is deprecated [-Wdeprecated-declarations] ... Some test appear to be relying on the axes being removed in a certain order. Change-Id: I86fab08d661afcd1087a55f847133a9e90d758f9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Tests: Fix deprecation warnings about QtCharts::axisX(), axisY()Friedemann Kleint2019-05-282-43/+49
| | | | | | | | | | | | | | | | | | | | | | | | Use new API, fixing warnings like: tst_qchart.cpp:254:73: warning: 'QtCharts::QAbstractAxis* QtCharts::QChart::axisX(Q Charts::QAbstractSeries*) const' is deprecated [-Wdeprecated-declarations] tst_qchart.cpp:256:74: warning: 'QtCharts::QAbstractAxis* QtCharts::QChart::axisY(Q Charts::QAbstractSeries*) const' is deprecated [-Wdeprecated-declarations] Change-Id: I794c1460638c27fa7d44fc083cd7a6b4ee2e0987 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix crash on ChartView component destroyKirill Burtsev2019-05-221-11/+17
| | | | | | | | | | | | | | | | | | | | | | QML engine expects that children of QML element are deleted through parent/child relationship, but deferring breaks this assumption and leads to crash later in destruction process. Fixes: QTBUG-70987 Change-Id: I9ae3cefc6ee158582d17709272d7d33f45c57cdf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | QtChart: Remove deprecated QPainter::HighQualityAntialiasingChristian Ehrlicher2019-05-271-4/+1
| | | | | | | | | | | | | | | | | | | | QPainter::HighQualityAntialiasing is deprecated and should be replaced by QPainter::Antialiasing Change-Id: Ib4eeea6c17d82d87fb4270f146a6604ce5c8d5fb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Fix deprecation warningsFriedemann Kleint2019-05-271-1/+1
|/ | | | | | | | | | | Fix warnings: animations/axisanimation.cpp:117:51: warning: 'QVariant qVariantFromValue(const T&) [with T = QVector<double>]' is deprecated: Use QVariant::fromValue() instead. [-Wdeprecated-declarations] ... axis/chartaxiselement.cpp:385:64: warning: 'QString& QString::sprintf(const char*, ...)' is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations] ... Change-Id: Ib36d7e09b737110323b816442b36ca2b2e79d6a5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix boxplot testMiikka Heikkinen2019-02-204-8/+8
| | | | | | | | Pass a proper array to the append function that expects an array. Task-number: QTBUG-73942 Change-Id: Id93ea3281f68537b83fc314e9426fa8969f52191 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-5/+7
|\ | | | | | | Change-Id: Ib0ce93137bb1ddc61de77d82c28e25a238f544a0
| * Migrate manual test's ChartViewer to QRegularExpressionSamuel Gaist2018-06-191-5/+7
| | | | | | | | | | | | | | | | | | This patch updates the manual test ChartViewer class to use QRegularExpression in place of QRegExp which is to be considered deprecated. Change-Id: I111c6caedea0e95f87c785ecb57cdc2211dedc51 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Add support for setting a plotarea rectAndy Shaw2018-05-181-0/+19
| | | | | | | | | | Change-Id: Iaa5cee58382b8290a7e36fd744a8af8bc29515b9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-057-43/+12
|\| | | | | | | Change-Id: Ifaec4b83757b31a28650f72e308529edd786b4eb
| * Axes Tests: Fix Clang warnings about hiding overloaded virtual functionsFriedemann Kleint2018-05-027-43/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change tst_QAbstractAxis::init(QAbstractAxis* axis,QAbstractSeries* series) to a protected non-virtual, non-slot helper function initAxes(). Remove overridden functions that are empty or identical to the base implementation (cleanupTestCase()). Add override. Fixes: tst_qvalueaxis.cpp(41,10): warning: 'tst_QValueAxis::init' hides overloaded virtual function [-Woverloaded-virtual] tst_qlogvalueaxis.cpp(42,10): warning: 'tst_QLogValueAxis::init' hides overloaded virtual function [-Woverloaded-virtual] tst_qcategoryaxis.cpp(41,10): warning: 'tst_QCategoryAxis::init' hides overloaded virtual function [-Woverloaded-virtual] tst_qbarcategoryaxis.cpp(42,10): warning: 'tst_QBarCategoriesAxis::init' hides overloaded virtual function [-Woverloaded-virtual] Task-number: QTBUG-63512 Change-Id: Ieb5fae83a43b6ca6ff4211db980a56c10c02c015 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-281-1/+11
|\| | | | | | | Change-Id: Ib7c1f07ccaf6eac51303984b39c21d099ca0706a
| * Maintain correct order of legend items when inserting pie chart itemsFriedemann Kleint2018-04-261-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite QLegendPrivate::handleCountChanged() so that the order of the markers is preserved. Split out helper functions for insertion/removal that leave the m_markers list untouched and add helpers for finding markers by series and related objects. In QLegendPrivate::handleCountChanged(), remove the markers of the series from m_markers and replace the existing ones in the createdMarkers. Finally re-insert createdMarkers into m_markers, preserving the order. Task-number: QTBUG-62082 Change-Id: I03c81dcf5dfd5a5883377630cad16c943503a1be Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Implement dynamic tick handling for ValueAxisMika Salmela2018-03-081-0/+38
|/ | | | | | | Adds properties to define dynamic tick positioning for ValueAxis. Change-Id: Ife2ff3032492e063604adba9bd63eed72c0e0a16 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Don't use deprecated QTest::qWaitForWindowShown()Kari Oikarinen2018-02-2824-140/+140
| | | | | | | | Use QTest::qWaitForWindowExposed() instead. Also wrap it in QVERIFY, so that failed waits fail immediately. Change-Id: I658d2faa89c42bd190de4bf53179b26b8f5d1b6c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-201-0/+36
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I03085b7c604cda9c4a173ca8f6dd34d522e59b16
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 19:58:25 +0000