summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-110-0/+0
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-110-0/+0
|/| | | | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I48d89401b174483be79f903a63a99bbe016ec2a2
| * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: I7f315cb2cb3668e8c6831c06980308625b548a5a
* | | Mark the module free of Java-style iterators and of QLinkedListMarc Mutz2019-07-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java-style iterators are going to be deprecated, or at the very least banned from use in Qt code. Ditto QLinkedList. Unfortunately, the module contains more than 100 uses of Q_FOREACH, even though, according to my sources, its use was banned in Qt implementation from the get-go. So QT_NO_FOREACH is currently not an option. Change-Id: Ib34d7634f59ba5395cfb2b4b3afbfe0b62f52a73 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-291-0/+20
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-291-0/+20
|/| | | | |/ / | | | | | | Change-Id: Ie0499243ee2ff168d435672c31d844772b6b8b25
| * | 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.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' into dev"Qt Forward Merge Bot2019-06-221-0/+18
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-221-0/+18
|/| | | | |/ / | | | | | | Change-Id: I371597630015889280973f6c303e6996c98c918f
| * | 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.0Antti Kokko2019-05-081-0/+18
| |/ / | | | | | | | | | | | | Change-Id: Ib20ec99073e189c259a8b89bde025ba7ad59d925 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Convert uses of QTime as a timer to QElapsedTimerEdward Welbourne2019-06-122-5/+5
| | | | | | | | | | | | | | | Change-Id: I6050b5269304ac6941d3a9d057c91d439f46b63c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Fix deprecation warnings about QString::sprintf()Friedemann Kleint2019-05-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings: utils/utils.cpp:268:55: warning: ‘QString& QString::sprintf(const char*, ...)’ is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations] utils/utils.cpp:270:56: warning: ‘QString& QString::sprintf(const char*, ...)’ is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations] utils/utils.cpp:272:47: warning: ‘QString& QString::sprintf(const char*, ...)’ is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations] Change-Id: I27628b7a3d7daa75399ef4952efe373a65d8974e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | 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.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.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.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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 18:45:44 +0000