diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-11-11 11:24:20 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-11-11 11:24:20 +0100 |
| commit | c254868dc2bd5772494a48686ebbc3e867a86adf (patch) | |
| tree | 76c33df85ab2ef13e44f7677b43439c7b0d3b36a /tests/auto/quick/html/resources/simple_image.png | |
| parent | fca9015175950b04bafb9b3af7d4e693eb0243d9 (diff) | |
| parent | aa1b2d20a80f53ce5e7f6097114d41a018d9350b (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/core/browser_context_qt.cpp
src/webengine/api/qquickwebengineview_p.h
Change-Id: I73bdec03b627b282851d7dda12006d4ab631072c
Diffstat (limited to 'tests/auto/quick/html/resources/simple_image.png')
| -rw-r--r-- | tests/auto/quick/html/resources/simple_image.png | bin | 0 -> 10585 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/quick/html/resources/simple_image.png b/tests/auto/quick/html/resources/simple_image.png Binary files differnew file mode 100644 index 000000000..4685399ca --- /dev/null +++ b/tests/auto/quick/html/resources/simple_image.png |