diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-10-31 11:14:47 +0100 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-10-31 11:15:47 +0100 |
| commit | d4ac2c9915fed87193cd2cf7ac438a9fa8edc126 (patch) | |
| tree | 7b2bf83f9de1de3aaeb683b8d9e6b4106a611152 /tests/auto/client/surface/tst_surface.cpp | |
| parent | b148226e21c5e701faa615dcd24b23c9c9b29be8 (diff) | |
| parent | 37cb6f0f35030420c7d37a126f817cac73aeed97 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
.qmake.conf
Change-Id: If2159587c5183fcf57558f045bd9af2f25c8289f
Diffstat (limited to 'tests/auto/client/surface/tst_surface.cpp')
0 files changed, 0 insertions, 0 deletions