summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.0Antti Kokko2019-11-261-0/+18
| | | | | Change-Id: I133417c323b961271be94ca5672c17295989a446 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9404bf15dd2321957603feb1a605f7b50724cbe3
| * Add changes file for Qt 5.13.2v5.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
* | Update plugins.qmltypes for 5.14v5.14.0-beta2v5.14.0-beta1Kai Koehne2019-09-301-1/+277
| | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: Ib264cb0294f02e2983cba0041a48ff87b7bc4f51 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-alpha1Qt Forward Merge Bot2019-09-172-0/+40
|\ \
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+40
|/| | | |/ | | | | Change-Id: I33d39a00a4628baeda098ce5e8665307617ad789
| * 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.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.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>
* | | | Merge "Merge dev into 5.14 (delayed final downmerge)"Kari Oikarinen2019-09-042-2/+2
|\ \ \ \
| * | | | Merge dev into 5.14 (delayed final downmerge)Kari Oikarinen2019-09-042-2/+2
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replicates the effects of the fast-forward merge that should have been pushed on 2019-08-27 as the final down-merge from dev to 5.14. Task-number: QTBUG-78019 Change-Id: I9e1685238ec1d8450c8d0a5e8894f4d38407dd54
| * | | | Replace the deprecated QWheelEvent::delta() -> QWheelEvent::angleDelta()Sona Kurazyan2019-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced the deprecated QWheelEvent::delta() with the vertical component of angle delta, assuming that it's acceptable to have a single-dimension mouse wheel in the example code. Task-number: QTBUG-76491 Change-Id: Ie05bb5934ce43976cd3cf009343d7b50ea327f14 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-08-241-1/+1
| |\ \ \ \
| | * | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-241-1/+1
| |/| | | | | | |/ / / | | | | | | | | | | Change-Id: I08c9b0b57ccefc161815833ccd63208d2768cb54
| * | | | Remove the usage of deprecated QWheelEvent::posSona Kurazyan2019-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-76491 Change-Id: I5831525f8ac4bf0cbec6a52a434b1d8c3b388b80 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | | | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-08-281-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-08-281-1/+1
|/| | | | | |/ / / | | | | | | | | Change-Id: Ibfe56eccd7435d995db91964e2352f19a4272d56
| * / / 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.13' into dev"Qt Forward Merge Bot2019-07-161-0/+1
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-161-0/+1
|/| | | | |/ / | | | | | | Change-Id: I9d75a47adea2d20db06f66ffa844275cbcf928d3
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 07:35:14 +0000