diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:35 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:35 +0100 |
| commit | 94640eb27c054baffddf44fcaebf26f800a6415e (patch) | |
| tree | bb758caea0a341d17502fa97d4c0108af1a1d1d7 | |
| parent | 8b881885c10d60c636fd777d973e60a75ab9a802 (diff) | |
| parent | c4ac0d51133be25aace898b357a6744094d20125 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Ie5d125f89a911bbd1d98daa24b430028d956e9b6
0 files changed, 0 insertions, 0 deletions