diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:17:34 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:17:34 +0100 |
| commit | 212ee5bc24c3e9de63d7e6a615f1a3a47eae0fc3 (patch) | |
| tree | 6d1286c01c4bb7789e08d790e1a6aa42f8ec71a0 | |
| parent | f4adcfac78fe70bb719fc7968ee14dab308abafd (diff) | |
| parent | 7fa87e18e3a1b518ef6b53bd264b7d121a89bbe7 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: I8894958cc13c613ccd958f4d90e407e9e7135c5b
0 files changed, 0 insertions, 0 deletions