summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.12.7v5.12.7Antti Kokko2020-01-181-0/+20
| | | | | | | | + 396f2cfbe098f5ce7935c8685971733dfb0fec73 Bump version + 0ed29384c2f8307b21fa6ef27f65e56ae1ad8f93 Fix black screen when deleting a window container Change-Id: Ieeb5ec4b4b3cbbdc770551c9def40adc58e492cc Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Merge remote-tracking branch 'origin/5.12.6' into 5.12Qt Forward Merge Bot2020-01-071-0/+20
|\ | | | | | | Change-Id: I5cdd5bef73bb38e5ac1b85ac4f017cf08db15eb7
| * Add changes file for Qt 5.12.6v5.12.6Antti Kokko2019-11-051-0/+20
| | | | | | | | | | | | | | + 9845640ac5814af122d608d26b0261d8b5b63d3b Bump version Change-Id: Ic48772c7bac4a992cb1dedced24414e4d0582739 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Fix black screen when deleting a window containerTomi Korpipaa2019-12-021-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | When deleting a window container with Q3DBars, or any other visualization type, we ended up with black screen. By calling deleteLater instead of immediate delete for the renderer we can avoid this. Fixes: QTBUG-80168 Change-Id: I6fd5aee5cd26ed1d96aa85b7877160e8996e093a Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Bump versionFrederik Gladhorn2019-11-071-1/+1
|/
* Bump versionFrederik Gladhorn2019-10-301-1/+1
|
* Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
|\
| * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
|/| | | | | | | Change-Id: I7c34d832f81f7f96ea7d3fe56a25722a3a161d4a
| * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-231-0/+20
|/ | | | | | | + 54a0844f5c9c8ec54fcd740b8b99b05fe4532818 Bump version Change-Id: I7ae9ff4d484931d90fe4d7fc5c7998dd71e69dab Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | Change-Id: Ibed2beed70164d5e491115e2e174a924614ae9b2
* Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
|\
| * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
|/| | | | | | | Change-Id: I345903427ae721e51ad01c77ffe721411be6c0e4
| * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | Change-Id: I4024892784b6c6258297c984c047d13835ea68da Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Bump versionFrederik Gladhorn2019-05-231-1/+1
|/ | | | Change-Id: If1e0c3b6cb1e24dd3540a0744d29f889d5b39c77
* Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
|\ | | | | | | Change-Id: Iffe3e3da5b41775340fcaf6186bf859ab934c7d7
| * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-031-0/+20
|/ | | | | | | | + e91e0d04e214a372bf0c26b6f2edda1d7c47c552 Register revision 1 of Q3DScene + c71ab9ebe8cad26169466a7bfd0c7a239d43ea3c Bump version Change-Id: I13d2e90c9d090dc3cb5a85cc63f29a94bbf91b09 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Bump versionKari Oikarinen2019-03-211-1/+1
| | | | Change-Id: If78a0a1ebcc94328ee78d4ae8c4141b3d2f544b9
* Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
|\ | | | | | | Change-Id: Icc331f527da6339f447ad7f7a847a93713418310
| * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-211-0/+20
| | | | | | | | | | | | | | | | + a0e8ef6caf838267811308b668fa76357a1932aa Bump version + 96b5237dcd18a0b6f7e34afdde1988797a2d8c5e Fix mesa check Change-Id: I2aee86066916efe8ab028808b517f778b71cb0d0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Register revision 1 of Q3DSceneUlf Hermann2019-02-251-0/+1
|/ | | | | | | | | | Without this, properties of Q3DScene added after revision 0 stay unknown to the QML engine. Fixes: QTBUG-74016 Change-Id: I7bec39b5984dce6d5724287a79f23cb1cc86d378 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+20
|\ | | | | | | Change-Id: I4d769b4a76b43c84a774fa4d8b062848d725ddd8
| * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-091-0/+20
| | | | | | | | | | | | | | | | | | + 7b091d13ed5509a73da921a7ed30034a7eb55131 Bump version + a04bbfd93159963aa505f96425e85a2a83b0b10a Add changes file for Qt 5.11.3 + 9ab15db10215cef84a58a57411f1d27f83aa4b66 Bump version Change-Id: I0b782701187ade64db8d986771b4c858943d6dc1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Fix mesa checkJoni Poikelin2019-01-221-1/+1
| | | | | | | | | | | | | | | | VMware virtual machines have "OpenGL ES 3.0 Mesa x.x.x" as the version string. Change-Id: I5c23524a021732e84b78090de2913b4d974e9f34 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Bump versionKari Oikarinen2019-01-141-1/+1
|/ | | | Change-Id: Ied738fe9533a170cedebaff9980968d48d61a7bf
* Bump versionKari Oikarinen2019-01-071-1/+1
| | | | Change-Id: I30b28d165091100fd512180fe1ec3196bcf4096f
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
|\ | | | | | | Change-Id: Iae4ef1680a7ae0f35da4da9e1d941fcd257babcd
| * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| |\ | | | | | | | | | Change-Id: I93ebbaae4e91ebb8b0c3dd2361866e72111a6c54
| | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-191-0/+20
| |/ | | | | | | | | | | | | | | + 191ef6d87362a5285d34ece4c48655408b2daa12 Do show module license on all help pages + 7b091d13ed5509a73da921a7ed30034a7eb55131 Bump version Change-Id: I93bc890a6158e3378a38ffc72a7f7a2ee9d8770d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+18
|\ \ | | | | | | | | | Change-Id: I9e3d9a7357be0050ea1f4a7b3c8a349b50ea117a
| * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0-beta4v5.12.0Antti Kokko2018-10-311-0/+18
| | | | | | | | | | | | | | | Change-Id: I0a929367bfcb7495e80260ac46120cf25f547c83 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: .qmake.conf Change-Id: I88de56f107b431f786e2561d265d476ee8899fb7
| * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | Change-Id: I361758adeb173a8c2f6f15057d9db548015bb382
* | Doc: Fix \code command usageTopi Reinio2018-10-252-14/+21
| | | | | | | | | | | | | | | | | | Since Qt 5.12, \code command accepts parameters, and in-line usage no longer works (and was never documented to work). Task-number: QTBUG-70980 Change-Id: I010ba21c2a20f70bfdacd7bb0c1aea3836c8efca Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3v5.12.0-beta2Qt Forward Merge Bot2018-09-291-0/+1
|\| | | | | | | Change-Id: I600f4d6094d1934b082ed506f3cde75f13b41cfc
| * Do show module license on all help pagesKai Koehne2018-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt Data Visualization has a different main license than most other Qt modules, which is easy to miss. We do show the license on the module landing page and in the 'All modules' overview page, but if you directly open an example or a class page you can still miss this. This change adds the main license description to the header shared by all pages of the module; we (mis)use the buildversion variable for that, which was so far unused. Right now qdoc does not 'linkify' the entry. It could add a generic link to the landing page though, where the license is also described. Task-number: QTBUG-70354 Change-Id: Ic4917541a6480d1cb3879f87e6aac0093dd1f3b3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Update plugins.qmltypesv5.12.0-beta1Kai Koehne2018-09-272-433/+4
| | | | | | | | | | | | | | Task-number: QTBUG-70264 Change-Id: I2742e2c61e0fe6a2566a11d721f0cbd0135c7a00 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
|\| | | | | | | Change-Id: Ic54b1a747b4cab6b293aa9933bff2c6b6dc3d037
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: I345d0637c46a80d6bd2054eef7107b8909026bca
| | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-291-0/+24
| |/ | | | | | | | | Change-Id: Iebebaf25141b2bf50352eb2455500ae1f18ec499 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5a834dd3b204deef8b09a926bb496a4d376f1782
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: Id4a42078d6aab155a599200af01629ab59969675
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-233-2/+26
|\| | | | | | | Change-Id: I22c00453350070d69e03d1d4cf426a86fbcf0c9c
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | Change-Id: Ic1f178389975b730da51ff317ed0ef64348c0483
| | * Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-111-0/+24
| | | | | | | | | | | | | | | Change-Id: Ib5df75f2d80dd7ad6e5848295b3557b23c398648 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * | Doc: Add missing dots (qtdatavis3d)Paul Wicking2018-06-192-2/+2
| |/ | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: I4947e5906049cadcd2aefd7dfb7aee25fea7a778 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-0433-352/+312
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I135ec58950ba88e041d19561353e0946f4a51497
| * Add changes file for Qt 5.9.5Antti Kokko2018-06-041-0/+24
| | | | | | | | | | | | Change-Id: I85cb2874e7896f2f84e20eccc16a7ad457ce35ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit f95fc1d0592502285613729816632710c4a265ee)
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: Ic672091dd6628af4e0abb3702e27ac8cd22b7115
| * Use FDL license for all .qdoc filesKai Koehne2018-05-3032-352/+288
| | | | | | | | | | Change-Id: I732a95d5adbd7579b05e8cb2b1afd586d5b5bc58 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-122-6/+6
|\| | | | | | | Change-Id: I06c078868b98c6210bac5ad450122a191eeedef5