diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:34:18 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:34:18 +0100 |
| commit | 8b881885c10d60c636fd777d973e60a75ab9a802 (patch) | |
| tree | bb758caea0a341d17502fa97d4c0108af1a1d1d7 | |
| parent | 6c17b6a43e9340121f97e77f4958b1b5790bc80e (diff) | |
| parent | c6d51bdf097c133955a247c9ebc600c5bc6cff58 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I66da02a5c2184928aa38fa34464c2b0a73de199e
0 files changed, 0 insertions, 0 deletions