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
4ce4beff
Commit
4ce4beff
authored
8 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I30c0190e8ec28d18b1f803ebd16b0139b044089f
parents
1c72ef50
caaa463a
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
5.9
5.9.8
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
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
No related merge requests found
Changes
25
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
src/imageformats/doc/src/qtimageformats.qdoc
+7
-3
src/imageformats/doc/src/qtimageformats.qdoc
src/plugins/imageformats/dds/main.cpp
+2
-2
src/plugins/imageformats/dds/main.cpp
src/plugins/imageformats/dds/qddshandler.cpp
+4
-1
src/plugins/imageformats/dds/qddshandler.cpp
src/plugins/imageformats/dds/qddshandler.h
+9
-9
src/plugins/imageformats/dds/qddshandler.h
src/plugins/imageformats/icns/main.cpp
+2
-2
src/plugins/imageformats/icns/main.cpp
src/plugins/imageformats/icns/qicnshandler_p.h
+9
-9
src/plugins/imageformats/icns/qicnshandler_p.h
src/plugins/imageformats/imageformats.pro
+1
-1
src/plugins/imageformats/imageformats.pro
src/plugins/imageformats/jp2/main.cpp
+2
-8
src/plugins/imageformats/jp2/main.cpp
src/plugins/imageformats/jp2/qjp2handler_p.h
+8
-8
src/plugins/imageformats/jp2/qjp2handler_p.h
src/plugins/imageformats/macjp2/main.cpp
+2
-8
src/plugins/imageformats/macjp2/main.cpp
src/plugins/imageformats/macjp2/qiiofhelpers.cpp
+1
-1
src/plugins/imageformats/macjp2/qiiofhelpers.cpp
src/plugins/imageformats/macjp2/qmacjp2handler.h
+8
-8
src/plugins/imageformats/macjp2/qmacjp2handler.h
src/plugins/imageformats/mng/main.cpp
+2
-8
src/plugins/imageformats/mng/main.cpp
src/plugins/imageformats/mng/qmnghandler_p.h
+13
-13
src/plugins/imageformats/mng/qmnghandler_p.h
src/plugins/imageformats/tga/main.cpp
+2
-8
src/plugins/imageformats/tga/main.cpp
src/plugins/imageformats/tga/qtgafile.cpp
+4
-4
src/plugins/imageformats/tga/qtgafile.cpp
src/plugins/imageformats/tga/qtgahandler.h
+6
-6
src/plugins/imageformats/tga/qtgahandler.h
src/plugins/imageformats/tiff/main.cpp
+2
-8
src/plugins/imageformats/tiff/main.cpp
src/plugins/imageformats/tiff/qtiffhandler_p.h
+7
-7
src/plugins/imageformats/tiff/qtiffhandler_p.h
src/plugins/imageformats/wbmp/main.cpp
+2
-8
src/plugins/imageformats/wbmp/main.cpp
with
93 additions
and
122 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