diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-31 01:00:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-31 01:00:13 +0200 |
| commit | ffb2c2ac6c3ba40acbe13a39899a72049585b427 (patch) | |
| tree | dbee14e6d1641e02ea1fd5fc67ce001ab12776ef /src/gui/image/qimage_conversions.cpp | |
| parent | 6d0044f1dcffebc29dccd9d37d90f8abdb941a88 (diff) | |
| parent | dbdd5f0ffbce52c8b789ed09f1aa3f1da6c02e23 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I33b47095efdfe0ba698c6a88ca41ec911f432208
Diffstat (limited to 'src/gui/image/qimage_conversions.cpp')
0 files changed, 0 insertions, 0 deletions