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
2253671e
Commit
2253671e
authored
10 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I1167df7c6dd3fb394011cd98edaa84f868d41eaf
parents
99ad0288
dd5634f8
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.5
5.6
5.7
5.8
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
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
v5.5.1
v5.5.0
v5.5.0-rc1
v5.5.0-beta1
v5.5.0-alpha1
No related merge requests found
Changes
47
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
LICENSE.GPL
+0
-674
LICENSE.GPL
LICENSE.GPLv2
+292
-0
LICENSE.GPLv2
LICENSE.LGPLv21
+10
-10
LICENSE.LGPLv21
LICENSE.LGPLv3
+173
-0
LICENSE.LGPLv3
config.tests/jasper/jasper.cpp
+10
-18
config.tests/jasper/jasper.cpp
config.tests/libmng/libmng.cpp
+11
-19
config.tests/libmng/libmng.cpp
config.tests/libtiff/libtiff.cpp
+11
-19
config.tests/libtiff/libtiff.cpp
config.tests/libwebp/libwebp.cpp
+11
-19
config.tests/libwebp/libwebp.cpp
src/plugins/imageformats/dds/ddsheader.cpp
+11
-19
src/plugins/imageformats/dds/ddsheader.cpp
src/plugins/imageformats/dds/ddsheader.h
+11
-19
src/plugins/imageformats/dds/ddsheader.h
src/plugins/imageformats/dds/main.cpp
+11
-19
src/plugins/imageformats/dds/main.cpp
src/plugins/imageformats/dds/qddshandler.cpp
+11
-19
src/plugins/imageformats/dds/qddshandler.cpp
src/plugins/imageformats/dds/qddshandler.h
+11
-19
src/plugins/imageformats/dds/qddshandler.h
src/plugins/imageformats/icns/main.cpp
+11
-19
src/plugins/imageformats/icns/main.cpp
src/plugins/imageformats/icns/qicnshandler.cpp
+11
-19
src/plugins/imageformats/icns/qicnshandler.cpp
src/plugins/imageformats/icns/qicnshandler_p.h
+11
-19
src/plugins/imageformats/icns/qicnshandler_p.h
src/plugins/imageformats/jp2/main.cpp
+10
-18
src/plugins/imageformats/jp2/main.cpp
src/plugins/imageformats/jp2/qjp2handler.cpp
+10
-18
src/plugins/imageformats/jp2/qjp2handler.cpp
src/plugins/imageformats/jp2/qjp2handler_p.h
+10
-18
src/plugins/imageformats/jp2/qjp2handler_p.h
src/plugins/imageformats/mng/main.cpp
+11
-19
src/plugins/imageformats/mng/main.cpp
with
647 additions
and
984 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