diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-19 17:48:22 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-19 17:48:22 +0200 |
| commit | 85e7fa7f9a002e7c0708af7a99d165a23753ecf4 (patch) | |
| tree | c6c1ab0973a595e26f3f29f9b88a5602ed1138d9 /src/process/CMakeLists.txt | |
| parent | b2e11595e167fd51095720af286eb21447f80d20 (diff) | |
| parent | 8f7e7cfb75f821c802ed4189530f675608507ba8 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/core/render_widget_host_view_qt.cpp
Change-Id: I86113b13bb2d8419e9e9a485197f02b2c7399cd4
Diffstat (limited to 'src/process/CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions