summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-01-282-1/+21
|\ | | | | | | Change-Id: Ie1823c477a005d44d7b12d1e6d9228d89b619298
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: I366104c6fc4c8097326241662592e53da6251a3a
| | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-101-0/+20
| | | | | | | | | | | | | | | | | | | | | + 86efcb0bea7a9df8aa8be2c836e1a2f7da25fd3a Bump version Change-Id: I67a2381681fdc5378235510a60038df3789b6355 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Doc: Fix typo in qdoc commandPaul Wicking2020-01-271-1/+1
| |/ | | | | | | | | | | | | Fixes: QTBUG-81676 Change-Id: Ibe7f73e1fc529411ca92d7bdbb2ad8824cb97a62 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | abstractdeclarative.cpp: Fix deprecation warningsFriedemann Kleint2020-01-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | Use QHash::contains() instead of checking for presence via value(), fixing: abstractdeclarative.cpp:681:48: warning: 'QList<ValueType> QHash<K, V>::values(const Key&) const [with Key = QQuickWindow*; T = bool]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations] abstractdeclarative.cpp:694:45: warning: 'QList<ValueType> QHash<K, V>::values(const Key&) const [with Key = QQuickWindow*; T = bool]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations] Change-Id: Ic858949514a647f62e74bff6ece346851dce413b Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If5cf8cef472f062899993c6bd69018df1953c5bb
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: I1b5fa87d115b2e3f74392d373841a6349bd0ce69
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+18
|\ \ | |/ | | | | Change-Id: If81fffe1cbdb10b14fc762fdb9c6634680ba75b5
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| |\ | | | | | | | | | Change-Id: Ie62ba04e425b7ebf5cfe48f0addac351788f23e6
| | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Antti Kokko2019-11-261-0/+18
| |/ | | | | | | | | Change-Id: I133417c323b961271be94ca5672c17295989a446 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-262-15/+8
| | | | | | | | | | | | | | It is being deprecated. Change-Id: I38e6bc29ac03108f56f445069b2dbbe8a3db201a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
|\ \ | |/ | | | | Change-Id: Ib7ba82cc6f1a30e8f026cea8da5b36d8201db7de
| * 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.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 remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-011-1/+277
|\ \ \ | |/ / | | | | | | Change-Id: Ib04f91529d95b1268bfd470fa88e00dce866121a
| * | 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.14' into 5.15"Qt Forward Merge Bot2019-09-212-0/+40
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-212-0/+40
| |\ \ \ |/ / / / | | _ / | | / Change-Id: I65642f3568bcb7873893beb85cb88a7f07a2eed7
| * | 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.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>
| * | | | 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
| * | | | | 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
* | | | | | Bump versionKari Oikarinen2019-08-271-1/+1
| |_|/ / / |/| | | | | | | | | | | | | | Change-Id: Icf111f789a66ec18b56d4e142d6fa8ac5d233545
* | | | | 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
| * | | | 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>
* | | | 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 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
|\ \ \