diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-19 12:08:56 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-23 13:52:46 +0200 |
| commit | c18c51acf8d0eb9426ce998d6e09f20a4a481c40 (patch) | |
| tree | 3f314634c361f6ccb4e43d596370167003ec210a /qtwebengine.pro | |
| parent | f43d9dc448f0fd2073f44ea696205969ffd0d9c8 (diff) | |
| parent | 662de14ceecee701b31478849ae147c70f3fe00f (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/core/config/common.pri
src/core/configure.json
src/core/net/url_request_qrc_job_qt.cpp
src/core/ozone/surface_factory_qt.cpp
src/core/web_contents_adapter.cpp
Change-Id: If679aa179123f793639da3d8ee4ab5d116707754
Diffstat (limited to 'qtwebengine.pro')
0 files changed, 0 insertions, 0 deletions