diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 11:16:24 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-08 11:16:24 +0000 |
| commit | dab3fa107fa7b4a82928b71748b857ff85180f1e (patch) | |
| tree | 9a1e85401ae6b790209f666441f121bb13d1a7f8 /tests/auto/quick/qquickpixmapcache/data/massive.png | |
| parent | a889bcb6c3c66a616e73fa5ed3c9d900d7c7d6f5 (diff) | |
| parent | 68ba8fe3ccf7abe8d24ba3614f8d7ceb3778de74 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'tests/auto/quick/qquickpixmapcache/data/massive.png')
| -rw-r--r-- | tests/auto/quick/qquickpixmapcache/data/massive.png | bin | 31834 -> 11468 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickpixmapcache/data/massive.png b/tests/auto/quick/qquickpixmapcache/data/massive.png Binary files differindex bc6cc9e6ca..9a3e0e112f 100644 --- a/tests/auto/quick/qquickpixmapcache/data/massive.png +++ b/tests/auto/quick/qquickpixmapcache/data/massive.png |
