Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13

1 files changed, 2 insertions, 2 deletions

diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index 6e57f679d8..56b82abcfa 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -1866,7 +1866,7 @@ QList<QByteArray> QPictureIO::outputFormats()
 bool QPictureIO::read()
 {
     QFile           file;
-    const char          *picture_format;
+    QByteArray      picture_format;
     QPictureHandler *h;
 
     if (d->iodev) {                                // read from io device
@@ -1882,7 +1882,7 @@ bool QPictureIO::read()
     if (d->frmt.isEmpty()) {
         // Try to guess format
         picture_format = pictureFormat(d->iodev);        // get picture format
-        if (!picture_format) {
+        if (picture_format.isEmpty()) {
             if (file.isOpen()) {                        // unknown format
                 file.close();
                 d->iodev = 0;