Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c

12 files changed, 214 insertions, 1181 deletions

diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index b482a6e142..085ec90c4b 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -14,7 +14,6 @@ HEADERS += \
         image/qpaintengine_pic_p.h \
         image/qpicture.h \
         image/qpicture_p.h \
-        image/qpictureformatplugin.h \
         image/qpixmap.h \
         image/qpixmap_raster_p.h \
         image/qpixmap_blitter_p.h \
@@ -38,7 +37,6 @@ SOURCES += \
         image/qimagewriter.cpp \
         image/qpaintengine_pic.cpp \
         image/qpicture.cpp \
-        image/qpictureformatplugin.cpp \
         image/qpixmap.cpp \
         image/qpixmapcache.cpp \
         image/qplatformpixmap.cpp \
@@ -79,7 +77,18 @@ qtConfig(png) {
 }
 
 # SIMD
-SSSE3_SOURCES += image/qimage_ssse3.cpp
-NEON_SOURCES += image/qimage_neon.cpp
-MIPS_DSPR2_SOURCES += image/qimage_mips_dspr2.cpp
-MIPS_DSPR2_ASM += image/qimage_mips_dspr2_asm.S
+!android {
+    SSSE3_SOURCES += image/qimage_ssse3.cpp
+    NEON_SOURCES += image/qimage_neon.cpp
+    MIPS_DSPR2_SOURCES += image/qimage_mips_dspr2.cpp
+    MIPS_DSPR2_ASM += image/qimage_mips_dspr2_asm.S
+} else {
+    # see https://developer.android.com/ndk/guides/abis
+    arm64-v8a {
+        SOURCES += image/qimage_neon.cpp
+    }
+    x86 | x86_64 {
+        DEFINES += QT_COMPILER_SUPPORTS_SSE2 QT_COMPILER_SUPPORTS_SSE3 QT_COMPILER_SUPPORTS_SSSE3
+        SOURCES += image/qimage_ssse3.cpp
+    }
+}
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index cd2fe5bc10..b7f67cd7ef 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -287,6 +287,7 @@ bool QImageData::checkForAlphaPixels() const
     case QImage::Format_RGB555:
     case QImage::Format_RGB666:
     case QImage::Format_RGB888:
+    case QImage::Format_BGR888:
     case QImage::Format_RGBX8888:
     case QImage::Format_BGR30:
     case QImage::Format_RGB30:
@@ -716,10 +717,11 @@ bool QImageData::checkForAlphaPixels() const
     \value Format_Grayscale8 The image is stored using an 8-bit grayscale format. (added in Qt 5.5)
     \value Format_Grayscale16 The image is stored using an 16-bit grayscale format. (added in Qt 5.13)
     \value Format_RGBX64     The image is stored using a 64-bit halfword-ordered RGB(x) format (16-16-16-16).
-                             This is the same as the Format_RGBX64 except alpha must always be 65535. (added in Qt 5.12)
+                             This is the same as the Format_RGBA64 except alpha must always be 65535. (added in Qt 5.12)
     \value Format_RGBA64     The image is stored using a 64-bit halfword-ordered RGBA format (16-16-16-16). (added in Qt 5.12)
     \value Format_RGBA64_Premultiplied    The image is stored using a premultiplied 64-bit halfword-ordered
                              RGBA format (16-16-16-16). (added in Qt 5.12)
+    \value Format_BGR888     The image is stored using a 24-bit BGR format. (added in Qt 5.14)
 
     \note Drawing into a QImage with QImage::Format_Indexed8 is not
     supported.
@@ -5550,6 +5552,19 @@ static Q_CONSTEXPR QPixelFormat pixelformats[] = {
                     /*PREMULTIPLIED*/     QPixelFormat::NotPremultiplied,
                     /*INTERPRETATION*/    QPixelFormat::UnsignedShort,
                     /*BYTE ORDER*/        QPixelFormat::CurrentSystemEndian),
+        //QImage::Format_BGR888:
+        QPixelFormat(QPixelFormat::BGR,
+                    /*RED*/                8,
+                    /*GREEN*/              8,
+                    /*BLUE*/               8,
+                    /*FOURTH*/             0,
+                    /*FIFTH*/              0,
+                    /*ALPHA*/              0,
+                    /*ALPHA USAGE*/       QPixelFormat::IgnoresAlpha,
+                    /*ALPHA POSITION*/    QPixelFormat::AtBeginning,
+                    /*PREMULTIPLIED*/     QPixelFormat::NotPremultiplied,
+                    /*INTERPRETATION*/    QPixelFormat::UnsignedByte,
+                    /*BYTE ORDER*/        QPixelFormat::CurrentSystemEndian),
 };
 Q_STATIC_ASSERT(sizeof(pixelformats) / sizeof(*pixelformats) == QImage::NImageFormats);
 
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 3f0d900a70..c657d6067f 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -131,6 +131,7 @@ public:
         Format_RGBA64,
         Format_RGBA64_Premultiplied,
         Format_Grayscale16,
+        Format_BGR888,
 #ifndef Q_QDOC
         NImageFormats
 #endif
diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp
index 837ac88470..539bac222a 100644
--- a/src/gui/image/qimage_conversions.cpp
+++ b/src/gui/image/qimage_conversions.cpp
@@ -429,8 +429,8 @@ typedef void (QT_FASTCALL *Rgb888ToRgbConverter)(quint32 *dst, const uchar *src,
 template <bool rgbx>
 static void convert_RGB888_to_RGB(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags)
 {
-    Q_ASSERT(src->format == QImage::Format_RGB888);
-    if (rgbx)
+    Q_ASSERT(src->format == QImage::Format_RGB888 || src->format == QImage::Format_BGR888);
+    if (rgbx ^ (src->format == QImage::Format_BGR888))
         Q_ASSERT(dest->format == QImage::Format_RGBX8888 || dest->format == QImage::Format_RGBA8888 || dest->format == QImage::Format_RGBA8888_Premultiplied);
     else
         Q_ASSERT(dest->format == QImage::Format_RGB32 || dest->format == QImage::Format_ARGB32 || dest->format == QImage::Format_ARGB32_Premultiplied);
@@ -1421,6 +1421,69 @@ static void convert_RGBA64_to_gray16(QImageData *dest, const QImageData *src, Qt
     }
 }
 
+static void convert_RGB888_to_BGR888(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags)
+{
+    Q_ASSERT(src->format == QImage::Format_RGB888 || src->format == QImage::Format_BGR888);
+    Q_ASSERT(dest->format == QImage::Format_RGB888 || dest->format == QImage::Format_BGR888);
+    Q_ASSERT(src->width == dest->width);
+    Q_ASSERT(src->height == dest->height);
+
+    const qsizetype sbpl = src->bytes_per_line;
+    const qsizetype dbpl = dest->bytes_per_line;
+    const uchar *src_data = src->data;
+    uchar *dest_data = dest->data;
+
+    for (int i = 0; i < src->height; ++i) {
+        int pixel = 0;
+        // Handle 4 pixels (12 bytes) at a time
+        for (; pixel + 3 < src->width; pixel += 4) {
+            const uchar *src = src_data + pixel * 3;
+            quint32 *dest_packed = (quint32 *) (dest_data + pixel * 3);
+            dest_packed[0] = (src[5] << 24) | (src[0] << 16) | (src[1] << 8) | (src[2] << 0);
+            dest_packed[1] = (src[7] << 24) | (src[8] << 16) | (src[3] << 8) | (src[4] << 0);
+            dest_packed[2] = (src[9] << 24) | (src[10] << 16) | (src[11] << 8) | (src[6] << 0);
+        }
+
+        // epilog: handle left over pixels
+        for (; pixel < src->width; ++pixel) {
+            dest_data[pixel * 3 + 0] = src_data[pixel * 3 + 2];
+            dest_data[pixel * 3 + 1] = src_data[pixel * 3 + 1];
+            dest_data[pixel * 3 + 2] = src_data[pixel * 3 + 0];
+        }
+
+        src_data += sbpl;
+        dest_data += dbpl;
+    }
+}
+
+static bool convert_RGB888_to_BGR888_inplace(QImageData *data, Qt::ImageConversionFlags)
+{
+    Q_ASSERT(data->format == QImage::Format_RGB888 || data->format == QImage::Format_BGR888);
+
+    const qsizetype bpl = data->bytes_per_line;
+    uchar *line_data = data->data;
+
+    for (int i = 0; i < data->height; ++i) {
+        for (int j = 0; j < data->width; ++j)
+            qSwap(line_data[j * 3 + 0], line_data[j * 3 + 2]);
+        line_data += bpl;
+    }
+
+    switch (data->format) {
+    case QImage::Format_RGB888:
+        data->format = QImage::Format_BGR888;
+        break;
+    case QImage::Format_BGR888:
+        data->format = QImage::Format_RGB888;
+        break;
+    default:
+        Q_UNREACHABLE();
+        data->format = QImage::Format_Invalid;
+        return false;
+    }
+    return true;
+}
+
 static QVector<QRgb> fix_color_table(const QVector<QRgb> &ctbl, QImage::Format format)
 {
     QVector<QRgb> colorTable = ctbl;
@@ -2265,7 +2328,7 @@ static bool convert_Grayscale8_to_Indexed8_inplace(QImageData *data, Qt::ImageCo
 Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormats] =
 {
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
         0,
@@ -2286,7 +2349,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_Mono
 
     {
@@ -2308,7 +2371,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_MonoLSB
 
     {
@@ -2333,7 +2396,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0, 0, 0, 0, 0,
         convert_Indexed8_to_Alpha8,
         convert_Indexed8_to_Grayscale8,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_Indexed8
 
     {
@@ -2361,7 +2424,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_RGB_to_RGB30<PixelOrderRGB, false>,
         0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_RGB32
 
     {
@@ -2391,7 +2454,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0, 0,
         0,
         convert_ARGB32_to_RGBA64<false>,
-        0, 0
+        0, 0, 0
     }, // Format_ARGB32
 
     {
@@ -2416,7 +2479,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_ARGB_to_RGBA,
         0, 0, 0, 0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     },  // Format_ARGB32_Premultiplied
 
     {
@@ -2438,7 +2501,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB16
 
     {
@@ -2460,7 +2523,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_ARGB8565_Premultiplied
 
     {
@@ -2482,7 +2545,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB666
 
     {
@@ -2504,7 +2567,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_ARGB6666_Premultiplied
 
     {
@@ -2526,7 +2589,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB555
 
     {
@@ -2548,7 +2611,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_ARGB8555_Premultiplied
 
     {
@@ -2565,13 +2628,14 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0,
+        0, // self
         0,
         0,
         convert_RGB888_to_RGB<true>,
         convert_RGB888_to_RGB<true>,
         convert_RGB888_to_RGB<true>,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        convert_RGB888_to_BGR888,
     }, // Format_RGB888
 
     {
@@ -2593,7 +2657,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB444
 
     {
@@ -2614,7 +2678,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_ARGB4444_Premultiplied
     {
         0,
@@ -2641,7 +2705,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_RGB_to_RGB30<PixelOrderRGB, true>,
         0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_RGBX8888
     {
         0,
@@ -2670,7 +2734,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0, 0,
         0,
         convert_ARGB32_to_RGBA64<true>,
-        0, 0
+        0, 0, 0
     }, // Format_RGBA8888
 
     {
@@ -2692,7 +2756,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGBA8888_Premultiplied
 
     {
@@ -2720,7 +2784,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_BGR30_to_RGB30,
         convert_BGR30_to_RGB30,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_BGR30
     {
         0,
@@ -2747,7 +2811,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_A2RGB30_PM_to_RGB30<true>,
         convert_BGR30_to_RGB30,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_A2BGR30_Premultiplied
     {
         0,
@@ -2773,7 +2837,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_BGR30_to_RGB30,
         0,
         convert_passthrough,
-        0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB30
     {
         0,
@@ -2800,7 +2864,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_A2RGB30_PM_to_RGB30<false>,
         0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_A2RGB30_Premultiplied
     {
         0,
@@ -2820,7 +2884,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_Alpha8
     {
         0,
@@ -2840,14 +2904,15 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_Grayscale8
     {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, // self
         convert_passthrough,
         convert_passthrough,
-        convert_RGBA64_to_gray16
+        convert_RGBA64_to_gray16,
+        0
     }, // Format_RGBX64
     {
         0,
@@ -2874,6 +2939,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_RGBA64_to_RGBx64,
         0, // self
         convert_RGBA64_to_RGBA64PM,
+        0,
         0
     }, // Format_RGBA64
     {
@@ -2901,7 +2967,8 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_RGBA64PM_to_RGBA64<true>,
         convert_RGBA64PM_to_RGBA64<false>,
         0, // self
-        convert_RGBA64_to_gray16
+        convert_RGBA64_to_gray16,
+        0
     }, // Format_RGBA64_Premultiplied
     {
         0,
@@ -2931,20 +2998,46 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
         convert_gray16_to_RGBA64,
         convert_gray16_to_RGBA64,
         convert_gray16_to_RGBA64,
-        0  // self
+        0,  // self
+        0
     }, // Format_Grayscale16
+    {
+        0,
+        0,
+        0,
+        0,
+        0, 0, 0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        convert_RGB888_to_BGR888,
+        0,
+        0,
+#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+        convert_RGB888_to_RGB<false>,
+        convert_RGB888_to_RGB<false>,
+        convert_RGB888_to_RGB<false>,
+#else
+        0, 0, 0,
+#endif
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, // self
+    }, // Format_BGR888
 };
 
 InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QImage::NImageFormats] =
 {
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_Mono
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_MonoLSB
     {
         0,
@@ -2968,7 +3061,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         0, 0, 0, 0, 0,
         convert_Indexed8_to_Alpha8_inplace,
         convert_Indexed8_to_Grayscale8_inplace,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_Indexed8
     {
         0,
@@ -2995,7 +3088,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         convert_RGB_to_RGB30_inplace<PixelOrderRGB, false>,
         0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_RGB32
     {
         0,
@@ -3022,7 +3115,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         convert_RGB_to_RGB30_inplace<PixelOrderRGB, false>,
         0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_ARGB32
     {
         0,
@@ -3046,34 +3139,35 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         convert_ARGB_to_RGBA_inplace<QImage::Format_RGBA8888_Premultiplied>,
         0, 0, 0, 0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     },  // Format_ARGB32_Premultiplied
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB16
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_ARGB8565_Premultiplied
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB666
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_ARGB6666_Premultiplied
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB555
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_ARGB8555_Premultiplied
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        convert_RGB888_to_BGR888_inplace
     }, // Format_RGB888
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB444
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_ARGB4444_Premultiplied
     {
         0,
@@ -3100,7 +3194,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         convert_RGB_to_RGB30_inplace<PixelOrderRGB, true>,
         0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_RGBX8888
     {
         0,
@@ -3127,7 +3221,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         convert_RGB_to_RGB30_inplace<PixelOrderRGB, true>,
         0,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_RGBA8888
     {
         0,
@@ -3149,7 +3243,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         0,
         0,
         0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_RGBA8888_Premultiplied
     {
         0,
@@ -3176,7 +3270,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         convert_BGR30_to_RGB30_inplace,
         convert_BGR30_to_A2RGB30_inplace,
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_BGR30
     {
         0,
@@ -3202,7 +3296,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         0, // self
         convert_A2RGB30_PM_to_RGB30_inplace<true>,
         convert_BGR30_to_RGB30_inplace,
-        0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0
     }, // Format_A2BGR30_Premultiplied
     {
         0,
@@ -3228,7 +3322,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         convert_BGR30_to_A2RGB30_inplace,
         0, // self
         convert_passthrough_inplace<QImage::Format_A2RGB30_Premultiplied>,
-        0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0
     }, // Format_RGB30
     {
         0,
@@ -3255,7 +3349,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         convert_A2RGB30_PM_to_RGB30_inplace<false>,
         0, // self
         0, 0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_A2RGB30_Premultiplied
     {
         0,
@@ -3280,7 +3374,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         0, 0, 0, 0,
         0, // self
         0,
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_Alpha8
     {
         0,
@@ -3305,32 +3399,37 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma
         0, 0, 0, 0,
         0,
         0, // self
-        0, 0, 0, 0
+        0, 0, 0, 0, 0
     }, // Format_Grayscale8
     {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, // self
         convert_passthrough_inplace<QImage::Format_RGBA64>,
         convert_passthrough_inplace<QImage::Format_RGBA64_Premultiplied>,
-        0
+        0, 0
     }, // Format_RGBX64
     {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         convert_RGBA64_to_RGBx64_inplace,
         0, // self
         convert_RGBA64_to_RGBA64PM_inplace,
-        0
+        0, 0
     }, // Format_RGBA64
     {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         convert_RGBA64PM_to_RGBA64_inplace<true>,
         convert_RGBA64PM_to_RGBA64_inplace<false>,
         0, // self
-        0
+        0, 0
     }, // Format_RGBA64_Premultiplied
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }, // Format_Grayscale16
+    {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        convert_RGB888_to_BGR888_inplace,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    }, // Format_BGR888
 };
 
 static void qInitImageConversions()
@@ -3341,6 +3440,9 @@ static void qInitImageConversions()
         qimage_converter_map[QImage::Format_RGB888][QImage::Format_RGB32] = convert_RGB888_to_RGB32_ssse3;
         qimage_converter_map[QImage::Format_RGB888][QImage::Format_ARGB32] = convert_RGB888_to_RGB32_ssse3;
         qimage_converter_map[QImage::Format_RGB888][QImage::Format_ARGB32_Premultiplied] = convert_RGB888_to_RGB32_ssse3;
+        qimage_converter_map[QImage::Format_BGR888][QImage::Format_RGBX8888] = convert_RGB888_to_RGB32_ssse3;
+        qimage_converter_map[QImage::Format_BGR888][QImage::Format_RGBA8888] = convert_RGB888_to_RGB32_ssse3;
+        qimage_converter_map[QImage::Format_BGR888][QImage::Format_RGBA8888_Premultiplied] = convert_RGB888_to_RGB32_ssse3;
     }
 #endif
 
diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h
index 1cd0e8e0aa..2b1720580a 100644
--- a/src/gui/image/qimage_p.h
+++ b/src/gui/image/qimage_p.h
@@ -207,6 +207,7 @@ inline int qt_depthForFormat(QImage::Format format)
     case QImage::Format_ARGB8565_Premultiplied:
     case QImage::Format_ARGB8555_Premultiplied:
     case QImage::Format_RGB888:
+    case QImage::Format_BGR888:
         depth = 24;
         break;
     case QImage::Format_RGBX64:
diff --git a/src/gui/image/qimage_ssse3.cpp b/src/gui/image/qimage_ssse3.cpp
index 9cdfba20e3..fb81a1a6c3 100644
--- a/src/gui/image/qimage_ssse3.cpp
+++ b/src/gui/image/qimage_ssse3.cpp
@@ -121,8 +121,11 @@ Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_ssse3(quint32 *dst, con
 
 void convert_RGB888_to_RGB32_ssse3(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags)
 {
-    Q_ASSERT(src->format == QImage::Format_RGB888);
-    Q_ASSERT(dest->format == QImage::Format_RGB32 || dest->format == QImage::Format_ARGB32 || dest->format == QImage::Format_ARGB32_Premultiplied);
+    Q_ASSERT(src->format == QImage::Format_RGB888 || src->format == QImage::Format_BGR888);
+    if (src->format == QImage::Format_BGR888)
+        Q_ASSERT(dest->format == QImage::Format_RGBX8888 || dest->format == QImage::Format_RGBA8888 || dest->format == QImage::Format_RGBA8888_Premultiplied);
+    else
+        Q_ASSERT(dest->format == QImage::Format_RGB32 || dest->format == QImage::Format_ARGB32 || dest->format == QImage::Format_ARGB32_Premultiplied);
     Q_ASSERT(src->width == dest->width);
     Q_ASSERT(src->height == dest->height);
 
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index 8548f1857e..84de91353a 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -263,14 +263,14 @@ void QPicture::setData(const char* data, uint size)
     \sa save()
 */
 
-bool QPicture::load(const QString &fileName, const char *format)
+bool QPicture::load(const QString &fileName)
 {
     QFile f(fileName);
     if (!f.open(QIODevice::ReadOnly)) {
         operator=(QPicture());
         return false;
     }
-    return load(&f, format);
+    return load(&f);
 }
 
 /*!
@@ -279,21 +279,8 @@ bool QPicture::load(const QString &fileName, const char *format)
     \a dev is the device to use for loading.
 */
 
-bool QPicture::load(QIODevice *dev, const char *format)
+bool QPicture::load(QIODevice *dev)
 {
-    if(format) {
-#ifndef QT_NO_PICTUREIO
-        QPictureIO io(dev, format);
-        if (io.read()) {
-            operator=(io.picture());
-            return true;
-        }
-#endif
-        qWarning("QPicture::load: No such picture format: %s", format);
-        operator=(QPicture());
-        return false;
-    }
-
     detach();
     QByteArray a = dev->readAll();
 
@@ -311,7 +298,7 @@ bool QPicture::load(QIODevice *dev, const char *format)
     \sa load()
 */
 
-bool QPicture::save(const QString &fileName, const char *format)
+bool QPicture::save(const QString &fileName)
 {
     if (paintingActive()) {
         qWarning("QPicture::save: still being painted on. "
@@ -319,27 +306,10 @@ bool QPicture::save(const QString &fileName, const char *format)
         return false;
     }
 
-
-    if(format) {
-#ifndef QT_NO_PICTUREIO
-        QPictureIO io(fileName, format);
-        bool result = io.write();
-        if (result) {
-            operator=(io.picture());
-        } else if (format)
-#else
-        bool result = false;
-#endif
-        {
-            qWarning("QPicture::save: No such picture format: %s", format);
-        }
-        return result;
-    }
-
     QFile f(fileName);
     if (!f.open(QIODevice::WriteOnly))
         return false;
-    return save(&f, format);
+    return save(&f);
 }
 
 /*!
@@ -348,7 +318,7 @@ bool QPicture::save(const QString &fileName, const char *format)
     \a dev is the device to use for saving.
 */
 
-bool QPicture::save(QIODevice *dev, const char *format)
+bool QPicture::save(QIODevice *dev)
 {
     if (paintingActive()) {
         qWarning("QPicture::save: still being painted on. "
@@ -356,22 +326,6 @@ bool QPicture::save(QIODevice *dev, const char *format)
         return false;
     }
 
-    if(format) {
-#ifndef QT_NO_PICTUREIO
-        QPictureIO io(dev, format);
-        bool result = io.write();
-        if (result) {
-            operator=(io.picture());
-        } else if (format)
-#else
-        bool result = false;
-#endif
-        {
-            qWarning("QPicture::save: No such picture format: %s", format);
-        }
-        return result;
-    }
-
     dev->write(d_func()->pictb.buffer(), d_func()->pictb.buffer().size());
     return true;
 }
@@ -1188,780 +1142,6 @@ QDataStream &operator>>(QDataStream &s, QPicture &r)
 }
 #endif // QT_NO_DATASTREAM
 
-
-#ifndef QT_NO_PICTUREIO
-
-QT_BEGIN_INCLUDE_NAMESPACE
-#include "qregexp.h"
-#include "qpictureformatplugin.h"
-QT_END_INCLUDE_NAMESPACE
-
-#if QT_DEPRECATED_SINCE(5, 10)
-/*!
-    \obsolete
-
-    Returns a string that specifies the picture format of the file \a
-    fileName, or \nullptr if the file cannot be read or if the format
-    is not recognized.
-
-    \sa load(), save()
-*/
-
-const char* QPicture::pictureFormat(const QString &fileName)
-{
-    const QByteArray format = QPictureIO::pictureFormat(fileName);
-    // This function returns a const char * from a QByteArray.
-    // Double check that the QByteArray is not detached, otherwise
-    // we would return a dangling pointer.
-    Q_ASSERT(!format.isDetached());
-    return format;
-}
-
-/*!
-    \obsolete
-
-    Returns a list of picture formats that are supported for picture
-    input.
-
-    \sa outputFormats(), inputFormatList(), QPictureIO
-*/
-QList<QByteArray> QPicture::inputFormats()
-{
-    return QPictureIO::inputFormats();
-}
-
-static QStringList qToStringList(const QList<QByteArray> &arr)
-{
-    QStringList list;
-    const int count = arr.count();
-    list.reserve(count);
-    for (int i = 0; i < count; ++i)
-        list.append(QString::fromLatin1(arr.at(i)));
-    return list;
-}
-
-/*!
-    \obsolete
-
-    Returns a list of picture formats that are supported for picture
-    input.
-
-    Note that if you want to iterate over the list, you should iterate
-    over a copy, e.g.
-    \snippet picture/picture.cpp 2
-
-    \sa outputFormatList(), inputFormats(), QPictureIO
-*/
-QStringList QPicture::inputFormatList()
-{
-    return qToStringList(QPictureIO::inputFormats());
-}
-
-
-/*!
-    \obsolete
-
-    Returns a list of picture formats that are supported for picture
-    output.
-
-    Note that if you want to iterate over the list, you should iterate
-    over a copy, e.g.
-    \snippet picture/picture.cpp 3
-
-    \sa inputFormatList(), outputFormats(), QPictureIO
-*/
-QStringList QPicture::outputFormatList()
-{
-    return qToStringList(QPictureIO::outputFormats());
-}
-
-/*!
-    \obsolete
-
-    Returns a list of picture formats that are supported for picture
-    output.
-
-    \sa inputFormats(), outputFormatList(), QPictureIO
-*/
-QList<QByteArray> QPicture::outputFormats()
-{
-    return QPictureIO::outputFormats();
-}
-#endif // QT_DEPRECATED_SINCE(5, 10)
-
-/*****************************************************************************
-  QPictureIO member functions
- *****************************************************************************/
-
-/*!
-    \obsolete
-
-    \class QPictureIO
-
-    \brief The QPictureIO class contains parameters for loading and
-    saving pictures.
-
-    \ingroup painting
-    \ingroup io
-    \inmodule QtGui
-
-    QPictureIO contains a QIODevice object that is used for picture data
-    I/O. The programmer can install new picture file formats in addition
-    to those that Qt provides.
-
-    You don't normally need to use this class; QPicture::load(),
-    QPicture::save().
-
-    \sa QPicture, QPixmap, QFile
-*/
-
-struct QPictureIOData
-{
-    QPicture        pi;                                // picture
-    int                iostat;                                // IO status
-    QByteArray        frmt;                                // picture format
-    QIODevice  *iodev;                                // IO device
-    QString        fname;                                // file name
-    QString     descr;                                // picture description
-    const char *parameters;
-    int quality;
-    float gamma;
-};
-
-/*!
-    Constructs a QPictureIO object with all parameters set to zero.
-*/
-
-QPictureIO::QPictureIO()
-{
-    init();
-}
-
-/*!
-    Constructs a QPictureIO object with the I/O device \a ioDevice and a
-    \a format tag.
-*/
-
-QPictureIO::QPictureIO(QIODevice *ioDevice, const char *format)
-{
-    init();
-    d->iodev = ioDevice;
-    d->frmt = format;
-}
-
-/*!
-    Constructs a QPictureIO object with the file name \a fileName and a
-    \a format tag.
-*/
-
-QPictureIO::QPictureIO(const QString &fileName, const char* format)
-{
-    init();
-    d->frmt = format;
-    d->fname = fileName;
-}
-
-/*!
-    Contains initialization common to all QPictureIO constructors.
-*/
-
-void QPictureIO::init()
-{
-    d = new QPictureIOData();
-    d->parameters = 0;
-    d->quality = -1; // default quality of the current format
-    d->gamma=0.0f;
-    d->iostat = 0;
-    d->iodev  = 0;
-}
-
-/*!
-    Destroys the object and all related data.
-*/
-
-QPictureIO::~QPictureIO()
-{
-    if (d->parameters)
-        delete [] d->parameters;
-    delete d;
-}
-
-
-/*****************************************************************************
-  QPictureIO picture handler functions
- *****************************************************************************/
-
-class QPictureHandler
-{
-public:
-    QPictureHandler(const char *f, const char *h, const QByteArray& fl,
-                     picture_io_handler r, picture_io_handler w);
-    QByteArray              format;                        // picture format
-    QRegExp              header;                        // picture header pattern
-    enum TMode { Untranslated=0, TranslateIn, TranslateInOut } text_mode;
-    picture_io_handler  read_picture;                // picture read function
-    picture_io_handler  write_picture;                // picture write function
-    bool              obsolete;                        // support not "published"
-};
-
-QPictureHandler::QPictureHandler(const char *f, const char *h, const QByteArray& fl,
-                              picture_io_handler r, picture_io_handler w)
-    : format(f), header(QString::fromLatin1(h))
-{
-    text_mode = Untranslated;
-    if (fl.contains('t'))
-        text_mode = TranslateIn;
-    else if (fl.contains('T'))
-        text_mode = TranslateInOut;
-    obsolete = fl.contains('O');
-    read_picture  = r;
-    write_picture = w;
-}
-
-typedef QList<QPictureHandler *> QPHList;
-Q_GLOBAL_STATIC(QPHList, pictureHandlers)
-
-void qt_init_picture_plugins()
-{
-    typedef QMultiMap<int, QString> PluginKeyMap;
-    typedef PluginKeyMap::const_iterator PluginKeyMapConstIterator;
-
-    static QBasicMutex mutex;
-    QMutexLocker locker(&mutex);
-    static QFactoryLoader loader(QPictureFormatInterface_iid,
-                                 QStringLiteral("/pictureformats"));
-
-    const PluginKeyMap keyMap = loader.keyMap();
-    const PluginKeyMapConstIterator cend = keyMap.constEnd();
-    for (PluginKeyMapConstIterator it = keyMap.constBegin(); it != cend; ++it) {
-        if (QPictureFormatPlugin *format = qobject_cast<QPictureFormatPlugin*>(loader.instance(it.key())))
-            format->installIOHandler(it.value());
-    }
-}
-
-static void cleanup()
-{
-    // make sure that picture handlers are delete before plugin manager
-    if (QPHList *list = pictureHandlers()) {
-        qDeleteAll(*list);
-        list->clear();
-    }
-}
-
-void qt_init_picture_handlers()                // initialize picture handlers
-{
-    static QBasicAtomicInt done = Q_BASIC_ATOMIC_INITIALIZER(0);
-    if (done.testAndSetRelaxed(0, 1)) {
-        qAddPostRoutine(cleanup);
-    }
-}
-
-static QPictureHandler *get_picture_handler(const char *format)
-{                                                // get pointer to handler
-    qt_init_picture_handlers();
-    qt_init_picture_plugins();
-    if (QPHList *list = pictureHandlers()) {
-        for (int i = 0; i < list->size(); ++i) {
-            if (list->at(i)->format == format)
-                return list->at(i);
-        }
-    }
-    return 0;                                        // no such handler
-}
-
-
-/*!
-    Defines a picture I/O handler for the picture format called \a
-    format, which is recognized using the regular
-    expression defined in \a header, read using \a readPicture and
-    written using \a writePicture.
-
-    \a flags is a string of single-character flags for this format.
-    The only flag defined currently is T (upper case), so the only
-    legal value for \a flags are "T" and the empty string. The "T"
-    flag means that the picture file is a text file, and Qt should treat
-    all newline conventions as equivalent. (XPM files and some PPM
-    files are text files for example.)
-
-    \a format is used to select a handler to write a QPicture; \a header
-    is used to select a handler to read an picture file.
-
-    If \a readPicture is \nullptr, the QPictureIO will not be able
-    to read pictures in \a format. If \a writePicture is \nullptr,
-    the QPictureIO will not be able to write pictures in \a format. If
-    both are null, the QPictureIO object is valid but useless.
-
-    Example:
-    \snippet picture/picture.cpp 6
-    \codeline
-    \snippet picture/picture.cpp 7
-    \codeline
-    \snippet picture/picture.cpp 8
-
-    Before the regular expression test, all the 0 bytes in the file header are
-    converted to 1 bytes. This is done because when Qt was ASCII-based, QRegExp
-    could not handle 0 bytes in strings.
-
-    The regexp is only applied on the first 14 bytes of the file.
-
-    (Note that if one handlerIO supports writing a format and another
-    supports reading it, Qt supports both reading and writing. If two
-    handlers support the same operation, Qt chooses one arbitrarily.)
-*/
-
-void QPictureIO::defineIOHandler(const char *format,
-                                 const char *header,
-                                 const char *flags,
-                                 picture_io_handler readPicture,
-                                 picture_io_handler writePicture)
-{
-    qt_init_picture_handlers();
-    if (QPHList *list = pictureHandlers()) {
-        QPictureHandler *p;
-        p = new QPictureHandler(format, header, QByteArray(flags), readPicture, writePicture);
-        list->prepend(p);
-    }
-}
-
-
-/*****************************************************************************
-  QPictureIO normal member functions
- *****************************************************************************/
-
-/*!
-    Returns the picture currently set.
-
-    \sa setPicture()
-*/
-const QPicture &QPictureIO::picture() const { return d->pi; }
-
-/*!
-    Returns the picture's IO status. A non-zero value indicates an
-    error, whereas 0 means that the IO operation was successful.
-
-    \sa setStatus()
-*/
-int QPictureIO::status() const { return d->iostat; }
-
-/*!
-    Returns the picture format string or \nullptr if no format has been
-    explicitly set.
-*/
-const char *QPictureIO::format() const { return d->frmt; }
-
-/*!
-    Returns the IO device currently set.
-
-    \sa setIODevice()
-*/
-QIODevice *QPictureIO::ioDevice() const { return d->iodev; }
-
-/*!
-    Returns the file name currently set.
-
-    \sa setFileName()
-*/
-QString QPictureIO::fileName() const { return d->fname; }
-
-
-/*!
-    Returns the picture description string.
-
-    \sa setDescription()
-*/
-QString QPictureIO::description() const { return d->descr; }
-
-/*!
-    Sets the picture to \a picture.
-
-    \sa picture()
-*/
-void QPictureIO::setPicture(const QPicture &picture)
-{
-    d->pi = picture;
-}
-
-/*!
-    Sets the picture IO status to \a status. A non-zero value indicates
-    an error, whereas 0 means that the IO operation was successful.
-
-    \sa status()
-*/
-void QPictureIO::setStatus(int status)
-{
-    d->iostat = status;
-}
-
-/*!
-    Sets the picture format to \a format for the picture to be read or
-    written.
-
-    It is necessary to specify a format before writing an picture, but
-    it is not necessary to specify a format before reading an picture.
-
-    If no format has been set, Qt guesses the picture format before
-    reading it. If a format is set the picture will only be read if it
-    has that format.
-
-    \sa read(), write(), format()
-*/
-void QPictureIO::setFormat(const char *format)
-{
-    d->frmt = format;
-}
-
-/*!
-    Sets the IO device to be used for reading or writing an picture.
-
-    Setting the IO device allows pictures to be read/written to any
-    block-oriented QIODevice.
-
-    If \a ioDevice is not null, this IO device will override file name
-    settings.
-
-    \sa setFileName()
-*/
-void QPictureIO::setIODevice(QIODevice *ioDevice)
-{
-    d->iodev = ioDevice;
-}
-
-/*!
-    Sets the name of the file to read or write an picture from to \a
-    fileName.
-
-    \sa setIODevice()
-*/
-void QPictureIO::setFileName(const QString &fileName)
-{
-    d->fname = fileName;
-}
-
-/*!
-    Returns the quality of the written picture, related to the
-    compression ratio.
-
-    \sa setQuality(), QPicture::save()
-*/
-int QPictureIO::quality() const
-{
-    return d->quality;
-}
-
-/*!
-    Sets the quality of the written picture to \a q, related to the
-    compression ratio.
-
-    \a q must be in the range -1..100. Specify 0 to obtain small
-    compressed files, 100 for large uncompressed files. (-1 signifies
-    the default compression.)
-
-    \sa quality(), QPicture::save()
-*/
-
-void QPictureIO::setQuality(int q)
-{
-    d->quality = q;
-}
-
-/*!
-    Returns the picture's parameters string.
-
-    \sa setParameters()
-*/
-
-const char *QPictureIO::parameters() const
-{
-    return d->parameters;
-}
-
-/*!
-    Sets the picture's parameter string to \a parameters. This is for
-    picture handlers that require special parameters.
-
-    Although the current picture formats supported by Qt ignore the
-    parameters string, it may be used in future extensions or by
-    contributions (for example, JPEG).
-
-    \sa parameters()
-*/
-
-void QPictureIO::setParameters(const char *parameters)
-{
-    if (d->parameters)
-        delete [] d->parameters;
-    d->parameters = qstrdup(parameters);
-}
-
-/*!
-    Sets the gamma value at which the picture will be viewed to \a
-    gamma. If the picture format stores a gamma value for which the
-    picture is intended to be used, then this setting will be used to
-    modify the picture. Setting to 0.0 will disable gamma correction
-    (i.e. any specification in the file will be ignored).
-
-    The default value is 0.0.
-
-    \sa gamma()
-*/
-void QPictureIO::setGamma(float gamma)
-{
-    d->gamma=gamma;
-}
-
-/*!
-    Returns the gamma value at which the picture will be viewed.
-
-    \sa setGamma()
-*/
-float QPictureIO::gamma() const
-{
-    return d->gamma;
-}
-
-/*!
-    Sets the picture description string for picture handlers that support
-    picture descriptions to \a description.
-
-    Currently, no picture format supported by Qt uses the description
-    string.
-*/
-
-void QPictureIO::setDescription(const QString &description)
-{
-    d->descr = description;
-}
-
-
-/*!
-    Returns a string that specifies the picture format of the file \a
-    fileName, or null if the file cannot be read or if the format is
-    not recognized.
-*/
-
-QByteArray QPictureIO::pictureFormat(const QString &fileName)
-{
-    QFile file(fileName);
-    QByteArray format;
-    if (!file.open(QIODevice::ReadOnly))
-        return format;
-    format = pictureFormat(&file);
-    file.close();
-    return format;
-}
-
-/*!
-    \overload
-
-    Returns a string that specifies the picture format of the picture read
-    from IO device \a d, or 0 if the device cannot be read or if the
-    format is not recognized.
-
-    Make sure that \a d is at the right position in the device (for
-    example, at the beginning of the file).
-
-    \sa QIODevice::pos()
-*/
-
-QByteArray QPictureIO::pictureFormat(QIODevice *d)
-{
-    // if you change this change the documentation for defineIOHandler()
-    const int buflen = 14;
-
-    char buf[buflen];
-    char buf2[buflen];
-    qt_init_picture_handlers();
-    qt_init_picture_plugins();
-    int pos = d->pos();                      // save position
-    int rdlen = d->read(buf, buflen);        // read a few bytes
-
-    QByteArray format;
-    if (rdlen != buflen)
-        return format;
-
-    memcpy(buf2, buf, buflen);
-
-    for (int n = 0; n < rdlen; n++)
-        if (buf[n] == '\0')
-            buf[n] = '\001';
-    if (rdlen > 0) {
-        buf[rdlen - 1] = '\0';
-        QString bufStr = QString::fromLatin1(buf);
-        if (QPHList *list = pictureHandlers()) {
-            for (int i = 0; i < list->size(); ++i) {
-                if (list->at(i)->header.indexIn(bufStr) != -1) { // try match with headers
-                    format = list->at(i)->format;
-                    break;
-                }
-            }
-        }
-    }
-    d->seek(pos);                                // restore position
-    return format;
-}
-
-/*!
-    Returns a sorted list of picture formats that are supported for
-    picture input.
-*/
-QList<QByteArray> QPictureIO::inputFormats()
-{
-    QList<QByteArray> result;
-
-    qt_init_picture_handlers();
-    qt_init_picture_plugins();
-
-    if (QPHList *list = pictureHandlers()) {
-        for (int i = 0; i < list->size(); ++i) {
-            QPictureHandler *p = list->at(i);
-            if (p->read_picture && !p->obsolete  && !result.contains(p->format))
-                result.append(p->format);
-        }
-    }
-    std::sort(result.begin(), result.end());
-
-    return result;
-}
-
-/*!
-    Returns a sorted list of picture formats that are supported for
-    picture output.
-*/
-QList<QByteArray> QPictureIO::outputFormats()
-{
-    qt_init_picture_handlers();
-    qt_init_picture_plugins();
-
-    QList<QByteArray> result;
-    if (QPHList *list = pictureHandlers()) {
-        for (int i = 0; i < list->size(); ++i) {
-            QPictureHandler *p = list->at(i);
-            if (p->write_picture && !p->obsolete && !result.contains(p->format))
-                result.append(p->format);
-        }
-    }
-    return result;
-}
-
-
-
-/*!
-    Reads an picture into memory and returns \c true if the picture was
-    successfully read; otherwise returns \c false.
-
-    Before reading an picture you must set an IO device or a file name.
-    If both an IO device and a file name have been set, the IO device
-    will be used.
-
-    Setting the picture file format string is optional.
-
-    Note that this function does \e not set the \l{format()}{format} used to read the picture. If you need that
-    information, use the pictureFormat() static functions.
-
-    Example:
-
-    \snippet picture/picture.cpp 4
-
-    \sa setIODevice(), setFileName(), setFormat(), write(), QPixmap::load()
-*/
-bool QPictureIO::read()
-{
-    QFile           file;
-    QByteArray      picture_format;
-    QPictureHandler *h;
-
-    if (d->iodev) {                                // read from io device
-        // ok, already open
-    } else if (!d->fname.isEmpty()) {                // read from file
-        file.setFileName(d->fname);
-        if (!file.open(QIODevice::ReadOnly))
-            return false;                        // cannot open file
-        d->iodev = &file;
-    } else {                                        // no file name or io device
-        return false;
-    }
-    if (d->frmt.isEmpty()) {
-        // Try to guess format
-        picture_format = pictureFormat(d->iodev);        // get picture format
-        if (picture_format.isEmpty()) {
-            if (file.isOpen()) {                        // unknown format
-                file.close();
-                d->iodev = 0;
-            }
-            return false;
-        }
-    } else {
-        picture_format = d->frmt;
-    }
-
-    h = get_picture_handler(picture_format);
-    if (file.isOpen()) {
-#if !defined(Q_OS_UNIX)
-        if (h && h->text_mode) {                // reopen in translated mode
-            file.close();
-            file.open(QIODevice::ReadOnly | QIODevice::Text);
-        }
-        else
-#endif
-            file.seek(0);                        // position to start
-    }
-    d->iostat = 1;                                        // assume error
-
-    if (h && h->read_picture)
-        (*h->read_picture)(this);
-
-    if (file.isOpen()) {                        // picture was read using file
-        file.close();
-        d->iodev = 0;
-    }
-    return d->iostat == 0;                                // picture successfully read?
-}
-
-
-/*!
-    Writes an picture to an IO device and returns \c true if the picture was
-    successfully written; otherwise returns \c false.
-
-    Before writing an picture you must set an IO device or a file name.
-    If both an IO device and a file name have been set, the IO device
-    will be used.
-
-    The picture will be written using the specified picture format.
-
-    Example:
-    \snippet picture/picture.cpp 5
-
-    \sa setIODevice(), setFileName(), setFormat(), read(), QPixmap::save()
-*/
-bool QPictureIO::write()
-{
-    if (d->frmt.isEmpty())
-        return false;
-    QPictureHandler *h = get_picture_handler(d->frmt);
-    if (!h || !h->write_picture) {
-        qWarning("QPictureIO::write: No such picture format handler: %s",
-                 format());
-        return false;
-    }
-    QFile file;
-    if (!d->iodev && !d->fname.isEmpty()) {
-        file.setFileName(d->fname);
-        bool translate = h->text_mode==QPictureHandler::TranslateInOut;
-        QIODevice::OpenMode fmode = translate ? QIODevice::WriteOnly | QIODevice::Text : QIODevice::OpenMode(QIODevice::WriteOnly);
-        if (!file.open(fmode))                // couldn't create file
-            return false;
-        d->iodev = &file;
-    }
-    d->iostat = 1;
-    (*h->write_picture)(this);
-    if (file.isOpen()) {                        // picture was written using file
-        file.close();
-        d->iodev = 0;
-    }
-    return d->iostat == 0;                                // picture successfully written?
-}
-#endif //QT_NO_PICTUREIO
-
 QT_END_NAMESPACE
 
 #endif // QT_NO_PICTURE
diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h
index 189e57b9a3..34860985ed 100644
--- a/src/gui/image/qpicture.h
+++ b/src/gui/image/qpicture.h
@@ -48,7 +48,6 @@
 
 QT_BEGIN_NAMESPACE
 
-
 #ifndef QT_NO_PICTURE
 
 class QPicturePrivate;
@@ -69,10 +68,10 @@ public:
 
     bool play(QPainter *p);
 
-    bool load(QIODevice *dev, const char *format = nullptr);
-    bool load(const QString &fileName, const char *format = nullptr);
-    bool save(QIODevice *dev, const char *format = nullptr);
-    bool save(const QString &fileName, const char *format = nullptr);
+    bool load(QIODevice *dev);
+    bool load(const QString &fileName);
+    bool save(QIODevice *dev);
+    bool save(const QString &fileName);
 
     QRect boundingRect() const;
     void setBoundingRect(const QRect &r);
@@ -88,14 +87,6 @@ public:
     friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QPicture &p);
     friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QPicture &p);
 
-#if QT_DEPRECATED_SINCE(5, 10)
-    static QT_DEPRECATED const char* pictureFormat(const QString &fileName);
-    static QT_DEPRECATED QList<QByteArray> inputFormats();
-    static QT_DEPRECATED QList<QByteArray> outputFormats();
-    static QT_DEPRECATED QStringList inputFormatList();
-    static QT_DEPRECATED QStringList outputFormatList();
-#endif // QT_DEPRECATED_SINCE(5, 10)
-
     QPaintEngine *paintEngine() const override;
 
 protected:
@@ -118,67 +109,6 @@ public:
 
 Q_DECLARE_SHARED(QPicture)
 
-
-#ifndef QT_NO_PICTUREIO
-class QIODevice;
-class QPictureIO;
-typedef void (*picture_io_handler)(QPictureIO *); // picture IO handler
-
-struct QPictureIOData;
-
-class Q_GUI_EXPORT QPictureIO
-{
-public:
-    QPictureIO();
-    QPictureIO(QIODevice *ioDevice, const char *format);
-    QPictureIO(const QString &fileName, const char *format);
-    ~QPictureIO();
-
-    const QPicture &picture() const;
-    int status() const;
-    const char *format() const;
-    QIODevice *ioDevice() const;
-    QString fileName() const;
-    int quality() const;
-    QString description() const;
-    const char *parameters() const;
-    float gamma() const;
-
-    void setPicture(const QPicture &);
-    void setStatus(int);
-    void setFormat(const char *);
-    void setIODevice(QIODevice *);
-    void setFileName(const QString &);
-    void setQuality(int);
-    void setDescription(const QString &);
-    void setParameters(const char *);
-    void setGamma(float);
-
-    bool read();
-    bool write();
-
-    static QByteArray pictureFormat(const QString &fileName);
-    static QByteArray pictureFormat(QIODevice *);
-    static QList<QByteArray> inputFormats();
-    static QList<QByteArray> outputFormats();
-
-    static void defineIOHandler(const char *format,
-                                const char *header,
-                                const char *flags,
-                                picture_io_handler read_picture,
-                                picture_io_handler write_picture);
-
-private:
-    Q_DISABLE_COPY(QPictureIO)
-
-    void init();
-
-    QPictureIOData *d;
-};
-
-#endif //QT_NO_PICTUREIO
-
-
 /*****************************************************************************
   QPicture stream functions
  *****************************************************************************/
diff --git a/src/gui/image/qpictureformatplugin.cpp b/src/gui/image/qpictureformatplugin.cpp
deleted file mode 100644
index ef57ad720f..0000000000
--- a/src/gui/image/qpictureformatplugin.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module 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$
-**
-****************************************************************************/
-
-#include "qpictureformatplugin.h"
-#if !defined(QT_NO_PICTURE)
-#include "qpicture.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \obsolete
-
-    \class QPictureFormatPlugin
-    \brief The QPictureFormatPlugin class provides an abstract base
-    for custom picture format plugins.
-
-    \ingroup plugins
-    \inmodule QtGui
-
-    The picture format plugin is a simple plugin interface that makes
-    it easy to create custom picture formats that can be used
-    transparently by applications.
-
-    Writing an picture format plugin is achieved by subclassing this
-    base class, reimplementing the pure virtual functions
-    loadPicture(), savePicture(), and installIOHandler(), and
-    exporting the class with the Q_PLUGIN_METADATA() macro.
-
-    The json file containing the metadata should contain one entry
-    with the list of picture formats supported by the plugin:
-
-    \code
-    { "Keys": [ "mypictureformat" ] }
-    \endcode
-
-    \sa {How to Create Qt Plugins}
-*/
-
-/*!
-    \fn bool QPictureFormatPlugin::installIOHandler(const QString &format)
-
-    Installs a QPictureIO picture I/O handler for the picture format \a
-    format. Returns \c true on success.
-*/
-
-
-/*!
-    Constructs an picture format plugin with the given \a parent.
-    This is invoked automatically by the moc generated code that exports the plugin.
-*/
-QPictureFormatPlugin::QPictureFormatPlugin(QObject *parent)
-    : QObject(parent)
-{
-}
-
-/*!
-    Destroys the picture format plugin.
-
-    You never have to call this explicitly. Qt destroys a plugin
-    automatically when it is no longer used.
-*/
-QPictureFormatPlugin::~QPictureFormatPlugin()
-{
-}
-
-
-/*!
-    Loads the picture stored in the file called \a fileName, with the
-    given \a format, into *\a picture. Returns \c true on success;
-    otherwise returns \c false.
-
-    \sa savePicture()
-*/
-bool QPictureFormatPlugin::loadPicture(const QString &format, const QString &fileName, QPicture *picture)
-{
-    Q_UNUSED(format)
-    Q_UNUSED(fileName)
-    Q_UNUSED(picture)
-    return false;
-}
-
-/*!
-    Saves the given \a picture into the file called \a fileName,
-    using the specified \a format. Returns \c true on success; otherwise
-    returns \c false.
-
-    \sa loadPicture()
-*/
-bool QPictureFormatPlugin::savePicture(const QString &format, const QString &fileName, const QPicture &picture)
-{
-    Q_UNUSED(format)
-    Q_UNUSED(fileName)
-    Q_UNUSED(picture)
-    return false;
-}
-
-#endif // QT_NO_PICTURE
-
-QT_END_NAMESPACE
diff --git a/src/gui/image/qpictureformatplugin.h b/src/gui/image/qpictureformatplugin.h
deleted file mode 100644
index 3f59c04d79..0000000000
--- a/src/gui/image/qpictureformatplugin.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module 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$
-**
-****************************************************************************/
-
-#ifndef QPICTUREFORMATPLUGIN_H
-#define QPICTUREFORMATPLUGIN_H
-
-#include <QtGui/qtguiglobal.h>
-#include <QtCore/qplugin.h>
-#include <QtCore/qfactoryinterface.h>
-
-QT_BEGIN_NAMESPACE
-
-
-#if !defined(QT_NO_PICTURE)
-
-class QPicture;
-class QImage;
-class QString;
-class QStringList;
-
-#define QPictureFormatInterface_iid "org.qt-project.Qt.QPictureFormatInterface"
-
-class Q_GUI_EXPORT QPictureFormatPlugin : public QObject
-{
-    Q_OBJECT
-public:
-    explicit QPictureFormatPlugin(QObject *parent = nullptr);
-    ~QPictureFormatPlugin();
-
-    virtual bool loadPicture(const QString &format, const QString &filename, QPicture *pic);
-    virtual bool savePicture(const QString &format, const QString &filename, const QPicture &pic);
-    virtual bool installIOHandler(const QString &format) = 0;
-
-};
-
-#endif // QT_NO_PICTURE
-
-QT_END_NAMESPACE
-
-#endif // QPICTUREFORMATPLUGIN_H
diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/image/qpixmap_win.cpp
index 3a2db74098..8aad77b991 100644
--- a/src/gui/image/qpixmap_win.cpp
+++ b/src/gui/image/qpixmap_win.cpp
@@ -281,6 +281,7 @@ Q_GUI_EXPORT HBITMAP qt_imageToWinHBITMAP(const QImage &imageIn, int hbitmapForm
     }
         break;
     case QImage::Format_RGB888:
+    case QImage::Format_BGR888:
         compression = BI_RGB;
         bitCount = 24u;
         break;
@@ -368,7 +369,7 @@ static QImage::Format imageFromWinHBITMAP_Format(const BITMAPINFOHEADER &header,
             ? QImage::Format_RGB32 : QImage::Format_ARGB32_Premultiplied;
         break;
     case 24:
-        result = QImage::Format_RGB888;
+        result = QImage::Format_BGR888;
         break;
     case 16:
         result = QImage::Format_RGB555;
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index 16d6c25b8b..4ab45337b0 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -1079,6 +1079,7 @@ bool QPNGImageWriter::writeImage(const QImage& image, volatile int compression_i
     if (color_type == PNG_COLOR_TYPE_RGB) {
         switch (image.format()) {
         case QImage::Format_RGB888:
+        case QImage::Format_BGR888:
             break;
         case QImage::Format_RGBX8888:
         case QImage::Format_RGBX64:
@@ -1131,6 +1132,7 @@ bool QPNGImageWriter::writeImage(const QImage& image, volatile int compression_i
     case QImage::Format_RGB32:
     case QImage::Format_ARGB32:
     case QImage::Format_RGB888:
+    case QImage::Format_BGR888:
     case QImage::Format_RGBX8888:
     case QImage::Format_RGBA8888:
     case QImage::Format_RGBX64: