diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-02 11:09:26 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-02 11:09:26 +0100 |
| commit | f51f50c22e770e1ab20ecccc8a32906e4014caed (patch) | |
| tree | f1d561ef493a16a4eca9b65b097070b4bf48e939 /src/webengine/render_widget_host_view_qt_delegate_quick.cpp | |
| parent | c236dd2ac1ac047fa09f6606f4136a275d132d6d (diff) | |
| parent | 8618813a60e4f15a104ce5127c01810a35440c30 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
.qmake.conf
tests/auto/quick/dialogs/tst_dialogs.cpp
Change-Id: I6840495a40e4e1e4512573c980816112ae5786d7
Diffstat (limited to 'src/webengine/render_widget_host_view_qt_delegate_quick.cpp')
0 files changed, 0 insertions, 0 deletions