diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-01 17:14:20 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-02 16:31:06 +0100 |
| commit | 76835d39323731af1b784ca3ca588d1d9e8a0086 (patch) | |
| tree | f5b443d692ded7ede89c80fa0e6804759aa5684b /src/webenginequick/api/qtwebengineglobal.cpp | |
| parent | cde72003881c6b5680ac8ac0fe6d6971bb43e0d5 (diff) | |
| parent | bbf2c566d2804a8ff73c5896e7b2db31c958f1c4 (diff) | |
| download | qtwebengine-76835d39323731af1b784ca3ca588d1d9e8a0086.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
Change-Id: Ibf03467e398f8dcdb5f950e1a70f3e4e591003db
Diffstat (limited to 'src/webenginequick/api/qtwebengineglobal.cpp')
0 files changed, 0 insertions, 0 deletions