diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-23 09:36:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-23 09:36:23 +0200 |
| commit | 53bd8140bb5ee3ce1a9f138b1c862a67b6dd4eaa (patch) | |
| tree | 2e811354bec3f8f16225d19a8567430b9b35ba24 /src/gui/text/qtextengine.cpp | |
| parent | e2e107556dfb843fa0c3dc3e52695b34fdb40ba1 (diff) | |
| parent | f050f2180ffb8298de802b33ad9f017312df1815 (diff) | |
Merge remote-tracking branch 'origin/5.6.2' into 5.6
Change-Id: I570fa9b06e181d02a4bee83500730733b31d4758
Diffstat (limited to 'src/gui/text/qtextengine.cpp')
0 files changed, 0 insertions, 0 deletions