diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-01 11:59:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-01 11:59:36 +0200 |
| commit | 87662fd1b71db11f0759e0be03d8a288ee11b775 (patch) | |
| tree | 7e9659b6e581205c798844388cffcec88ecaa112 /config.tests | |
| parent | e8b01250fdbef269379df8c2481c9482317e8220 (diff) | |
| parent | 777cd6e9b10c83f5826fde67ad00a85c978218c0 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/quick/items/qquickevents_p_p.h
Change-Id: I8c699aeb46903e2ea80a97a346cb5af460859a98
Diffstat (limited to 'config.tests')
0 files changed, 0 insertions, 0 deletions