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

 Conflicts:
	src/corelib/animation/qpropertyanimation.cpp
	src/gui/image/qicon.cpp
	tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp

Change-Id: I3698172b7b44ebb487cb38f50fd2c4a9f8a35b21

6 files changed, 65 insertions, 36 deletions

diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 5907d69f87..285cdf790a 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -47,8 +47,10 @@
 #include "private/qiconloader_p.h"
 #include "qpainter.h"
 #include "qfileinfo.h"
+#if QT_CONFIG(mimetype)
 #include <qmimedatabase.h>
 #include <qmimetype.h>
+#endif
 #include "qpixmapcache.h"
 #include "qvariant.h"
 #include "qcache.h"
@@ -1079,10 +1081,10 @@ void QIcon::addFile(const QString &fileName, const QSize &size, Mode mode, State
 
         QFileInfo info(fileName);
         QString suffix = info.suffix();
-#ifndef QT_NO_MIMETYPE
+#if QT_CONFIG(mimetype)
         if (suffix.isEmpty())
             suffix = QMimeDatabase().mimeTypeForFile(info).preferredSuffix(); // determination from contents
-#endif // !QT_NO_MIMETYPE
+#endif // mimetype
         QIconEngine *engine = iconEngineFromSuffix(fileName, suffix);
         d = new QIconPrivate(engine ? engine : new QPixmapIconEngine);
     }
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 636cacfb9c..421362dd9e 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -3750,7 +3750,9 @@ QDataStream &operator>>(QDataStream &s, QImage &image)
             return s;
         }
     }
-    image = QImageReader(s.device(), 0).read();
+    image = QImageReader(s.device(), s.version() == 1 ? "bmp" : "png").read();
+    if (image.isNull() && s.version() >= 5)
+        s.setStatus(QDataStream::ReadPastEnd);
     return s;
 }
 #endif // QT_NO_DATASTREAM
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index 6d358984d6..0fb1d808e5 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -165,6 +165,7 @@
 #endif
 
 #include <private/qimagereaderwriterhelpers_p.h>
+#include <qtgui_tracepoints_p.h>
 
 #include <algorithm>
 
@@ -1250,7 +1251,18 @@ bool QImageReader::read(QImage *image)
         d->handler->setOption(QImageIOHandler::Quality, d->quality);
 
     // read the image
-    if (!d->handler->read(image)) {
+    if (Q_TRACE_ENABLED(QImageReader_read_before_reading)) {
+        QString fileName = QStringLiteral("unknown");
+        if (QFile *file = qobject_cast<QFile *>(d->device))
+            fileName = file->fileName();
+        Q_TRACE(QImageReader_read_before_reading, this, fileName);
+    }
+
+    const bool result = d->handler->read(image);
+
+    Q_TRACE(QImageReader_read_after_reading, this, result);
+
+    if (!result) {
         d->imageReaderError = InvalidDataError;
         d->errorString = QImageReader::tr("Unable to read image data");
         return false;
diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
index 010760de4c..7d17b7d5ef 100644
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@@ -379,7 +379,7 @@ QFrameInfo QMoviePrivate::infoForFrame(int frameNumber)
             }
             if (frameNumber > greatestFrameNumber)
                 greatestFrameNumber = frameNumber;
-            QPixmap aPixmap = QPixmap::fromImage(anImage);
+            QPixmap aPixmap = QPixmap::fromImage(std::move(anImage));
             int aDelay = reader->nextImageDelay();
             return QFrameInfo(aPixmap, aDelay);
         } else if (frameNumber != 0) {
@@ -405,7 +405,7 @@ QFrameInfo QMoviePrivate::infoForFrame(int frameNumber)
                     return QFrameInfo(); // Invalid
                 }
                 greatestFrameNumber = i;
-                QPixmap aPixmap = QPixmap::fromImage(anImage);
+                QPixmap aPixmap = QPixmap::fromImage(std::move(anImage));
                 int aDelay = reader->nextImageDelay();
                 QFrameInfo info(aPixmap, aDelay);
                 // Cache it!
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index 7aa221948e..7eede5ee26 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -636,7 +636,7 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords)
             if (d->formatMajor <= 5) {
                 s >> ia >> i_8;
                 painter->drawPolygon(ia, i_8 ? Qt::WindingFill : Qt::OddEvenFill);
-                a.clear();
+                ia.clear();
             } else {
                 s >> a >> i_8;
                 painter->drawPolygon(a, i_8 ? Qt::WindingFill : Qt::OddEvenFill);
@@ -647,10 +647,10 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords)
             s >> ia;
             QPainterPath path;
             Q_ASSERT(ia.size() == 4);
-            path.moveTo(ia.at(0));
-            path.cubicTo(ia.at(1), ia.at(2), ia.at(3));
+            path.moveTo(ia.value(0));
+            path.cubicTo(ia.value(1), ia.value(2), ia.value(3));
             painter->strokePath(path, painter->pen());
-            a.clear();
+            ia.clear();
         }
             break;
         case QPicturePrivate::PdcDrawText:
@@ -730,7 +730,7 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords)
                     int index;
                     s >> r >> index >> sr;
                     Q_ASSERT(index < d->pixmap_list.size());
-                    pixmap = d->pixmap_list.at(index);
+                    pixmap = d->pixmap_list.value(index);
                 } else {
                     s >> r >> pixmap >> sr;
                 }
@@ -744,7 +744,7 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords)
                 int index;
                 s >> r >> index >> p;
                 Q_ASSERT(index < d->pixmap_list.size());
-                pixmap = d->pixmap_list.at(index);
+                pixmap = d->pixmap_list.value(index);
             } else {
                 s >> r >> pixmap >> p;
             }
@@ -765,7 +765,7 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords)
                     int index;
                     s >> r >> index >> sr >> ul;
                     Q_ASSERT(index < d->image_list.size());
-                    image = d->image_list.at(index);
+                    image = d->image_list.value(index);
                 } else {
                     s >> r >> image >> sr >> ul;
                 }
@@ -817,7 +817,7 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords)
                 int index;
                 s >> index;
                 Q_ASSERT(index < d->pen_list.size());
-                pen = d->pen_list.at(index);
+                pen = d->pen_list.value(index);
             } else {
                 s >> pen;
             }
@@ -828,7 +828,7 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords)
                 int index;
                 s >> index;
                 Q_ASSERT(index < d->brush_list.size());
-                brush = d->brush_list.at(index);
+                brush = d->brush_list.value(index);
             } else {
                 s >> brush;
             }
@@ -910,7 +910,7 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords)
             break;
         default:
             qWarning("QPicture::play: Invalid command %d", c);
-            if (len)                        // skip unknown command
+            if (len > 0)                    // skip unknown command
                 s.device()->seek(s.device()->pos()+len);
         }
 #if defined(QT_DEBUG)
@@ -1075,7 +1075,8 @@ bool QPicturePrivate::checkFormat()
 
     char mf_id[4];                                // picture header tag
     s.readRawData(mf_id, 4);                        // read actual tag
-    if (memcmp(mf_id, qt_mfhdr_tag, 4) != 0) {         // wrong header id
+    int bufSize = pictb.buffer().size();
+    if (memcmp(mf_id, qt_mfhdr_tag, 4) != 0 || bufSize < 12) {   // wrong header id or size
         qWarning("QPicturePaintEngine::checkFormat: Incorrect header");
         pictb.close();
         return false;
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index 242d8cd63b..13129e214b 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -99,12 +99,13 @@ public:
     };
 
     QPngHandlerPrivate(QPngHandler *qq)
-        : gamma(0.0), fileGamma(0.0), quality(2), png_ptr(0), info_ptr(0), end_info(0), state(Ready), q(qq)
+        : gamma(0.0), fileGamma(0.0), quality(50), compression(50), png_ptr(0), info_ptr(0), end_info(0), state(Ready), q(qq)
     { }
 
     float gamma;
     float fileGamma;
-    int quality;
+    int quality; // quality is used for backward compatibility, maps to compression
+    int compression;
     QString description;
     QSize scaledSize;
     QStringList readTexts;
@@ -161,11 +162,11 @@ public:
     void setGamma(float);
 
     bool writeImage(const QImage& img, int x, int y);
-    bool writeImage(const QImage& img, volatile int quality, const QString &description, int x, int y);
+    bool writeImage(const QImage& img, volatile int compression_in, const QString &description, int x, int y);
     bool writeImage(const QImage& img)
         { return writeImage(img, 0, 0); }
-    bool writeImage(const QImage& img, int quality, const QString &description)
-        { return writeImage(img, quality, description, 0, 0); }
+    bool writeImage(const QImage& img, int compression, const QString &description)
+        { return writeImage(img, compression, description, 0, 0); }
 
     QIODevice* device() { return dev; }
 
@@ -814,7 +815,7 @@ bool QPNGImageWriter::writeImage(const QImage& image, int off_x, int off_y)
     return writeImage(image, -1, QString(), off_x, off_y);
 }
 
-bool QPNGImageWriter::writeImage(const QImage& image, volatile int quality_in, const QString &description,
+bool QPNGImageWriter::writeImage(const QImage& image, volatile int compression_in, const QString &description,
                                  int off_x_in, int off_y_in)
 {
     QPoint offset = image.offset();
@@ -842,13 +843,13 @@ bool QPNGImageWriter::writeImage(const QImage& image, volatile int quality_in, c
         return false;
     }
 
-    int quality = quality_in;
-    if (quality >= 0) {
-        if (quality > 9) {
-            qWarning("PNG: Quality %d out of range", quality);
-            quality = 9;
+    int compression = compression_in;
+    if (compression >= 0) {
+        if (compression > 9) {
+            qWarning("PNG: Compression %d out of range", compression);
+            compression = 9;
         }
-        png_set_compression_level(png_ptr, quality);
+        png_set_compression_level(png_ptr, compression);
     }
 
     png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn);
@@ -1067,15 +1068,21 @@ bool QPNGImageWriter::writeImage(const QImage& image, volatile int quality_in, c
 }
 
 static bool write_png_image(const QImage &image, QIODevice *device,
-                            int quality, float gamma, const QString &description)
+                            int compression, int quality, float gamma, const QString &description)
 {
+    // quality is used for backward compatibility, maps to compression
+
     QPNGImageWriter writer(device);
-    if (quality >= 0) {
-        quality = qMin(quality, 100);
-        quality = (100-quality) * 9 / 91; // map [0,100] -> [9,0]
-    }
+    if (compression >= 0)
+        compression = qMin(compression, 100);
+    else if (quality >= 0)
+        compression = 100 - qMin(quality, 100);
+
+    if (compression >= 0)
+        compression = (compression * 9) / 91; // map [0,100] -> [0,9]
+
     writer.setGamma(gamma);
-    return writer.writeImage(image, quality, description);
+    return writer.writeImage(image, compression, description);
 }
 
 QPngHandler::QPngHandler()
@@ -1122,7 +1129,7 @@ bool QPngHandler::read(QImage *image)
 
 bool QPngHandler::write(const QImage &image)
 {
-    return write_png_image(image, device(), d->quality, d->gamma, d->description);
+    return write_png_image(image, device(), d->compression, d->quality, d->gamma, d->description);
 }
 
 bool QPngHandler::supportsOption(ImageOption option) const
@@ -1131,6 +1138,7 @@ bool QPngHandler::supportsOption(ImageOption option) const
         || option == Description
         || option == ImageFormat
         || option == Quality
+        || option == CompressionRatio
         || option == Size
         || option == ScaledSize;
 }
@@ -1146,6 +1154,8 @@ QVariant QPngHandler::option(ImageOption option) const
         return d->gamma == 0.0 ? d->fileGamma : d->gamma;
     else if (option == Quality)
         return d->quality;
+    else if (option == CompressionRatio)
+        return d->compression;
     else if (option == Description)
         return d->description;
     else if (option == Size)
@@ -1164,6 +1174,8 @@ void QPngHandler::setOption(ImageOption option, const QVariant &value)
         d->gamma = value.toFloat();
     else if (option == Quality)
         d->quality = value.toInt();
+    else if (option == CompressionRatio)
+        d->compression = value.toInt();
     else if (option == Description)
         d->description = value.toString();
     else if (option == ScaledSize)