diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:31:11 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:31:11 +0100 |
| commit | c6e1dd505f3084ba0a6e9ea023f15be527efceed (patch) | |
| tree | 0ca811486cb394028625c30858b0416022203a1b | |
| parent | 4a86aa5243c7f0bde37fe6094ecb4bc7a9da1721 (diff) | |
| parent | a0e8ef6caf838267811308b668fa76357a1932aa (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I2005685b95ca394f2f819516c3228e1a1cee1daa
0 files changed, 0 insertions, 0 deletions