diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:33:05 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:33:05 +0100 |
| commit | 635ad60e8ead34fc8b0a4bc32ed73618ed041732 (patch) | |
| tree | bb80d626c3f5f1f35a6acd41c3a2271b2a231bbb | |
| parent | 767947bd8633d301ca3183b49f8096e30c30d180 (diff) | |
| parent | db6cd4110594abe09079ed4106d8fd30a848efa4 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I947e4657fb07b0ada7007b69e265c56de1f0185d
0 files changed, 0 insertions, 0 deletions