summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.1.0' in qt/qtdatavis3dv6.1.0Qt Submodule Update Bot2021-05-041-1/+1
| | | | | Change-Id: Icbd78f16651ba0c4cc1af28d4ce2d999212cb377 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1.0' in qt/qtdatavis3dQt Submodule Update Bot2021-05-031-2/+2
| | | | | Change-Id: I90133e5eb3e9769753de14f8ca17372481a65107 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
| | | | | | | | Pick-to: dev Pick-to: 6.1 Fixes: QTBUG-93263 Change-Id: Ia80b6dc30c0797d2d17a349ffaad01ee5d057444 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.1.0' in qt/qtdatavis3dv6.1.0-rc2Qt Submodule Update Bot2021-04-271-2/+2
| | | | | Change-Id: Ie2e4406446f030acc8a0b901088408835d67a4f4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1.0' in qt/qtdatavis3dQt Submodule Update Bot2021-04-231-2/+2
| | | | | Change-Id: Ia8b3b71b625c88af8f272a824b8c1fafac65a5af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1.0' in qt/qtdatavis3dv6.1.0-rc1Qt Submodule Update Bot2021-04-201-2/+2
| | | | | Change-Id: Ie843db6926554f9d241a5b8cfce1d9a78462927c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1.0' in qt/qtdatavis3dQt Submodule Update Bot2021-04-201-2/+2
| | | | | Change-Id: I4e0f825046af047aac0265a6ce45fb8b5b0e45f0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1.0' in qt/qtdatavis3dQt Submodule Update Bot2021-04-151-2/+2
| | | | | Change-Id: I28c511e9b357f82fcdbf53d7cb59d4edb4996c3d 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.0' in qt/qtdatavis3dQt Submodule Update Bot2021-04-141-1/+1
| | | | | Change-Id: Ibf11bfaf416343f918235650f59cef5c68a10a98 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: 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>
* Update dependencies on '6.1' in qt/qtdatavis3dJani Heikkinen2021-03-051-3/+3
| | | | | Change-Id: I6e19ab8039784312c2fbf704d0ee9adfd33acb20 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add documentation for the RHI backend selectionTomi Korpipaa2021-03-041-0/+5
| | | | | | | | | | Fixes: QTBUG-90663 Change-Id: Ifc972c20e273e5ae060bc70d289027350428599f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tuomo Pelkonen <tuomo.pelkonen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit e73fdf23da12884ff8df6c9f23add8d2758ae446) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QSurfaceDataProxy: Fix crashes adding the first row of dataFriedemann Kleint2021-03-032-4/+18
| | | | | | | | | | | | | Adding one row causes an assert ASSERT failure in QList::at: "index out of range", file include/QtCore/qlist.h, line 373 since there is no first row to check the column count against. Check for empty as well. Task-number: PYSIDE-1438 Change-Id: I225b87b764545b7a430472dc5a4b2e476a26a7ff Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 106bef0493758ddaeadd3b4d744227cb7feadb70) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3dJani Heikkinen2021-03-031-3/+3
| | | | | Change-Id: Ia49863399fbddcde1a2d93637d18f555255659d9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix layout and signal handling in QML appsTuomo Pelkonen2021-02-262-19/+10
| | | | | | | | Task-number: QTBUG-90664 Change-Id: I181a3b3b2a1801665a0d876a837054aa10425c0d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 9cb0e5714182df7f7d6b4fb291ffb83b614750d5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix quit buttons in qml examplesTuomo Pelkonen2021-02-2610-10/+10
| | | | | | | | Task-number: QTBUG-90664 Change-Id: I4b60dafeb0599e988b422a4764bac2e91b22d2ea Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 8461cda03dcbaf70d182656e245f1e636b580e83) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Prevent division by zeroTomi Korpipaa2021-02-251-6/+8
| | | | | | | | Fixes: QTBUG-91347 Change-Id: Ice76d050c47fa141749b77a0313c2f070151bbc1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit ee774a0052ccd56994d6c5008ebb7469da1d87f8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Disable tst_qmltest on QEMUv6.1.0-beta1Tomi Korpipaa2021-02-251-0/+4
| | | | | | | | | QEMU does not have support for createPlatformOpenGLContext, which is required for the QML applications to work. Fixes: QTBUG-91381 Change-Id: Ie14c6306c3aa952e6e71681c17013586d0dfb592 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.1' in qt/qtdatavis3dJani Heikkinen2021-02-251-3/+3
| | | | | Change-Id: Ic12ed5ceb4d7da412540d6612d79222798c1a17d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.1' in qt/qtdatavis3d/Jani Heikkinen2021-02-221-2/+2
| | | | | Change-Id: If458b6f9282f78770cce9c129a2f1ce5f0a7e131 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.1' in qt/qtdatavis3d/Jani Heikkinen2021-02-221-3/+3
| | | | | Change-Id: I9e06483fb9ddb2e7eb04686b19416fa8e8d9563d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* conanfile.py: Use QTDIR instead of QT_PATHIikka Eklund2021-02-151-4/+4
| | | | | | | | | | | | | | | There's an established environment variable for this though, QTDIR. This environment variable is also set by Qt Creator by default. So the Conan recipes should accept this environment variable instead. This requires a change in the matching conan profile files where the path to Qt installation is injected to env. Task-number: QTBUG-90583 Change-Id: I128cc1390f0a8525ee4490393cb63338bf511c16 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 64dada44e1cd0f15da0cc12105aebe83210cbdfe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Conan: Use the 'shared' option value of the Qt buildIikka Eklund2021-02-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to the value of the prebuilt Qt build. The 'default' needs to be added as valid option in the list which will be used by default if no value is given by the user or via the conan profile. The user is still able to override this via the profile or from command line if needed: "conan install ... -o shared=False" CMakeCache.txt: - "conan install ..." - BUILD_SHARED_LIBS:BOOL=ON - "conan install ... -o shared=True" - BUILD_SHARED_LIBS:BOOL=ON - "conan install ... -o shared=False" - BUILD_SHARED_LIBS:BOOL=OFF Task-number: QTBUG-90901 Change-Id: I59db7a92cfe8f37bdf0f2f4df9408386aacfac82 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit fe9b50df1545216c08aba0443988d3e3130da62b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3d/v6.1.0-alpha1Jani Heikkinen2021-02-121-3/+3
| | | | | Change-Id: I7afc1102af7e3cc12d8f909c4bcae0e5f4fa501b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump version to 6.1.0Jani Heikkinen2021-02-112-2/+2
| | | | | | Pick-to: dev Change-Id: Ib7c57e40fe7d5d7723273e282f187fa19dfed11f Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Update dependencies on '6.1' in qt/qtdatavis3d/Jani Heikkinen2021-02-111-3/+3
| | | | | Change-Id: I6d07466d576ed62a4f522af9a1fe74fa4dad0a82 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Disable coin tests if there are no widgetsTomi Korpipaa2021-02-111-1/+7
| | | | | | | Change-Id: If6f9a2b0df8f2ede26ca214769d5ee50e26dec43 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 67265d16c14491e64c52629f5f31a655d0700ff0) Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix macOS build that has -Wunused-function as errorTomi Korpipaa2021-02-115-6/+6
| | | | | | | | | | | Clang may interpret static inline function as unused, although it should not. Pragma it out for clang. Fixes: QTBUG-91053 Change-Id: I8fd8bec5236752189deff8a2f6ceb62e572dca30 Reviewed-by: Antti Määttä <antti.maatta@qt.io> (cherry picked from commit 21ab254164ab0891e12dbd037fc4e163ff9f6e9d) Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix failing autotestsTomi Korpipaa2021-02-115-1/+11
| | | | | | | | | | | | | | | QSG_RHI_BACKEND needs to be forced to opengl for the QML test like in any other QML application. Model/height proxy tests need a bit more time for the proxy data to stabilize, so extra QCoreApplication::processEvents() calls were added to handle that. Fixes: QTBUG-90710 Change-Id: I594040e8d504d680ff1990147835a106cc53d922 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> (cherry picked from commit 33d47ef27ed26c49abb8cae3e9576defe0ea7e5b) Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Prevent segfault with software rendererTomi Korpipaa2021-02-111-1/+1
| | | | | | | | | | | | SW renderer doesn't have opengles2 config set, so we need to make sure the pointer does not include garbage. Fixes: QTBUG-91032 Change-Id: I98aa2f10889fe04c2f6f4af6abd0fe559ba686bf Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 824e0ba21a7b1e56264989c243c3138b09458751) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix build for Qt 6.1Tuomo Pelkonen2021-02-1119-11/+24
| | | | | | | | | Task-number: QTBUG-89299 Task-number: QTBUG-90926 Change-Id: I49822338f94e2bdcb0ae5b29d2211127e40d58f9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit d2c6249bb9292deec97b5a026be5efdb7a83bba7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add conanfile.py to enable Conan buildsTomi Korpipaa2021-01-291-0/+130
| | | | | | | | Fixes: QTBUG-90432 Change-Id: I7715a66bfaea1a6929e7b4589d5954623829838d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Enable documentation buildJani Heikkinen2021-01-292-0/+6
| | | | | | Task-number: QTBUG-90431 Change-Id: I3f633f901e6d59f1e02f3a6a71cabd68706d8f43 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix conan build errorsTomi Korpipaa2021-01-293-3/+7
| | | | | | Fixes: QTBUG-90737 Change-Id: Iab4a0f9d4ff3618dfb4c1675dfd731421de29f9f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove custom namespaceTomi Korpipaa2021-01-28292-592/+403
| | | | | | Fixes: QTBUG-90400 Change-Id: Ia2f1974a21112bad97724717d073d367c4413a7f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3d/Jani Heikkinen2021-01-281-2/+2
| | | | | Change-Id: I33bd7dd94073084c1f5cbc3075c9f8edec37f4c1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add QtDataVisualization to Qt6 CITomi Korpipaa2021-01-271-0/+12
| | | | | | Fixes: QTBUG-90428 Change-Id: I09d8093893d2a570db402801cccfbdaa32c1de10 Reviewed-by: Toni Saario <toni.saario@qt.io>
* Add CMake buildTuomo Pelkonen2021-01-2785-120/+2426
| | | | | | | Task-number: QTBUG-89299 Change-Id: I5becbf39605e566c3d32cb5e210d974df9de27da Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 22:29:59 +0000