Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtImageFormats
Commits
cee7701c
Commit
cee7701c
authored
6 years ago
by
Qt Forward Merge Bot
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Idd134e350e760a0237dce4ef00d10e1c35dbeb67
parents
9293902f
a33e3aea
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
config.tests/jasper/jasper.cpp
+0
-40
config.tests/jasper/jasper.cpp
config.tests/jasper/jasper.pro
+0
-6
config.tests/jasper/jasper.pro
config.tests/libmng/libmng.cpp
+0
-44
config.tests/libmng/libmng.cpp
config.tests/libmng/libmng.pro
+0
-6
config.tests/libmng/libmng.pro
config.tests/libtiff/libtiff.cpp
+0
-52
config.tests/libtiff/libtiff.cpp
config.tests/libtiff/libtiff.pro
+0
-6
config.tests/libtiff/libtiff.pro
config.tests/libwebp/libwebp.cpp
+0
-52
config.tests/libwebp/libwebp.cpp
config.tests/libwebp/libwebp.pro
+0
-6
config.tests/libwebp/libwebp.pro
config_help.txt
+6
-0
config_help.txt
configure.json
+5
-0
configure.json
qtimageformats.pro
+0
-6
qtimageformats.pro
src/3rdparty/libwebp/src/dsp/dsp.h
+3
-3
src/3rdparty/libwebp/src/dsp/dsp.h
src/imageformats/configure.json
+212
-0
src/imageformats/configure.json
src/plugins/imageformats/imageformats.pro
+9
-5
src/plugins/imageformats/imageformats.pro
src/plugins/imageformats/jp2/jp2.pro
+4
-2
src/plugins/imageformats/jp2/jp2.pro
src/plugins/imageformats/webp/webp.pro
+5
-3
src/plugins/imageformats/webp/webp.pro
src/src.pro
+3
-1
src/src.pro
with
247 additions
and
232 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
