diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-03-06 11:16:18 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-03-06 11:16:18 +0000 |
| commit | 85c4904ec8d29ad8074bebef880ffe362ea3241e (patch) | |
| tree | b4b832881482f89cd2f7a2b05ece9d19162cb642 /src/quick/items/qquickimage_p.h | |
| parent | b049085a2c13abe9cf89308d02a90b9a0be6cde1 (diff) | |
| parent | a005dcb57eb2938032c3e4c983ea04472190455c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/items/qquickimage_p.h')
0 files changed, 0 insertions, 0 deletions