diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-25 14:39:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-25 14:41:29 +0100 |
| commit | bce25a6340309938e06222663c2c7758bafab6e2 (patch) | |
| tree | 1d36c82ff345a54abc23ea24904712650fd7cc86 /LICENSE.LGPLv21 | |
| parent | 8a2f5445231fc871a9fd88dec5569deb3104983d (diff) | |
| parent | 50aeedd86ce0244fbb77ebefdce8da72db881e45 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/gui/painting/qcoregraphics.mm
src/gui/painting/qcoregraphics_p.h
src/plugins/platforms/cocoa/qcocoahelpers.h
src/plugins/platforms/cocoa/qcocoahelpers.mm
Change-Id: Ibe5efcae73526b3d3931ed22730b13d372dcf54e
Diffstat (limited to 'LICENSE.LGPLv21')
0 files changed, 0 insertions, 0 deletions