Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
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
54cdb5b0
Commit
54cdb5b0
authored
7 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts: .qmake.conf Change-Id: I827727fde51a71cbef5d61fb6cc2cd45d5e3bd7c
parents
c34ab1c4
3c607b32
dev
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
6.0
6.0.0
6.1
6.1.0
6.1.1
6.1.2
6.1.3
6.2
6.2.0
6.2.1
6.2.2
wip/cmake
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
No related merge requests found
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
dist/changes-5.9.4
+37
-0
dist/changes-5.9.4
src/3rdparty/libtiff/ChangeLog
+49
-1
src/3rdparty/libtiff/ChangeLog
src/3rdparty/libtiff/RELEASE-DATE
+1
-1
src/3rdparty/libtiff/RELEASE-DATE
src/3rdparty/libtiff/TODO
+1
-1
src/3rdparty/libtiff/TODO
src/3rdparty/libtiff/VERSION
+1
-1
src/3rdparty/libtiff/VERSION
src/3rdparty/libtiff/libtiff/SConstruct
+1
-1
src/3rdparty/libtiff/libtiff/SConstruct
src/3rdparty/libtiff/libtiff/tif_aux.c
+2
-2
src/3rdparty/libtiff/libtiff/tif_aux.c
src/3rdparty/libtiff/libtiff/tif_config.h
+1
-1
src/3rdparty/libtiff/libtiff/tif_config.h
src/3rdparty/libtiff/libtiff/tif_getimage.c
+10
-4
src/3rdparty/libtiff/libtiff/tif_getimage.c
src/3rdparty/libtiff/libtiff/tif_jpeg.c
+17
-7
src/3rdparty/libtiff/libtiff/tif_jpeg.c
src/3rdparty/libtiff/libtiff/tif_read.c
+4
-4
src/3rdparty/libtiff/libtiff/tif_read.c
src/3rdparty/libtiff/libtiff/tif_win32.c
+2
-0
src/3rdparty/libtiff/libtiff/tif_win32.c
src/3rdparty/libtiff/libtiff/tiffiop.h
+1
-5
src/3rdparty/libtiff/libtiff/tiffiop.h
src/3rdparty/libtiff/libtiff/tiffvers.h
+2
-2
src/3rdparty/libtiff/libtiff/tiffvers.h
src/3rdparty/libtiff/qt_attribution.json
+1
-1
src/3rdparty/libtiff/qt_attribution.json
src/plugins/imageformats/macjp2/qiiofhelpers.cpp
+7
-17
src/plugins/imageformats/macjp2/qiiofhelpers.cpp
src/plugins/imageformats/webp/qwebphandler.cpp
+3
-5
src/plugins/imageformats/webp/qwebphandler.cpp
src/plugins/imageformats/webp/qwebphandler_p.h
+0
-1
src/plugins/imageformats/webp/qwebphandler_p.h
with
140 additions
and
54 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
Menu
Explore
Projects
Groups
Topics
Snippets