diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:10:58 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:10:58 +0200 |
| commit | 97969a14118b31ceb6a1403da2e133c4bf4e4780 (patch) | |
| tree | dd73bdaa1b3698b92e7e0a865d2ffbe51c2eaec5 /tests/auto | |
| parent | 29551acf341b8bcd590ec5e9a36e60c7a1fb3131 (diff) | |
| parent | 5eb14618525fa0744b78bcc17252155a3cd657b1 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I17c20c420679fed8898e49c94dea3d34c92ff31a
Diffstat (limited to 'tests/auto')
0 files changed, 0 insertions, 0 deletions