diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:29:51 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:29:51 +0100 |
| commit | b07a7d79f3080892d381c40ec79679450bda5431 (patch) | |
| tree | 316f69a3e3e557602f195e41284fb35bf264c8b6 /tests | |
| parent | 1057d6a89ab4c19825ab2d5d12aed31496b89423 (diff) | |
| parent | c296df781d9fa445bb4b1fcbb6f340e0d1db0c3a (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ie0a7534d518cd5758119edc77d8275ac3da2037c
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions