18 files changed, 140 insertions, 98 deletions
diff --git a/.qmake.conf b/.qmake.conf
index a2a0d41..aefa1e7 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
 load(qt_build_config)
 
-MODULE_VERSION = 5.7.1
+MODULE_VERSION = 5.8.0
diff --git a/src/3rdparty/jasper/qt_attribution.json b/src/3rdparty/jasper/qt_attribution.json
new file mode 100644
index 0000000..2cc9d15
--- /dev/null
+++ b/src/3rdparty/jasper/qt_attribution.json
@@ -0,0 +1,16 @@
+{
+    "Id": "jasper",
+    "Name": "JasPer",
+    "QDocModule": "qtimageformats",
+    "QtUsage": "Used in the QJp2 image plugin if no system jasper library is found.",
+
+    "Description": "JasPer is a collection of software (i.e., a library and application programs) for the coding and manipulation of images.",
+    "Homepage": "http://www.ece.uvic.ca/~mdadams/jasper",
+    "Version": "1.900.1",
+    "License": "JasPer License",
+    "LicenseId": "JasPer-2.0",
+    "LicenseFile": "LICENSE",
+    "Copyright": "Copyright (c) 1999-2000 Image Power, Inc. and the University of British Columbia.
+Copyright (c) 2001-2006 Michael David Adams.
+"
+}
diff --git a/src/3rdparty/libmng/qt_LICENSE b/src/3rdparty/libmng/qt_LICENSE
new file mode 100644
index 0000000..501c887
--- /dev/null
+++ b/src/3rdparty/libmng/qt_LICENSE
@@ -0,0 +1,53 @@
+Copyright (c) 2000-2007 Gerard Juyn (gerard@libmng.com)
+[You may insert additional notices after this sentence if you modify
+ this source]
+
+For the purposes of this copyright and license, "Contributing Authors"
+is defined as the following set of individuals:
+
+   Gerard Juyn
+   Glenn Randers-Pehrson
+
+The MNG Library is supplied "AS IS".  The Contributing Authors
+disclaim all warranties, expressed or implied, including, without
+limitation, the warranties of merchantability and of fitness for any
+purpose.  The Contributing Authors assume no liability for direct,
+indirect, incidental, special, exemplary, or consequential damages,
+which may result from the use of the MNG Library, even if advised of
+the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+source code, or portions hereof, for any purpose, without fee, subject
+to the following restrictions:
+
+1. The origin of this source code must not be misrepresented;
+   you must not claim that you wrote the original software.
+
+2. Altered versions must be plainly marked as such and must not be
+   misrepresented as being the original source.
+
+3. This Copyright notice may not be removed or altered from any source
+   or altered source distribution.
+
+The Contributing Authors specifically permit, without fee, and
+encourage the use of this source code as a component to supporting
+the MNG and JNG file format in commercial products.  If you use this
+source code in a product, acknowledgment would be highly appreciated.
+
+************************************************************************
+
+Parts of this software have been adapted from the libpng package.
+Although this library supports all features from the PNG specification
+(as MNG descends from it) it does not require the libpng package.
+It does require the zlib library and optionally the IJG jpeg library,
+and/or the "little-cms" library by Marti Maria (depending on the
+inclusion of support for JNG and Full-Color-Management respectively.
+
+This library's function is primarily to read and display MNG
+animations. It is not meant as a full-featured image-editing
+component! It does however offer creation and editing functionality
+at the chunk level.
+(future modifications may include some more support for creation
+ and or editing)
+
+************************************************************************
diff --git a/src/3rdparty/libmng/qt_attribution.json b/src/3rdparty/libmng/qt_attribution.json
new file mode 100644
index 0000000..c5f4137
--- /dev/null
+++ b/src/3rdparty/libmng/qt_attribution.json
@@ -0,0 +1,14 @@
+{
+    "Id": "libmng",
+    "Name": "MNG reference library",
+    "QDocModule": "qtimageformats",
+    "QtUsage": "Used in the qmng image plugin if no system libmng is found.",
+
+    "Description": "",
+    "Homepage": "http://www.libmng.com/",
+    "Version": "1.0.10",
+    "License": "zlib License",
+    "LicenseId": "Zlib",
+    "LicenseFile": "qt_LICENSE",
+    "Copyright": "Copyright (c) 2000-2007 Gerard Juyn (gerard@libmng.com)"
+}
diff --git a/src/3rdparty/libtiff.pri b/src/3rdparty/libtiff.pri
index 51f4e0a..c57c668 100644
--- a/src/3rdparty/libtiff.pri
+++ b/src/3rdparty/libtiff.pri
@@ -35,7 +35,6 @@ SOURCES += \
     $$PWD/libtiff/libtiff/tif_zip.c \
     $$PWD/libtiff/port/snprintf.c
 
-wince*:       SOURCES += $$PWD/libtiff/libtiff/tif_win32.c
 win32:        SOURCES += $$PWD/libtiff/libtiff/tif_win32.c
 else:         SOURCES += $$PWD/libtiff/libtiff/tif_unix.c
 android:      SOURCES += $$PWD/libtiff/port/lfind.c
diff --git a/src/3rdparty/libtiff/port/strtoull.c b/src/3rdparty/libtiff/port/strtoull.c
index fb7739c..c37ee16 100644
--- a/src/3rdparty/libtiff/port/strtoull.c
+++ b/src/3rdparty/libtiff/port/strtoull.c
@@ -2,6 +2,11 @@
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
+ * Copyright (c) 2011 The FreeBSD Foundation
+ * All rights reserved.
+ * Portions of this software were developed by David Chisnall
+ * under sponsorship from the FreeBSD Foundation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -10,11 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/src/3rdparty/libtiff/qt_attribution.json b/src/3rdparty/libtiff/qt_attribution.json
new file mode 100644
index 0000000..8a00a8f
--- /dev/null
+++ b/src/3rdparty/libtiff/qt_attribution.json
@@ -0,0 +1,15 @@
+{
+    "Id": "libtiff",
+    "Name": "TIFF Software Distribution (libtiff)",
+    "QDocModule": "qtimageformats",
+    "QtUsage": "Used in the qtiff image plugin if no system libtiff is found.",
+
+    "Description": "",
+    "Homepage": "http://www.simplesystems.org/libtiff/",
+    "Version": "4.0.6",
+    "License": "libtiff License",
+    "LicenseId": "libtiff",
+    "LicenseFile": "COPYRIGHT",
+    "Copyright": "Copyright (c) 1988-1997 Sam Leffler
+Copyright (c) 1991-1997 Silicon Graphics, Inc."
+}
diff --git a/src/3rdparty/libwebp/qt_attribution.json b/src/3rdparty/libwebp/qt_attribution.json
new file mode 100644
index 0000000..6084e7a
--- /dev/null
+++ b/src/3rdparty/libwebp/qt_attribution.json
@@ -0,0 +1,14 @@
+{
+    "Id": "libwebp",
+    "Name": "WebP (libwebp)",
+    "QDocModule": "qtimageformats",
+    "QtUsage": "Used in the qwebp image plugin if no system libwebp is found.",
+
+    "Description": "WebP is a new image format that provides lossless and lossy compression for images on the web.",
+    "Homepage": "https://developers.google.com/speed/webp/",
+    "Version": "0.5.0",
+    "License": "BSD 3-clause \"New\" or \"Revised\" License",
+    "LicenseId": "BSD-3-Clause",
+    "LicenseFile": "COPYING",
+    "Copyright": "Copyright (c) 2010, Google Inc. All rights reserved."
+}
diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri
index 5cccf37..2c714b3 100644
--- a/src/3rdparty/zlib_dependency.pri
+++ b/src/3rdparty/zlib_dependency.pri
@@ -1,10 +1,6 @@
 # zlib dependency satisfied by bundled 3rd party zlib or system zlib
-contains(QT_CONFIG, system-zlib) {
-    unix|mingw: LIBS_PRIVATE += -lz
-    else {
-        isEmpty(ZLIB_LIBS): LIBS += zdll.lib
-        else: LIBS += $$ZLIB_LIBS
-    }
+qtConfig(system-zlib) {
+    QMAKE_USE_PRIVATE += zlib
 } else {
     QT_PRIVATE += zlib-private
 }
diff --git a/src/imageformats/doc/src/qtimageformats.qdoc b/src/imageformats/doc/src/qtimageformats.qdoc
index 1656f60..90369ed 100644
--- a/src/imageformats/doc/src/qtimageformats.qdoc
+++ b/src/imageformats/doc/src/qtimageformats.qdoc
@@ -74,6 +74,19 @@ plugins/imageformats), together with the default image format
 plugins. They may be deployed to the target system in the same way as
 other plugins, see the \l{Deploying Plugins} documentation.
 
+\section2 Licenses and Attributions
+
+Qt Image Formats is available under commercial licenses from \l{The Qt Company}.
+In addition, it is available under the
+\l{GNU Lesser General Public License, version 3}, or
+the \l{GNU General Public License, version 2}.
+See \l{Qt Licensing} for further details.
+
+Furthermore Qt Image Formats potentially contains third party
+modules under following permissive licenses:
+
+\generatelist{groupsbymodule attributions-qtimageformats}
+
 \section2 Security considerations
 
 Since these file formats are more rarely used, the codecs may be less
diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro
index 23ada9a..118d7ea 100644
--- a/src/plugins/imageformats/imageformats.pro
+++ b/src/plugins/imageformats/imageformats.pro
@@ -14,8 +14,6 @@ config_jasper {
     SUBDIRS += macjp2
 }
 
-wince:SUBDIRS -= jp2
-
 winrt {
     SUBDIRS -= tiff \
                tga \
diff --git a/src/plugins/imageformats/macjp2/macjp2.pro b/src/plugins/imageformats/macjp2/macjp2.pro
index 5e026b6..66aafb4 100644
--- a/src/plugins/imageformats/macjp2/macjp2.pro
+++ b/src/plugins/imageformats/macjp2/macjp2.pro
@@ -2,9 +2,9 @@ TARGET  = qmacjp2
 PLUGIN_TYPE = imageformats
 PLUGIN_CLASS_NAME = QMacJp2Plugin
 
-LIBS += -framework ImageIO
+LIBS += -framework CoreFoundation -framework CoreGraphics -framework ImageIO
 
-QT += core-private gui-private platformsupport-private
+QT += core-private gui-private
 
 SOURCES += \
     qmacjp2handler.cpp \
diff --git a/src/plugins/imageformats/mng/qmnghandler.cpp b/src/plugins/imageformats/mng/qmnghandler.cpp
index 2f1abd0..4106ba6 100644
--- a/src/plugins/imageformats/mng/qmnghandler.cpp
+++ b/src/plugins/imageformats/mng/qmnghandler.cpp
@@ -101,13 +101,7 @@ static mng_bool myerror(mng_handle /*hMNG*/,
 
 static mng_ptr myalloc(mng_size_t iSize)
 {
-#if defined(Q_OS_WINCE)
-    mng_ptr ptr = malloc(iSize);
-    memset(ptr, 0, iSize);
-    return ptr;
-#else
     return (mng_ptr)calloc(1, iSize);
-#endif
 }
 
 static void myfree(mng_ptr pPtr, mng_size_t /*iSize*/)
diff --git a/src/plugins/imageformats/tiff/qfunctions_wince.cpp b/src/plugins/imageformats/tiff/qfunctions_wince.cpp
deleted file mode 100644
index fcd5a3f..0000000
--- a/src/plugins/imageformats/tiff/qfunctions_wince.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifdef _WIN32_WCE //Q_OS_WINCE
-
-#include "qplatformdefs.h"
-
-QT_USE_NAMESPACE
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void *lfind(const void* key, const void* base, size_t* elements, size_t size,
-            int (__cdecl *compare)(const void*, const void*))
-{
-    const char* current = (char*) base;
-    const char* const end = (char*) (current + (*elements) * size);
-    while (current != end) {
-        if (compare(current, key) == 0)
-            return (void*)current;
-        current += size;
-    }
-    return 0;
-}
-
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-#endif // Q_OS_WINCE
diff --git a/src/plugins/imageformats/tiff/qtiffhandler.cpp b/src/plugins/imageformats/tiff/qtiffhandler.cpp
index f72c2a0..6fcf2a7 100644
--- a/src/plugins/imageformats/tiff/qtiffhandler.cpp
+++ b/src/plugins/imageformats/tiff/qtiffhandler.cpp
@@ -541,7 +541,7 @@ bool QTiffHandler::write(const QImage &image)
         if (image.colorTable().at(0) == 0xffffffff)
             photometric = PHOTOMETRIC_MINISWHITE;
         if (!TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, photometric)
-            || !TIFFSetField(tiff, TIFFTAG_COMPRESSION, compression == NoCompression ? COMPRESSION_NONE : COMPRESSION_CCITTRLE)
+            || !TIFFSetField(tiff, TIFFTAG_COMPRESSION, compression == NoCompression ? COMPRESSION_NONE : COMPRESSION_LZW)
             || !TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 1)) {
             TIFFClose(tiff);
             return false;
@@ -576,14 +576,14 @@ bool QTiffHandler::write(const QImage &image)
             if (colorTable.at(0) == 0xffffffff)
                 photometric = PHOTOMETRIC_MINISWHITE;
             if (!TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, photometric)
-                    || !TIFFSetField(tiff, TIFFTAG_COMPRESSION, compression == NoCompression ? COMPRESSION_NONE : COMPRESSION_PACKBITS)
+                    || !TIFFSetField(tiff, TIFFTAG_COMPRESSION, compression == NoCompression ? COMPRESSION_NONE : COMPRESSION_LZW)
                     || !TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 8)) {
                 TIFFClose(tiff);
                 return false;
             }
         } else {
             if (!TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_PALETTE)
-                    || !TIFFSetField(tiff, TIFFTAG_COMPRESSION, compression == NoCompression ? COMPRESSION_NONE : COMPRESSION_PACKBITS)
+                    || !TIFFSetField(tiff, TIFFTAG_COMPRESSION, compression == NoCompression ? COMPRESSION_NONE : COMPRESSION_LZW)
                     || !TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 8)) {
                 TIFFClose(tiff);
                 return false;
diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
index 6174095..04cfbdb 100644
--- a/src/plugins/imageformats/tiff/tiff.pro
+++ b/src/plugins/imageformats/tiff/tiff.pro
@@ -2,7 +2,6 @@ TARGET  = qtiff
 
 HEADERS += qtiffhandler_p.h
 SOURCES += main.cpp qtiffhandler.cpp
-wince*: SOURCES += qfunctions_wince.cpp
 OTHER_FILES += tiff.json
 
 config_libtiff {
diff --git a/tests/auto/tiff/tst_qtiff.cpp b/tests/auto/tiff/tst_qtiff.cpp
index ae7d5a5..8e3d0c9 100644
--- a/tests/auto/tiff/tst_qtiff.cpp
+++ b/tests/auto/tiff/tst_qtiff.cpp
@@ -404,10 +404,6 @@ void tst_qtiff::readWriteNonDestructive()
 
 void tst_qtiff::largeTiff()
 {
-#if defined(Q_OS_WINCE)
-    QSKIP("not tested on WinCE");
-#endif
-
     QImage img(4096, 2048, QImage::Format_ARGB32_Premultiplied);
 
     QPainter p(&img);
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index 793221c..3565a63 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS =
-contains(QT_CONFIG, system-zlib): SUBDIRS += mng tiff
+qtConfig(system-zlib): SUBDIRS += mng tiff