diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-11 10:18:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-11 10:18:08 +0100 |
| commit | 9eea19123b002bc817e103ac3b3f80bdbd87a026 (patch) | |
| tree | 960e4d7bab7e913eed833bd36b929471c73ed819 /tests | |
| parent | 86f09add213e5067602f4bdf0cf659d693f03918 (diff) | |
| parent | 4003f44bbe0704aa82c92d1afe287dfdcf00d437 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: I89330c51bc38b8ad5d32a0aec3fbd645ceab8b5b
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions