diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-22 11:52:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-22 13:01:10 +0100 |
| commit | 1046abd729e36c07dccff313536aa0cbb104e097 (patch) | |
| tree | 728a000c96898a643f9140e4430489ca18c58eca /tests/auto | |
| parent | 4c5bd43353706287865736afeed8e74cff9b458d (diff) | |
| parent | 5f645af22bb63f0d215294535cf683029ed7aab5 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
src/3rdparty/protocol/qt_attribution.json
src/client/qwaylandintegration.cpp
Change-Id: I475889f2817c7094b68a2948fdd34ddf8b0c486f
Diffstat (limited to 'tests/auto')
0 files changed, 0 insertions, 0 deletions