diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:27:39 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:27:39 +0100 |
| commit | 5e0fcd61994d0ac09e9e2655a9d5b97151e2e7af (patch) | |
| tree | 7a67cb5b1125f173db55407705ddf749eb732657 | |
| parent | 1966376a937ac4e4486c30e5a5946494d20446dc (diff) | |
| parent | cf41d84738f0ed0c779f75db94d413ad938fb901 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2
Conflicts:
.qmake.conf
Change-Id: I39d585f24bda2e68bc4d3bd0b3688a35f5923d53
0 files changed, 0 insertions, 0 deletions