diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:34:46 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:34:46 +0100 |
| commit | b30052fa41f6332f20ec440dcdbcd06b41a954f5 (patch) | |
| tree | 72659353e8d38bdb57c98662e16abaf63a912288 | |
| parent | 8de0ce0b5cf6a00a8afc3b047640ef1a5c841d57 (diff) | |
| parent | 553b62badf129ab36c1beee844a9b39492479e34 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta3v5.15.0-beta2v5.15.0-beta1v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I1deed2698132ead4d8553558dd3614e8e063afd3
0 files changed, 0 insertions, 0 deletions