summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.3' in qt/qtdatavis3d6.3Qt Submodule Update Bot2022-08-231-3/+3
| | | | | Change-Id: I667c2758a35573d0a78fb7619cc8512b44b3ab9e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-08-221-3/+3
| | | | | Change-Id: I991ca15c9b79c5467f6b842ccbc2fcc893e14919 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.3.3Jani Heikkinen2022-08-191-1/+1
| | | | | Change-Id: I5678b11e9930d7af5d5dd391413e85e1084ed99f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-08-191-3/+3
| | | | | Change-Id: I0642ee709d8bbb62e078e15c63bd011dc4a41ba5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-08-111-3/+3
| | | | | Change-Id: I535a236ad9a6f51a1770c6945b7ea77f084b038c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-08-091-3/+3
| | | | | Change-Id: I113d8587b65451d23e3ff72d2ec61e478478be03 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-08-031-3/+3
| | | | | Change-Id: I9a7c8e3b79ac0e96ee787117c38b86038014b157 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-07-251-3/+3
| | | | | Change-Id: I2d26f2939c8b13b9d21939631a08811903063100 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-07-221-3/+3
| | | | | Change-Id: Ibc05b19447b02348b2550d0784ea253ebc44d802 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix layering violation involving AbstractDeclarativeMarc Mutz2022-07-216-3/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying an ubsan build of qtdatavis3d, I get: abstract3dcontroller.cpp.o: undefined reference to `typeinfo for AbstractDeclarative' Turns out that AbstractDeclarative is defined in DataVisualizationQml, a separate library, which depends on DataVisualization. It seems this worked because Abstract3DController only used inline members of AbstractDeclarative, so a normal build doesn't need the class exported, even though it's curious that inline isReady() calls exported QQuickItem::isComponentLoaded() and the linker didn't complain. But an UBSan build requires the type_info, which isn't available, because the class wasn't exported, and cannot be made available because of the layering violation. To fix, Extract Superclass AbstractDeclarativeInterface that provides only the required isReady() function, but lives in DataVisualization, and have the real AbstractDeclarative inherit it. As a drive-by, make isReady() const. Manual conflict resolutions: - ported from SPDX to classical copyright headers Fixes: QTBUG-104714 Change-Id: I0eb718746355f409a4105e2d53e79b7003fd8b22 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> (cherry picked from commit 24106d1e1c818b358f919ce5cbff219b5a9f8b6a)
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-07-201-3/+3
| | | | | Change-Id: I002804d73551dc921b687ee2665fa37bd437c441 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-07-191-3/+3
| | | | | Change-Id: I44f9b9bd2a6858a10e0239d71e05e19dc37fc6bd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-07-151-3/+3
| | | | | Change-Id: I721e13d4c0891186b350422ba65e03799777a4f0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-07-071-3/+3
| | | | | Change-Id: Ia246fc1364dbdb6ff472ba35c02e1db342d8e9c2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-07-061-3/+3
| | | | | Change-Id: I5fdf4a3127670c02fc92ba354fbfdd39f9b1cf6a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-06-271-3/+3
| | | | | Change-Id: I14ffd107ac3ed5bba4c3253eb09d584da08b9e2e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* coin: Prepare for using qt-configure-module in instructionsAlexandru Croitor2022-06-241-3/+8
| | | | | | | | | | | | When using qt-configure-module, we need to check if widgets feature is disabled with configure-style syntax as well. Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: I44147123a4c36ab6b8dfebb2affdc8c4bcde7149 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 23c87e42c80bb7c5dfb4530c2e6f746c7693c0d8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix -Wunused-function on non-OSX platformsMarc Mutz2022-06-211-3/+1
| | | | | | | | | Found by headerscheck. Change-Id: If3c7e2a10132a1201a08db1fb9b71d0cdcd395ff Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> (cherry picked from commit 05b90ceb502c42a41b8acff3d6bc28bb66294a3a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-06-211-3/+3
| | | | | Change-Id: I60388ab2a802fb658eb41e2d76a422805d55e85b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-06-151-3/+3
| | | | | Change-Id: I31bdd9781d345527be49360e704ecf82475c3cb8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.3.2Jani Heikkinen2022-06-161-1/+1
| | | | | Change-Id: Iff7635e407bf67a70465802cab09b0f2ef48c689 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix manual test compilation errorsSami Varanka2022-06-0718-147/+546
| | | | | | | | | | | Many of the manual tests were not compiling, because many of the signals and slots had not compatible signatures. Change-Id: Ibd881e5cca37ec666cb160c95b948e064ac09e5d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit bc2e34b01b7b1633c58c63ad9fe9dca82dbd74d7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-05-311-3/+3
| | | | | Change-Id: If268c8029e33f5b7b9078b1929829af11a38955e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Empty pre-release version in '6.3' seriesJani Heikkinen2022-05-271-1/+1
| | | | | Change-Id: I750bebac6b2d390a652cc9e6c00aebb8b06d6971 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-05-271-3/+3
| | | | | Change-Id: I4c942a82f6273413f6e565956515d6082411a643 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-05-201-3/+3
| | | | | Change-Id: I171154f98f0aee81b61a7b13e4e56f72b9ff7762 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Make sure qml test data is packaged as test resourcesAssam Boudjelthia2022-05-191-0/+6
| | | | | | | | | | | | | This will make sure the test data is packaged and available on device at runtime. Task-number: QTBUG-88846 Change-Id: I9a62299243a784b5e3857ddd968a2abcdd3d6d54 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit efdb022abcf46445f0dabffd1c2f4f690b6d9940) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-05-121-3/+3
| | | | | Change-Id: Idfe5330f4dec32e4c4bb674d8d1b8a981eabe5a1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-05-111-3/+3
| | | | | Change-Id: If6f156e09413d32bce940f8d690d3561789b4cc4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Rename the test to match the expected filenameTomi Korpipaa2022-05-111-5/+5
| | | | | | | | | | ...and pass argv+argc to qExec. Task-number: QTBUG-102735 Change-Id: If2ef09f39d13c29f73b9b199e50b72b0e91ffe75 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 069eb42d7f62364b60b70dce461c46ec01f1ddec) Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix a qt-testrunner.py QEMU failureTomi Korpipaa2022-05-111-4/+16
| | | | | | | | Fixes: QTBUG-102735 Change-Id: I7e4941ffe6bec251957e6d3fe96e69cc797625b3 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 23e093c7bb021a9ae1071e680388286909fbf90f) Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-04-271-3/+3
| | | | | Change-Id: Ib5651f097f855a076b9dd48e5a186955c782aaf5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-04-221-2/+2
| | | | | Change-Id: If28c21311026471f0663eb3022bea4be940d4760 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-04-201-3/+3
| | | | | Change-Id: Ied3a8e982cf4a871244244e3b23dc3baaeb4632d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-04-191-3/+3
| | | | | Change-Id: I53ddd4b5d2cbc55acb5183743365fcfb651fc503 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-04-181-3/+3
| | | | | Change-Id: I8a03dfc159d388dfdd0fb26f625875dd5204cbf2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-04-141-3/+3
| | | | | Change-Id: I85b505048a561772e334b254f69ab5a802e57415 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Clarify the usage of SelectionMultiSeries flagTomi Korpipaa2022-04-081-0/+2
| | | | | | | | | Fixes: QTBUG-102405 Change-Id: I8ebc07858b0c60f3ba469f8d0e5d978d0ca3654f Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit ae915cba96bbce2d1c06b1a5a727c815f31933b9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-04-081-3/+3
| | | | | Change-Id: I67f33dc71c5c6574dedd735e6135be4e48e7a922 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-04-061-3/+3
| | | | | Change-Id: I62fa537364efae1b5e051c97a8ccface37cab280 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove clash with QmlModels QAbstractItemModel foreign typeAlexandru Croitor2022-04-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Both define a struct called QAbstractItemModelForeign. This led to a linking duplicate symbol issue with static Qt libraries: duplicate symbol 'QAbstractItemModelForeign::staticMetaObject' in: libQt6DataVisualizationQml_debug.a(mocs_compilation.cpp.o) lib/libQt6QmlModels_debug.a(mocs_compilation.cpp.o) Add a DataVis infix to the foreign types created by the module, so they don't clash with the QmlModels ones. Amends 8691caff2b685aba4b1e83292de6c4d34775ec0b QmlModels type was added in 528547f5d9d6929f41c94e11591dae36f2794ba2 Task-number: QTBUG-102256 Change-Id: I0134ffb7da9e97ff347991a144b5297643aa4c0c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sami Varanka <sami.varanka@qt.io> (cherry picked from commit 1a9b00c205a31d218525a3a30e4eb39bd3884e21) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-04-011-3/+3
| | | | | Change-Id: I093114ebb9f1819e634a30b39cb70fd0883f14f6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Blacklist: test cases blacklisted in qmltest:"Pasi Petäjäjärvi2022-04-011-70/+0
| | | | | | | | | | This reverts commit cc0f29afc97f3a787f429d44b77f1abea34317c6. Reason for revert: Should not have been merged Task-number: QTBUG-101513 Change-Id: I0f32b8816b399770bd5d9dbda16ff939f285fd2b Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-03-301-3/+3
| | | | | Change-Id: I74f14d091c9b7550126278ba47f11426d85c5f64 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.3.1Jani Heikkinen2022-03-301-1/+1
| | | | | Change-Id: I13bab71cae20277d5aa155dfba4b59f54a89c1e4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Show CMake, qmake information in C++ class documentationKai Köhne2022-03-231-0/+2
| | | | | | | Change-Id: I3f7c7150b9a3409fa17a7009b2e69142d17548bc Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 40b4d53658a01f45e6d5a775448765b56e85fb16) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-03-211-3/+3
| | | | | Change-Id: I4879a9dc03f8090cc1d7474aaafaa58af0cac849 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-03-161-3/+3
| | | | | Change-Id: I8f0a8971ff245d50bc71a2772542081dceca0e0f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CI: Disable tst_qmltest on QNX QEMUPasi Petäjäjärvi2022-03-141-0/+8
| | | | | | | | | | | QNX QEMU does not have support for hw acceleration thus missing createPlatformOpenGLContext, which is required for the QML applications to work. Change-Id: Ic24f96e9cdc907ae16c1a50b0f0ddf75085d807e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit dc7372156b7a1e8113b7c2c459d7f4d7aa3f98c6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdatavis3dQt Submodule Update Bot2022-03-141-3/+3
| | | | | Change-Id: Ie4135dd10dd6d82dad5c54aa01661ac9406b6a6e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>