summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-04-271-2/+2
| | | | | Change-Id: I9035172974f1f6e2bea872efbdb6ef7e051fd418 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: Iac2204b0472f2d13adc26840156935819aceacc2 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-261-2/+2
| | | | | Change-Id: Icb4a06b40e7735e34c6184996f5931b60344928d 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-261-2/+2
| | | | | Change-Id: I5a2d0be243ed0751951777f253dd78b501d4d8bc 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-231-2/+2
| | | | | Change-Id: Ic1c0179786dc085dd3786cc6dd2f2bd421ddfbc7 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-221-2/+2
| | | | | Change-Id: Iae169f70f3cb23c550f7aacb1e006d6d9acbb28d 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-221-2/+2
| | | | | Change-Id: I698a009d48b40a762e62e6e3e4a98ecc7f488895 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix qml3doscilloscope example crashSami Varanka2021-04-222-8/+4
| | | | | | | | | | | | | | | Changed buttonlayout's minimumheight property to use flatshadingtoggle's implicitHeight instead of height. Created a ticket to quick layouts (QTBUG-92896). Also removed direct rendering (QTBUG-90665) Fixes: QTBUG-92830 Change-Id: I088ccfad19bf44a5aa7b837fb8e2f5fd3ee4752a Reviewed-by: Tuomo Pelkonen <tuomo.pelkonen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 7953e45cb47fd264d446dcbe7c5186cef8987e5b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-04-221-2/+2
| | | | | Change-Id: Ibadbc61e2ee79b2621caba5b739bf3483208a46b 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-211-2/+2
| | | | | Change-Id: I9643d53a98c8a0f98a1911276ba66836b0d39e79 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-211-2/+2
| | | | | Change-Id: I29ef72a67e4bed9df4fb4d720a2e9efc280ab95b 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-201-2/+2
| | | | | Change-Id: Iaa1a9c50a350c077ff5f2e48a13e81c2e29bd38a 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-201-2/+2
| | | | | Change-Id: Ibcf57197771e373ad082cab55af197530e432b5f 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-201-2/+2
| | | | | Change-Id: Icdfb7273392d08dc477fb516598b9fea337d70b3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove obsolete namespace documentationVolker Hilsheimer2021-04-203-13/+5
| | | | | | | | | | | | | | | That there is a 'using namespace QtDataVisualization' statement in the 'galaxy' manual tests suggests that there used to be one, but there isn't anymore. This documentation appears to have been for that long-gone namespace, so remove it to silence qdoc. Fix references to the now global qDefaultSurfaceFormat utility function. Change-Id: Ide7689ee30af60f8c97649672f8a0f5ad455c35e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 896ce35f009d7d6d262d070b7fe6dde57655a2e2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-04-201-2/+2
| | | | | Change-Id: Id6b075622d434bd4421fc22259590b097374c527 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-191-2/+2
| | | | | Change-Id: I796a0fbf4e950f9679f71e588df8f7a2c3ce9b92 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Replace \default with \qmldefault for QML APIsVolker Hilsheimer2021-04-194-4/+4
| | | | | | | Change-Id: Idb633687f84c08f1b873a44af6fc9e1a64a4bee5 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 0abbc35cf8632dba6860ea9b33825f064ffc32f6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-04-161-2/+2
| | | | | Change-Id: I4b6c48b22987e4ed7af4f9c87d7544ba058f9fa4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Fix qml module version to use the repo project versionAlexandru Croitor2021-04-151-1/+1
| | | | | | | | | | | | Use PROJECT_VERSION instead of CMAKE_PROJECT_VERSION, so that the repo project version is used in a top-level build, rather than the version of the qt5 project. Task-number: QTBUG-92861 Change-Id: I540849455689e22f954e4f6eeb1ae6a79a583795 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit c1930a76205123d67c5c4606ab71b21b6211336b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-04-151-2/+2
| | | | | Change-Id: I8bcedc7b8faa12c610cced7626d2af1f4de95915 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove extra example from highlightsTomi Korpipaa2021-04-141-2/+1
| | | | | | | | Change-Id: Ib983262d4d90df3b976c91cbd2b6e9c652ae9932 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 2ba4abf4fbfa759d08a61226e48bdd30d228c524) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-04-141-2/+2
| | | | | Change-Id: I0e12ca98ea403f3b03b02fa9fbbe74133aa23bf1 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-131-2/+2
| | | | | Change-Id: Iea5f25fc0ea150daeaef0d0069f6d6f9e5f5cbbf 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-131-2/+2
| | | | | Change-Id: I183f843e91b01467092382e1ef2d5a60096a6077 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix double to float truncation warningsVolker Hilsheimer2021-04-135-48/+48
| | | | | | | | | | QVectorND and QQuarternion operates on floats, so pass in float literals rather than doubles. Change-Id: I6ddb6a4f0caa6e8687e718e10957b6c939a091bd Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 430110e9a157a42ab78c2b6fcb8e2a05b9152393) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-04-091-2/+2
| | | | | Change-Id: Ia62875e6fb266d94893a0ca941a1acda65139f9f 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-091-2/+2
| | | | | Change-Id: Ifee9fc6a726f1b0142b12edcd16a92e1666de666 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-081-2/+2
| | | | | Change-Id: Ibe4a659f5c175b2c3c8f650e8c02c3c14c15be8b 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-071-2/+2
| | | | | Change-Id: I33f8ab571d868ff491d503d2a547d21688236cdf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dv6.1.0-beta3Qt Submodule Update Bot2021-04-011-2/+2
| | | | | Change-Id: Iadd346a7285a6fc92750e51eb6b94fcad03f5c30 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-011-2/+2
| | | | | Change-Id: If22dbda63d952f95ec1b251174a1f67efebd6ff3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-03-311-2/+2
| | | | | Change-Id: I50d4b7b5ec457597c104304f911e6bffae52d894 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dQt Submodule Update Bot2021-03-291-2/+2
| | | | | Change-Id: Ida10fb4c2579ae7f0923093d8d05bde25564bf2f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Rename qmloscilloscopeTomi Korpipaa2021-03-2611-30/+30
| | | | | | | | | | | | | There was a naming conflict with QtCharts qmloscilloscope example, so this is now renamed as qml3doscilloscope Fixes: QTBUG-92167 Change-Id: I657d9737c39b0680aabc6b7c00ebe04351643502 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 695276e2c4725d67960aa212043fe1b86c47fe95) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Drop documentation buildJani Heikkinen2021-03-222-6/+0
| | | | | | | | | | | | | | We will add additional libraries back to the qt5.git. Having documentation build enabled in additional library will cause problems in qt5.git integrations so we need to drop it from module builds. At same time drop the qttools dependency which were added for documentation build Task-number: QTBUG-91796 Pick-to: dev Change-Id: I3842618c8ee8e546557fa88b784f714c43fd0f09 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add "scm" attribute to conanfile.pyIikka Eklund2021-03-151-0/+1
| | | | | | | | | | | | | | We want to match the commit ID along with the RREV (recipe revision). This way we can pin exact Conan packages to known sha1/tag which makes releasing easier. https://docs.conan.io/en/latest/reference/conanfile/attributes.html#revision-mode Task-number: QTQAINFRA-4325 Change-Id: I866e9fc20cc82dbf03b818f7f3502e3e0991b440 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit e9abaa440fa7447d12f38a9e1976747ca1804346) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dv6.1.0-beta2Jani Heikkinen2021-03-151-3/+3
| | | | | Change-Id: I7cc5974ec9dc55faf776bd1f3461d3cc25047607 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>