diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-10-22 11:21:46 +0200 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2018-10-22 11:26:22 +0200 |
| commit | b84324ece095ad1f5a16326c49bdf1428ff5f866 (patch) | |
| tree | 9a28dba3724d2ee8c5a6a9f5ac69ea6c9a82da18 /src/core/api/qwebengineurlschemehandler.cpp | |
| parent | 17bd9d9de2d424ef7f7a193e17d1619d6effec7b (diff) | |
| parent | f65c5fc155c9f6c3f880389a57b7652614627654 (diff) | |
| download | qtwebengine-b84324ece095ad1f5a16326c49bdf1428ff5f866.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/core/net/network_delegate_qt.cpp
Changed to src/3rdparty:
156c2b70 Disable "some invariants violation checks" for Qt
52bf8b45 Support non-base::Thread GPU thread
ba4a51bc [Backport] Speculative fix for mac DCHECK failure
508fda09 Add support for static-libraries to our GN integration
Change-Id: If0205ce032ce86b5759b321b6d907b0431b6a978
Diffstat (limited to 'src/core/api/qwebengineurlschemehandler.cpp')
0 files changed, 0 insertions, 0 deletions