diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-08-17 20:09:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-08-17 20:09:49 +0200 |
| commit | 9c9fca5e27bd91da1ea07bebd7569049493c5ccf (patch) | |
| tree | dd3b49b40ed01cad1c2cdc206ec73271bca6e942 /src/quick/items/qquicktext.cpp | |
| parent | 94e337fa95425d259e81b4d21f4d0853108553bd (diff) | |
| parent | 668ccf18dc8d5ddf403667f19a5b08f2b7c18639 (diff) | |
Merge dev into 5.6
Change-Id: I9ec05838f3c4cbc11fb969c71daf5c2a5a8df360
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
0 files changed, 0 insertions, 0 deletions