diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:03:28 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:22:41 +0200 |
| commit | d7bcc509cd3c510af9967ab81fb57be9486f9a12 (patch) | |
| tree | ec445da67f3ceed59236cb1cb4536096e91c8a35 | |
| parent | 0ee7134d24bccb965a134dd1f4267a0bfda3de61 (diff) | |
| parent | 4e156bb26fb904663b0e13df1802dc2e0788b114 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I212c99525128943f17361665d7d9149346f9ffee
0 files changed, 0 insertions, 0 deletions