← Back to branch summary

~neon/qt/qtimageformats

~neon/qt/qtimageformats

Viewing all changes in revision 88.

Committer: Frederik Gladhorn
Date: 2014-08-28 15:49:48 UTC
mfrom: (86.1.1)
Revision ID: git-v1:2253671eee248f42bb3f6979b6ae288c1a065dc4

Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I1167df7c6dd3fb394011cd98edaa84f868d41eaf

files added:
LICENSE.GPLv2

LICENSE.LGPLv21

LICENSE.LGPLv3

files removed:
LICENSE.GPL

LICENSE.LGPL

files modified:
config.tests/jasper/jasper.cpp

config.tests/libmng/libmng.cpp

config.tests/libtiff/libtiff.cpp

config.tests/libwebp/libwebp.cpp

src/plugins/imageformats/dds/ddsheader.cpp

src/plugins/imageformats/dds/ddsheader.h

src/plugins/imageformats/dds/main.cpp

src/plugins/imageformats/dds/qddshandler.cpp

src/plugins/imageformats/dds/qddshandler.h

src/plugins/imageformats/icns/main.cpp

src/plugins/imageformats/icns/qicnshandler.cpp

src/plugins/imageformats/icns/qicnshandler_p.h

src/plugins/imageformats/jp2/main.cpp

src/plugins/imageformats/jp2/qjp2handler.cpp

src/plugins/imageformats/jp2/qjp2handler_p.h

src/plugins/imageformats/mng/main.cpp

src/plugins/imageformats/mng/qmnghandler.cpp

src/plugins/imageformats/mng/qmnghandler_p.h

src/plugins/imageformats/tga/main.cpp

src/plugins/imageformats/tga/qtgafile.cpp

src/plugins/imageformats/tga/qtgafile.h

src/plugins/imageformats/tga/qtgahandler.cpp

src/plugins/imageformats/tga/qtgahandler.h

src/plugins/imageformats/tiff/main.cpp

src/plugins/imageformats/tiff/qfunctions_wince.cpp

src/plugins/imageformats/tiff/qtiffhandler.cpp

src/plugins/imageformats/tiff/qtiffhandler_p.h

src/plugins/imageformats/wbmp/main.cpp

src/plugins/imageformats/wbmp/qwbmphandler.cpp

src/plugins/imageformats/wbmp/qwbmphandler_p.h

src/plugins/imageformats/webp/main.cpp

src/plugins/imageformats/webp/qwebphandler.cpp

src/plugins/imageformats/webp/qwebphandler_p.h

tests/auto/dds/tst_qdds.cpp

tests/auto/icns/tst_qicns.cpp

tests/auto/jp2/tst_qjp2.cpp

tests/auto/mng/tst_qmng.cpp

tests/auto/tga/tst_qtga.cpp

tests/auto/tiff/tst_qtiff.cpp

tests/auto/wbmp/tst_qwbmp.cpp

tests/auto/webp/tst_qwebp.cpp

tests/benchmarks/mng/tst_qmng.cpp

tests/benchmarks/tiff/tst_qtiff.cpp

Show diffs side-by-side

added added

removed removed

LICENSE.LGPLv21

config.tests/jasper/jasper.cpp

config.tests/libmng/libmng.cpp

config.tests/libtiff/libtiff.cpp

config.tests/libwebp/libwebp.cpp

src/plugins/imageformats/dds/ddsheader.cpp

src/plugins/imageformats/dds/ddsheader.h

src/plugins/imageformats/dds/main.cpp

src/plugins/imageformats/dds/qddshandler.cpp

src/plugins/imageformats/dds/qddshandler.h

src/plugins/imageformats/icns/main.cpp

src/plugins/imageformats/icns/qicnshandler.cpp

src/plugins/imageformats/icns/qicnshandler_p.h

src/plugins/imageformats/jp2/main.cpp

src/plugins/imageformats/jp2/qjp2handler.cpp

src/plugins/imageformats/jp2/qjp2handler_p.h

src/plugins/imageformats/mng/main.cpp

src/plugins/imageformats/mng/qmnghandler.cpp

src/plugins/imageformats/mng/qmnghandler_p.h

src/plugins/imageformats/tga/main.cpp

src/plugins/imageformats/tga/qtgafile.cpp

src/plugins/imageformats/tga/qtgafile.h

src/plugins/imageformats/tga/qtgahandler.cpp

src/plugins/imageformats/tga/qtgahandler.h

src/plugins/imageformats/tiff/main.cpp

src/plugins/imageformats/tiff/qfunctions_wince.cpp

src/plugins/imageformats/tiff/qtiffhandler.cpp

src/plugins/imageformats/tiff/qtiffhandler_p.h

src/plugins/imageformats/wbmp/main.cpp

src/plugins/imageformats/wbmp/qwbmphandler.cpp

src/plugins/imageformats/wbmp/qwbmphandler_p.h

src/plugins/imageformats/webp/main.cpp

src/plugins/imageformats/webp/qwebphandler.cpp

src/plugins/imageformats/webp/qwebphandler_p.h

tests/auto/dds/tst_qdds.cpp

tests/auto/icns/tst_qicns.cpp

tests/auto/jp2/tst_qjp2.cpp

tests/auto/mng/tst_qmng.cpp

tests/auto/tga/tst_qtga.cpp

tests/auto/tiff/tst_qtiff.cpp

tests/auto/wbmp/tst_qwbmp.cpp

tests/auto/webp/tst_qwebp.cpp

tests/benchmarks/mng/tst_qmng.cpp

tests/benchmarks/tiff/tst_qtiff.cpp

Older »