diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:29:42 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:29:42 +0100 |
| commit | 9293902f325341f0c188bdf4f662c3a7d949a343 (patch) | |
| tree | e27e6981974951597b3ee82219a2273c58320209 /tests/shared | |
| parent | 45e7c2b0b2221d1659b480d31d4f596d5ac3f444 (diff) | |
| parent | 434aa248ad5710c7f65283fc3beb7e8adb8b1ad7 (diff) | |
| download | qtimageformats-9293902f325341f0c188bdf4f662c3a7d949a343.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ie44fe655653166bf5a4436aedd80d060afa45d5a
Diffstat (limited to 'tests/shared')
| -rw-r--r-- | tests/shared/images/heif.qrc | 1 | ||||
| -rw-r--r-- | tests/shared/images/heif/newlogoCCW.heic | bin | 0 -> 4847 bytes |
2 files changed, 1 insertions, 0 deletions
diff --git a/tests/shared/images/heif.qrc b/tests/shared/images/heif.qrc index 2a41c36..8232b6a 100644 --- a/tests/shared/images/heif.qrc +++ b/tests/shared/images/heif.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/"> <file>heif/col320x480.heic</file> + <file>heif/newlogoCCW.heic</file> </qresource> </RCC> diff --git a/tests/shared/images/heif/newlogoCCW.heic b/tests/shared/images/heif/newlogoCCW.heic Binary files differnew file mode 100644 index 0000000..1604947 --- /dev/null +++ b/tests/shared/images/heif/newlogoCCW.heic |
