diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-03-06 11:03:27 +0100 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-03-06 11:05:09 +0100 |
| commit | a005dcb57eb2938032c3e4c983ea04472190455c (patch) | |
| tree | b6b064e257c4d76708e5a52fed3e1a80660790d3 /src/quick/items/qquickimage_p.h | |
| parent | e7c18e2a2b39f35667e76aaafa7135bde161a806 (diff) | |
| parent | af9e21cd91abcff9e084161cb7ed15fbedc8f931 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/quick/items/qquicktextedit.cpp
Change-Id: I354093ceb996aae40254f2143dec2bb74cf5eb17
Diffstat (limited to 'src/quick/items/qquickimage_p.h')
0 files changed, 0 insertions, 0 deletions