diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-05 11:36:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-12-05 11:36:44 +0100 |
| commit | 32b6f5f41349d109f872caf42a44352744bd48e2 (patch) | |
| tree | 9367bfae6a0bd23c9fc79604e86a56072197f56e /tests/auto/client/shared_old/mockfullscreenshellv1.h | |
| parent | 789a2c79d04c477ea9a9ccd9d08a49f514693eec (diff) | |
| parent | fb0109c6acb8269d1fcdc20b7494c455ff2c74ad (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/compositor/compositor_api/qwaylandquickitem.cpp
Change-Id: I5e01a0731e880e3eb8eab349043756a5993e3050
Diffstat (limited to 'tests/auto/client/shared_old/mockfullscreenshellv1.h')
0 files changed, 0 insertions, 0 deletions