Conflicts:
	.qmake.conf

Change-Id: I84737121b8915a6c358ad92246984749e2719bed

Change-Id: Iba0631701fbecdd66ffa1d12c57387d76aa65475
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

This updates the bundled libtiff to release 4.0.8. In addition, since
after that release a number of security-related fixes has been added
to the upstream CVS repository, this commit comprises the upstream
changes of libtiff until 2017-10-10. (Corresponds to commit 46195f7
in the unofficial mirror at github.com/vadz/libtiff.git.)

[ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.0.8+

Change-Id: I9f45387ab48383ef2635d60aeda5c74828f1a6fc
Reviewed-by: Liang Qi <liang.qi@qt.io>

Change-Id: I1e024810b9c5a9fc32986507d263f8b9727f2315
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

Change-Id: I77cea1554afe0da551acc19111db22c5d4307086

Change-Id: Ib87dfcc477d0a0a189e9caf5cb73489b1ad923c2

Change-Id: I32dd4ece07c0ff4ef882fffe69afbe2f4a818a96
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Change-Id: Ic9bf390feceac545e3ab971dff72ff36b00535e0
Reviewed-by: Andy Shaw <andy.shaw@qt.io>

Task-number: QTBUG-62717
Change-Id: If125eec9f76187afcc6722f7b0825745ffe31303
Reviewed-by: Liang Qi <liang.qi@qt.io>

Use new sizeInBytes() method.

Change-Id: I3fa5969ac04e2edb87a06f132dc0b60e65718b81
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Conflicts:
	.qmake.conf

Change-Id: I55c144a1d0579aa19691c44c4f8ef8bf702189cb

Task-number: QTBUG-61640
Change-Id: I9d0bfbafe15df338355cf2f5c77c2d4f8f00d27f
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Task-number: QTBUG-61641
Change-Id: I24a139cc75141a588f2ed2558da85cd2f8391af9
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Change-Id: Iec877a63b3cc750f1d5df5076e074f12676f4360

Change-Id: I6ffbcf2ff74e946bac05534a250029503e55e2b3
Reviewed-by: Liang Qi <liang.qi@qt.io>

qMin() was used with quint32 and uint32. This fixes the build on Haiku.

Change-Id: I193f561b9a63ffe9ee5ae991084118a821e3f22d
Reviewed-by: Augustin Cavalier <waddlesplash@gmail.com>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

...for security reasons.

Task-number: QTBUG-59955
Change-Id: I74e25d7c46490e476186b486b8c1845e425964f9
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

Conflicts:
	.qmake.conf

Change-Id: I0d75cdb889e1ea18837037e08be531a99a8ce5eb

Change-Id: I9abdad989d0ef0c854c7638886c4246f31c4b9dc

Change-Id: Ia15ef6b1015757bac0e8155247379251922aff61
Reviewed-by: Liang Qi <liang.qi@qt.io>

Change-Id: I335232e10b3ad2575fcd16c583a2453830e63488

Change-Id: I9ed5494a8b6b137e4b48f8a788ff89bd3c7a09ac
Reviewed-by: Liang Qi <liang.qi@qt.io>

The plugin has been removed from the build (since 5.8) and is now
unmaintained. While keeping the code around for adventurous users makes
sense, people who rely on reading the docs should now assume it is gone.

Change-Id: I9df73d899e49cc94fb9316effa80778adbda5e6d
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>

The Embedded Android build (Boot to Qt Android injection) is defined by
having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined,
as well as having Qt config android-embedded.
Those flags are set in mkspecs when building for embedded Android.
This commit enables the possibility to build embedded Android builds.
(i.e. Qt build for Android baselayer only, without JNI)

Change-Id: I8d139b6d7b61c00ad44079cbfa6e5c77e8618a7b
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Change-Id: I182b9e5f4a9283c289bbe816868f000ad07b15f4

This commit extends the recently added support for tiled tiff images
of color index format to also cover grayscale and mono images. RGB
images were already covered, since the libtiff API used for those
handles tiled images transparently.

This commit also simplifies the tiff read() function by sharing
common code among the different formats.

[ChangeLog][TIFF] Extend support for tiled tiff files to all color formats

Change-Id: I13f94bbca65dd6a35384a415906034e245ad8b79
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

For color index images, the tiff handler uses scanline based
reading. The tiff decoder does not support that if the image is stored
in tiled format. This commit adds tile based reading for such cases.

[ChangeLog][TIFF] Added support for tiled, color indexed tiff files

Task-number: QTBUG-12636
Change-Id: Ic759903c75c8252267429f01e3dd9706fc516f8f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

Change-Id: I69942195d5208985d75333a13ed0ac5ae8f595d2
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

This commit imports libwebp 0.6.0, including AUTHORS, COPYING, ChangeLog,
NEWS, PATENTS, README and src directories. In src, only includes header
and source files.

Upstream changes since 0.5.1 have been merged in.
Also updated version in qt_attribution.json.

Conflicts:
	src/3rdparty/libwebp.pri
	src/3rdparty/libwebp/qt_attribution.json
	src/3rdparty/libwebp/src/webp/config.h

Change-Id: I001aa7a3fabf0130b54f9005c23aa822bc1d0ec1
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Change-Id: I9cf7f04769944935d7b836453c7982839857a909

We need to include qimageiohandler.h if we want to be sure that we can
use it. Also, QT_NO_IMAGEFORMATPLUGIN is defined in a header and needs
to be checked after the includes.

Change-Id: Ic6c376c87abb9684f45ca3d740deb7e580220ae4
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Change-Id: I7097482b3672c0faccc511210a94df6a5c9be590

Change-Id: I8a8151eb2dd01059cf86da8f72ecb65612bff0c1

Allows multipage TIFF images to be read via QImageReader::jumpToImage
and QImageReader::jumpNextToImage.

[ChangeLog][QtGui][QImageReader] Support multipage TIFF images through
QImageReader

Change-Id: Id6ac68b75500148e51be11eff3d296c929d2d95c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

Conflicts:
	.qmake.conf

Change-Id: I519c785ed64bdb0669d884a11d45be6532e629ec

INTEGRITY doesn't have search.h header

Change-Id: I5efe7d8ced37942de85ae810e22e528996e9904f
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Nikola Velinov <nvelinov@ghs.com>

Enabled C99 for INTEGRITY to allow non-constant values for array size

Change-Id: I51978d26a9ec4798eb541dc0a03b633ac9eb426a
Reviewed-by: Nikola Velinov <nvelinov@ghs.com>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Both 'hdr.height' and 'hdr.width' are quint32s. Multiplying them still gives
a quint32, but the lhs expected a qint64.

Fix by casting one of the operands to qint64.

Coverity-Id: 22179
Change-Id: If7385fb42bf994d87ac4e603fa85be4a30ad6d5c
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Coverity complained that the 'bytes' variable was first compared to
a QTgaFile::HeaderOffset, then, later, to a QTgaFile::FooterOffset.

This is of course a false positive, but one that's trivial to fix,
by not using a variable in the first place.

Adjust to Qt coding standard as a drive-by.

Coverity-Id: 22048
Change-Id: If1a45aa5b0c8ea23cab2cefeccb2f1dfe5f03375
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Change-Id: I4a666fe32a3e346fb03ee42cc85084ce4fc1865c