summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-308-60/+48
|\ | | | | | | Change-Id: Ie398d7814f964598d57fba37744dedf78951c773
| * Fix hanging at application exitTomi Korpipaa2019-04-298-60/+48
| | | | | | | | | | | | | | Task-number: QTBUG-75256 Task-number: QTBUG-69627 Change-Id: If4221c8fcf783daf4bf6a38dbf1b9633a20eafb0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-231-0/+20
|\ \ | |/ | | | | Change-Id: I9dbaad5ff455dbb528d8dce554acce4aa0e29aee
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-201-0/+20
| |\ | | | | | | | | | Change-Id: Iec16a39fd968a92a5fec79b5873d20dedda11f49
| | * 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.35.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>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-020-0/+0
|\ \ \ | |/ / | | | | | | Change-Id: I36d78c6f13de1250d0ed8954eb8cc98d57dc21e9
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2Qt Forward Merge Bot2019-03-270-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I74c21ff111662ab85eae42aa50e0b6a724413898
| | * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | | | | | Change-Id: If78a0a1ebcc94328ee78d4ae8c4141b3d2f544b9
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-261-2/+2
|\ \ \ | |/ / | | | | | | Change-Id: I9f5c405501f18661aebe43856ee919fe2a62916a
| * | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-211-2/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-73739 Change-Id: Id8a0509b9f4c397c4c1897e47c1915959477cd2c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-195-3/+27
|\ \ \ | |/ / | | | | | | Change-Id: I73831adaf7bcbc59c55302af39cf510fffd0e8b6
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
| |\ \ | | |/ | | | | | | Change-Id: Iaa73229bf77144f2698be0c0536f3c771510c464
| | * 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.25.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>
| * | | Fix QML import versionTomi Korpipaa2019-03-144-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-74032 Change-Id: I1fca2212a2013fe18388e5e1e20e75847ee6be8b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-251-0/+1
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Id7b55ddeb86b6f51e5d46f3172715fd3de21e4d5
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-02-251-0/+1
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I32360af290132f0341e126bb2578d1f220133b28
| | * | 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>
* | | Bump versionKari Oikarinen2019-02-251-1/+1
| | | | | | | | | | | | Change-Id: Ib624e5ff3c1ca12dc609fab1619bf7a3ade53e7b
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-121-2/+2
|\ \ \ | |/ / | | | | | | Change-Id: I8cf35c280a3b0406376302f637604655348b9764
| * | Fix deprecation warningsFriedemann Kleint2019-02-113-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | utils/utils.cpp:87:43: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] utils/utils.cpp:139:58: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] engine/axisrendercache.cpp:204:50: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] volumetrictest.cpp:384:32: warning: ‘int QImage::byteCount() const’ is deprecated: Use sizeInBytes [-Wdeprecated-declarations] volumetrictest.cpp:538:32: warning: ‘int QImage::byteCount() const’ is deprecated: Use sizeInBytes [-Wdeprecated-declarations] Change-Id: I59d0ce39584b11ec239cbdadf067c30cf37ca05a Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Fix QFont-related deprecation warningsFriedemann Kleint2019-02-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace QFontMetrics::width() by horizontalAdvance(), fixing: utils/utils.cpp:87:43: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations] ^~~~~ utils/utils.cpp:139:58: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations] engine/axisrendercache.cpp:204:50: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations] Change-Id: I8cfc466cee55b14060feae9b16a087c1db92cf90 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-052-1/+21
|\ \ \ | |/ / | | | | | | Change-Id: I6895de9641551d9ddeee7058cc8894f56f9c2d99
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-022-1/+21
| |\ \ |/ / / | | _ | | Change-Id: Ic663469af239791f81397bcffad3ca29fa0e6693
| * 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.15.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>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2005685b95ca394f2f819516c3228e1a1cee1daa
| * | Bump versionKari Oikarinen2019-01-141-1/+1
| |/ | | | | | | Change-Id: Ied738fe9533a170cedebaff9980968d48d61a7bf
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0d60e376037397944bc541b25d75ac52e221df62
| * Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: I30b28d165091100fd512180fe1ec3196bcf4096f
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-151-0/+20
|\ \ | |/ | | | | Change-Id: Iaa900913ecd0166d9f921a09f2d4a573a853962d
| * 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' into devQt Forward Merge Bot2018-12-081-0/+18
|\ \ \ | |/ / | | | | | | Change-Id: Ie484046d4d632b09d2c89a2cd29690d6b20f40a0
| * | 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.12' into devQt Forward Merge Bot2018-11-170-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ia9b0bdbb81409e111559dd800346c90cebc0d11a
| * | | 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
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-272-14/+21
|\ \ \ | |/ / | | | | | | Change-Id: I6d456c497dd29371337c5ffdf03e09919d73426d
| * | 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>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: I04a1cede38f26e8069af40b39a75e7d6122f359d
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-061-0/+1
|\ \ \ | |/ / | | | | | | Change-Id: Ide3baa0f89b9e43b2905f283077cf8fe018661cc
| * | 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>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-292-433/+4
|\ \ \ | |/ / | | | | | | Change-Id: I31571b10bce830e17416ea09af246f8f40dfd9f4
| * | 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>