diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 13:08:12 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-26 13:08:17 +0100 |
| commit | 2ce3ad556d3e0d0af585fc3e6c62e1802c26a3b8 (patch) | |
| tree | 6bb24a5f67292612e2f09e9fc7875f8a715930ca /src/declarative/graphicsitems/qdeclarativetextedit.cpp | |
| parent | a0783470449a911fce09d6328abfcff17973d421 (diff) | |
| parent | 2bc722aedd28f004fe9a4400b24103bb7cc9716f (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I4de2529ce5a4ce8227c7f320cbee9610e5ac7594
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit.cpp')
0 files changed, 0 insertions, 0 deletions