diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:33:14 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:33:14 +0100 |
| commit | 3de65bf9daf1d0e61300cdfe44d3eca51636d438 (patch) | |
| tree | cdbf5c9b46f81ba90f78dccf0e8b55f5a69e2aae | |
| parent | cf1fbfea745c510986776965e7f3ffe7c9d65018 (diff) | |
| parent | ebf92b96ee6808f67e62449dc65b3757bf41d9d4 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I83b257c673d76aa38c79310a485c7c0a93bf5842
0 files changed, 0 insertions, 0 deletions