diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:09:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:09:19 +0200 |
| commit | 34956bc234bf1b2ebcf224a256297293ba4276aa (patch) | |
| tree | 732fc88b9ea113e8ff3f106a5e5bc33610c5ed57 /src/quick/util/qquickstyledtext.cpp | |
| parent | e3a6565c3832e6f3001d49c52ca59fa4fa555f1b (diff) | |
| parent | 210617de78c78af44efdc251ba7a207c5c26e11c (diff) | |
Merge remote-tracking branch 'origin/5.7.0' into 5.7
Change-Id: I7b0ad528da17ecdb955c2d0c792c9f113904623e
Diffstat (limited to 'src/quick/util/qquickstyledtext.cpp')
0 files changed, 0 insertions, 0 deletions