summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.13.2v5.13.25.13.25.13Antti Kokko2019-10-151-0/+20
| | | | | | | | + b0114f0dcba2d1709aac47530febc51e5078593e Fix GCC 4.8 build of abstract3drenderer + 3858190b2b2e71a7b63e9976da2b22f1c342e3b3 Add changes file for Qt 5.12.5 Change-Id: I9f7ee8e553b55d87a4695f71af7411aa1bcbfaef Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | Change-Id: I01244127c6025b18b32ce40648f4d1de4a5fc0ff
* Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+20
|\
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| |\ |/ / | | | | Change-Id: Ia2b7db2f249f6606629a2df3a242176f97559417
| * 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.55.12.5Antti Kokko2019-08-231-0/+20
| |/ | | | | | | | | | | | | + 54a0844f5c9c8ec54fcd740b8b99b05fe4532818 Bump version Change-Id: I7ae9ff4d484931d90fe4d7fc5c7998dd71e69dab Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
|\ \
| * \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| |\ \ |/ / / | | | | | | Change-Id: I337c17410cc8f3d69a3817c052c14cb284824317
| * | Add changes file for Qt 5.13.1v5.13.15.13.1Antti Kokko2019-07-301-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 18c303dc1ed3e8cd8577e93c5223417e320e068d Bump version + 41d93443ab264b4a0869290929e2de84b4a3c494 Add changes file for Qt 5.12.4 + 10fbcc8ea7a2a7c2d3f72738413f3a67a7a486ad Bump version + 54a0844f5c9c8ec54fcd740b8b99b05fe4532818 Bump version + 66d9e04f79e72e6f58c33eadebb1e40c039c14d6 Doc: Replace example file lists with links to code.qt.io Change-Id: Ifc82b0acb8e100fc3c1a7bb3723560a3725dffd9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Fix GCC 4.8 build of abstract3drendererVille Voutilainen2019-08-221-1/+1
|/ / | | | | | | | | | | Task-number: QTBUG-77730 Change-Id: I827d727b103a9923a8b82163bfa4f77c81c0906b Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
|\ \
| * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic14bf6bb18c30b3c2759d40dd7b4ec86fb0670e4
| | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: Ibed2beed70164d5e491115e2e174a924614ae9b2
* | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
|/ / | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I8cefab01c450ad5b52ba57ba161ee9065e00a6b1 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | Change-Id: I7f315cb2cb3668e8c6831c06980308625b548a5a
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-281-0/+20
|\ \
| * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-0/+20
| |\ \ |/ / / | | _ | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic8bbec1126304d50e0498581812a8ef05f9e4331
| * 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.45.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 "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+18
|\ \
| * \ Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+18
| |\ \ |/ / / | | | | | | Change-Id: If2a1b23c9fad339c0255015ca7534bfbd092461d
| * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.05.13.0Antti Kokko2019-05-081-0/+18
|/ / | | | | | | | | Change-Id: Ib20ec99073e189c259a8b89bde025ba7ad59d925 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | 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.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.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
* | 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.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.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>
* | 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>
* | 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