aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic305f3a787440ede5bafae447a36b2e5309b6ed2
| * | Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | | | | | Change-Id: Ie6430e1d4bb43842fc6e4c7e8d0c2ff0fefdd049
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-151-0/+20
|\| | | | | | | | | | | Change-Id: Id336e25d2784734713791dfa3c9d021e96132304
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
| |\ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I082cae93f544eba0d9715f2692d7a7126a2afb32
| | * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I33faf6450edbb6c0cfaf89bd052f7a5760a8cc77
| | | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-191-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + faab35b4f88c634510e56adcfa6f12f0fef548bb Bump version Change-Id: I3a87f22c8808024a9c6c4ead87806b70920a5f57 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | Change-Id: I30b6595d3e3c9c1b8a6c15fa3826f86f24ece528
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-081-0/+18
|\| | | | | | | | | | | Change-Id: I1ed83af458389618a3499f01f4323444ce6a633c
| * | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+18
| |\ \ | | | | | | | | | | | | Change-Id: I9d8a04fcac43b26645e90ecf558094fc425ff4c6
| | * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0Antti Kokko2018-11-071-0/+18
| |/ / | | | | | | | | | | | | Change-Id: I7619308282f325996ee3bd938cef81856d1968db Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | | Prevent crashes by fixing mapping of transport to wrapped objectsMilian Wolff2018-10-253-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an already-wrapped object was used by a secondary transport, the mapping was not updated. This could then lead to crashes when the transport was destroyed. [ChangeLog][General] Fix crash when wrapped objects are shared across multiple transports. Task-number: QTBUG-62388 Change-Id: I3c3b7302205e10f04695f1a202325704d90950d2 Reviewed-by: Kai Dohmen <psykai1993@googlemail.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Fix UBSAN warning when downcasting partially destroyed objectMilian Wolff2018-10-251-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the runtime warning cought by UBSAN: src/webchannel/qwebchannel.cpp:84:96: runtime error: downcast of address 0x6030001b1570 which does not point to an object of type 'QWebChannelAbst Change-Id: I9c78f94bc97961ef69b71ecca8a9301d81feaf3a Reviewed-by: Kai Dohmen <psykai1993@googlemail.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: If7467d4b9aac42d4b956af6bfb54898d0a6acf20
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-151-0/+24
|\| | | | | | | | | | | Change-Id: Ibd509b061b8192c6a18cf09e846b2eefe3cd3ddd
| * | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta4v5.12.0-beta3v5.12.0-beta2v5.12.0-beta1v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
| |\| | | | | | | | | | Change-Id: Ic078311c2a037e196f622e6afe59c4141b8f2ba8
| | * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I4cdf039eaf615b746f8086a68c99ff3f6bee29df
| | | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-09-031-0/+24
| | |/ | | | | | | | | | | | | Change-Id: I5a7c1ab1f3cff52a7ce585f853efe6f9553d3f31 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-011-0/+3
|\| | | | | | | | | | | Change-Id: I65d400d1038774826a9a905fa91ededf016df801
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-08-251-0/+3
|/| | | |/ | | | | Change-Id: I63fbfa55d77fcabbcda34eeff4d9a5a62bf9ba72
| * Add initial configure.jsonMichal Klocek2018-08-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | Add configure.json so qt configuration system knows about it. This is required to correctly configure dependency for webengine. Change-Id: I3547c190cdc54ec4a01984eed4dee4607f7be6a5 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I213b2bf2823e77af32bf31af72f20222d2b5a556
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: Iad611b0e9fd8899de297780bbaa09f206f03648f
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-233-0/+72
|\| | | | | | | Change-Id: Ic02f55731afd2a743821af5d0791f6fd7fa68e02
| * Merge "Merge remote-tracking branch 'origin/5.11.1' into 5.11" into ↵Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | refs/staging/5.11
| | * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I3f0fdb4defc9716771e8ef25803177ab9861f6be
| | | * Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-131-0/+24
| | |/ | | | | | | | | | | | | Change-Id: I63a17012f55985bc373f1039d817e676509cdff8 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * | Add changes file for Qt 5.9.6Antti Kokko2018-06-191-0/+24
| | | | | | | | | | | | | | | | | | | | | Change-Id: I6e9b54ddcc8db636ee78a980d78200b534db96db Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 56a155e68de96a80301ef8b9ad183fcb67e86142) Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * | Add changes file for Qt 5.9.5Antti Kokko2018-06-191-0/+24
| |/ | | | | | | | | | | Change-Id: I4920fa7583713fa131334f0021a18f8f06157a11 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> (cherry picked from commit 887564cc04bc2d1946862fd4fb37db7df2cf0abe)
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-121-0/+5987
|\| | | | | | | Change-Id: I0137306c2cccd7b748e553a83b1d1c2502ce2204
| * Add binary compatibility file for 5.11 for QtWebChannelMilla Pohjanheimo2018-06-051-0/+5987
| | | | | | | | | | | | | | File for bic test added Change-Id: I30402c0a82d1079443d0f2a09b67cd4142a046b4 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-040-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5c0e3a7ba0933c15d1338d8de452b5c9cb61ae1a
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: Id9a9f824975e28b421e5f18f6d298165ec866eeb
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-261-21/+9
|\| | | | | | | Change-Id: I4feece283bd40e002a62ddd2d8186d8bec9a16df
| * Use FDL license for all .qdoc filesKai Koehne2018-05-231-21/+9
| | | | | | | | | | Change-Id: I039e3a47ca2c3889c3272f81fafb3997777881f6 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-191-0/+9
|\| | | | | | | Change-Id: Ic6bc4e3c041985294d86cb9b2d9bf020310654a6
| * Doc: Add license details to index pageKai Koehne2018-05-141-0/+9
| | | | | | | | | | Change-Id: I7ef0f2d7c760fcb4016e925ae5cd94fc158b53a6 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+22
|\| | | | | | | Change-Id: Ib6f522afa333b1b87907b8d80bc33d320812682c
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
| |\ | | | | | | | | | Change-Id: Iadbf05c21d66e5d5adfc2cd3bfa5142e2d5dc451
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.0Antti Kokko2018-04-251-0/+22
| |/ | | | | | | | | Change-Id: I47501d2ca2535cf1d818c871e1e6a6bf9767e6f7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-05-011-8/+1
| | | | | | | | | | | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: Iffca1036a6dd2928d4eac89762e102f99ce7dd1a Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-271-0/+26
|\| | | | | | | Change-Id: Ica6ce58ad9f22f9c8b6cd33afc96426a9453a6e6
| * Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta4v5.11.0-beta3v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I019bf0ed47b87a02796c4e092817d0777f9a2ece
| | * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | | | | | Change-Id: I3d437b343b5307d9b0f01c4930de01b27b2e8e7f
| * | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
| |\ \ | | | | | | | | | | | | Change-Id: Iffc42e7d2f92dc4b0dfc4e523348e70940e412d8
| | * | Add changes file for Qt 5.10.1v5.10.1Antti Kokko2018-02-061-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4cb3f0446b2c0a398ef5a0a1d0b5e62d0016cbe4 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | | | Bump versionOswald Buddenhagen2018-02-191-1/+1
|/ / / | | | | | | | | | Change-Id: Iea8e5c9ae7387d091b44b1e8535d12b404fddb03
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-205-4/+6080
|\| | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/webchannel/tst_webchannel.h Change-Id: I454c1bbab153405541e7fc41d1389a810b94f2db
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-184-4/+98
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id5d79a1cd456c79ef35a323d1a8713facde2ef91
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-3/+3
| | |\ | | | | | | | | | | | | Change-Id: Ib5e52f5be22b5a6430c4dfe731b0a0fe74ba0617
| | | * Clean up TestWebChannel::testAsyncObjectv5.9.4Sami Nurmenniemi2018-01-091-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-63152 Change-Id: I22df2328f0ab6d2a2d12458dbeaec68bfbe36985 (cherry picked from commit 5a9dd81f260f320b5af108c1a6b3d0b82a04f15d) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 16:23:31 +0000