diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:28:37 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:28:37 +0100 |
| commit | 12c4da762bd29399767538ca716189908e41cc5a (patch) | |
| tree | f86fd9046d912c0a3155df46e3d996e3934ebf7f | |
| parent | 3402a9fd2a98b2fa1c067b6560cb0adef507f796 (diff) | |
| parent | 634f8e549291b96434941b1dc29d665fdf29f980 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2
Conflicts:
.qmake.conf
Change-Id: I9159152ff7dc944aa6dbb8c8c81abf1b936be33a
0 files changed, 0 insertions, 0 deletions