summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix direct rendering doesn't show anythingSami Varanka2021-06-0415-58/+35
| | | | | | | | | | | | | | | | | | | | | | | Rendering a graph directly to background didn't work in Qt 6 since it uses RHI and there is no way to not clear the color buffer before rendering. The graph uses direct OpenGL calls to render directly to background. Enabled direct rendering to qml3doscilloscope example. In addition, RenderDirectToBackground_NoClear got deprecated. When rendering directly to background, using non-transparent qml item as a background will hide the graph. This was already mentioned in the documentation but not clearly enough. Updated documentation for AbstractGraph3D. Fixes: QTBUG-90665 Change-Id: I53081bac382ab89573359886e4f5c4b41be8e86d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit ad85513d4b38bdedac27a095bd3a988f1eda23a2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-06-011-2/+2
| | | | | Change-Id: I94ee1a9f93f2b88a4f69dd51c8693c146fb6773c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-06-011-2/+2
| | | | | Change-Id: I70c50774ecf83e88e99675bb4a9186cd45bc3298 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-311-2/+2
| | | | | Change-Id: Ib1683670cf7e0bd431b65c93a3a48507865151d5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-311-2/+2
| | | | | Change-Id: I5771c81b7a719eca69114ff140f1c35e69ab5652 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-311-2/+2
| | | | | Change-Id: I89fb74a7a8af6e1b08aa44aed6fa1c307a70cc0e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-281-2/+2
| | | | | Change-Id: I5fbbcd9bc8c8cd41de3d57d2b7779e706bfbb1da Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-281-2/+2
| | | | | Change-Id: Id333a105649c2986caae646f517709c7c2509cb0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-271-2/+2
| | | | | Change-Id: I3d97228138fac2f5a205d5dec777d4e76e92749f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-271-1/+1
| | | | | Change-Id: I6a04a28eab105a9587f300c6fb57336e7971a855 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-05-252-69/+71
| | | | | | | | Task-number: QTBUG-86726 Change-Id: I8372086c40043a6bd1d306b6bfb711e96ddc7cb7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit e73ef93876ce070b4029cecdf4a3c4701c9e5b64)
* Fix warnings in datavisualization examplesSami Varanka2021-05-258-27/+25
| | | | | | | | | | | | | | | Injection of parameters into signal handlers is deprecated. So those signal handlers using parameters needed to be changed to use formal parameters instead. Uncommented the theme in qmlperf manual test. Added missing space to qmlgradient manual test. Fixes: QTBUG-92995 Change-Id: I5999df841c077be63a9f01d71188c07574b2669e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 3184afc8c9cea87fdfc71ed003f29cb29c23ed40) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Set style hint for fontTomi Korpipaa2021-05-241-1/+3
| | | | | | | | | | | | | The font matching algorithm in Linux finds an odd font using the default style hint. Change style hint to get a sensible font instead. Fixes: QTBUG-93676 Change-Id: I35ad0c406c3aaf77dde1606e1b67baffc8a12f91 Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 40ffa9f609f36e2615c6d05c6ac58cc8d65297c9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-241-2/+2
| | | | | Change-Id: Id5798f532422d13465bff4573579024a49ea78fe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-211-2/+2
| | | | | Change-Id: I264ae707631f146192b9cbce1006bfd42ad91f26 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-201-2/+2
| | | | | Change-Id: I9605e54aab297e832fe8cd88ecad2f8a6004e3db Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-191-2/+2
| | | | | Change-Id: I5d736cc9ed4c1c142ef5bca26af2f079264af0d8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-181-2/+2
| | | | | Change-Id: I2b23d4a05a267f53e0ca5445b22170a82d8876f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-181-2/+2
| | | | | Change-Id: I9bb42fd9a22641c318f182fcd97a0e8a7265c333 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix Gradients don't showSami Varanka2021-05-1811-2/+323
| | | | | | | | | | | | | | Added pointer to graph in Abstract3DController. Controller can use that pointer to check whether the graph is ready when receiving a themetypeChanged signal. Added manual test for gradients. Fixes: QTBUG-93506 Change-Id: I13df962b807feb615e3267f580ef57dd62a0b058 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit c9768c1e2440e52976c3456a9a4d302edf49f56a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-181-2/+2
| | | | | Change-Id: I6a9c91b2cf28cc9ef1ff463a47ec582c6d3a1c72 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix QML theme showing totally darkSami Varanka2021-05-171-1/+2
| | | | | | | | | | | | | Added check for new theme's forcePredefinedType in ThemeManager's setActiveTheme before resetting new theme's dirtyBits. Fixes: QTBUG-91103 Fixes: QTBUG-65264 Change-Id: If0dd2dfe6a0e179ce8a21de74b3193650f3e76c1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 54e3c62734cb950e08a3f930880d08b9e2854e35) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-131-2/+2
| | | | | Change-Id: Ibf25fc917de7401965c21f451fd918b098ad19e0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-131-2/+2
| | | | | Change-Id: Idd20343e1436b647028f9c6957f526fe4a1c1685 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-121-2/+2
| | | | | Change-Id: I7f2500eae3073bc7fe345bec83a1080b6234e005 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-121-2/+2
| | | | | Change-Id: I420d88c4a5bb7f8f117c981d0ad0f6e6a6aad7d4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-121-2/+2
| | | | | Change-Id: I80339ce0c2ab90e81efa0138bdc718dcec11b7bd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-111-2/+2
| | | | | Change-Id: I8820b1ad578e74068258b2ccdf1cea07acda0b91 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-111-2/+2
| | | | | Change-Id: Ifd3e16860dbc4176f9908257f8da93dd5d0644e8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-111-1/+1
| | | | | Change-Id: I8a3828fb1c0e7abecb0a4c66d127b95c35c74242 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-111-2/+2
| | | | | Change-Id: I231e741250c5cf3d23ee2e189621a6f94d53a4e7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump versionJani Heikkinen2021-05-073-3/+3
| | | | Change-Id: I83ecf31da55d37c4f0edbc1e6cf24d7c749da359
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-071-2/+2
| | | | | Change-Id: Icc5c976bb7e93caf00107e79c4cae74c2026c16c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-061-2/+2
| | | | | Change-Id: I51a142a770fd7c86bcc3107b8ca3729fc33c271e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-061-2/+2
| | | | | Change-Id: I56ff5b5e3a73fe1ce375b2b9134b751b1f37d269 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-061-2/+2
| | | | | Change-Id: I15840d2ef941031ecd5ac16669268eeed3ede9b0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-061-1/+1
| | | | | Change-Id: I6c4335123977742c73833f55900957efb71902a7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-051-2/+2
| | | | | Change-Id: Ib5c52169f803647393e349a9c8b1634f9b8b59b8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-051-2/+2
| | | | | Change-Id: I4b8745c17b8390bf475292aa01a1663081e5fa7d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-041-2/+2
| | | | | Change-Id: Iab7b5b2ebc4319d761d4e2f01b7e724b67e1813a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-05-011-2/+2
| | | | | Change-Id: I5335c0eb1b93d9e543f2ea81f384ccb12bc92598 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-04-301-2/+2
| | | | | Change-Id: I519141b30ee08e678e88ec81f830598eec72583a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-04-301-2/+2
| | | | | Change-Id: I5f4ae2c098d9242b9bf243934f131eb8aa0b3eb6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add find_package to allow standalone example buildsTomi Korpipaa2021-04-2922-0/+22
| | | | | | | | Fixes: QTBUG-93263 Change-Id: Ia80b6dc30c0797d2d17a349ffaad01ee5d057444 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 32c7d9b71e2857bf0859b28860fe45ce5c80b47c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-04-291-1/+1
| | | | | Change-Id: Ie37d20d8f695eeb38e64daba949b64d8e045b291 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-04-281-2/+2
| | | | | Change-Id: I5cc3b21f957a01fd97a4298d818345e5b71c5da6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-04-281-2/+2
| | | | | Change-Id: If3b2b29cb10391b6b34d7f4c17687d5ac150cd0d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-04-271-2/+2
| | | | | Change-Id: I7dad89088743dbf10c0361589230a28dfc675560 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix documentation issuesTopi Reinio2021-04-272-7/+8
| | | | | | | | | | | * Restore removed example snippet tags * Fix issues in the .qdocconf file Task-number: QTBUG-91875 Change-Id: Iff7068204b5713fbf9f9f568834b55c5c282abba Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 3eba29e47e6ef55960e670095444b977defce345) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-04-271-2/+2
| | | | | Change-Id: I0610b26f8c46abd1611f69e560e82fec28eac2c1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>