diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:35:31 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:35:31 +0100 |
| commit | 3c91ce46a69449a0350b63a17c79cd69090ffcc0 (patch) | |
| tree | 58a398d77feb85b4a0eca8b7d7dd424a048cde17 | |
| parent | c18e8ca6a845d1af708bf9b56876fbf34003ca68 (diff) | |
| parent | e936e2bf84104668331d7f45d78d22ba190d6fba (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I4ca9b97e1ecc09176d8050284a9c085a37ddd839
0 files changed, 0 insertions, 0 deletions