diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:30:35 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:30:35 +0100 |
| commit | 6581f5911eb1dec25fa4870aae8e70a58b6e8dfd (patch) | |
| tree | ab047eb79b25d183d163785d64e39ccf75f2a0a3 | |
| parent | 133fe95450beaba4be3db584752d80adc37d5fff (diff) | |
| parent | 554ac4551c154f39de2917877b189b74e4464d3b (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2
Conflicts:
.qmake.conf
Change-Id: I09029f460af99bd0d95ddc33006ea75d4006ef19
0 files changed, 0 insertions, 0 deletions