diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-11 08:48:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-11 09:12:36 +0200 |
| commit | f34e73a16a3d757057e007874cb5008f16e20f02 (patch) | |
| tree | bcc228617cf240773fd09daac1a1a2614b552b68 /LICENSE.FDL | |
| parent | 5380808453728a354ae28aae76e85ac448245cf1 (diff) | |
| parent | b9d386f2ccd69c7f6a766a6d90a6024eeb48e90a (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/corelib/kernel/qobject.cpp
src/gui/painting/qpaintengine_raster.cpp
Change-Id: I74e1779832f43d033708dcfd6b666c7b4f0111fb
Diffstat (limited to 'LICENSE.FDL')
0 files changed, 0 insertions, 0 deletions