8 files changed, 18 insertions, 4 deletions
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index 760b737ec3..0c033609c4 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -92,7 +92,7 @@ qtConfig(png) {
     MIPS_DSPR2_ASM += image/qimage_mips_dspr2_asm.S
 } else {
     # see https://developer.android.com/ndk/guides/abis
-    arm64-v8a {
+    arm64-v8a | armeabi-v7a {
         SOURCES += image/qimage_neon.cpp
     }
     x86 | x86_64 {
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 38285dd827..41fe649fc5 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -1527,7 +1527,7 @@ QDebug operator<<(QDebug dbg, const QIcon &i)
     \internal
     \since 5.6
     Attempts to find a suitable @Nx file for the given \a targetDevicePixelRatio
-    Returns the the \a baseFileName if no such file was found.
+    Returns the \a baseFileName if no such file was found.
 
     Given base foo.png and a target dpr of 2.5, this function will look for
     foo@3x.png, then foo@2x, then fall back to foo.png if not found.
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 738aa29794..1319d9dffc 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -1587,7 +1587,9 @@ const uchar *QImage::scanLine(int i) const
     Returns a pointer to the pixel data at the scanline with index \a
     i. The first scanline is at index 0.
 
-    The scanline data is aligned on a 32-bit boundary.
+    The scanline data is as minimum 32-bit aligned. For 64-bit formats
+    it follows the native alignment of 64-bit integers (64-bit for most
+    platforms, but notably 32-bit on i386).
 
     Note that QImage uses \l{Implicit Data Sharing} {implicit data
     sharing}, but this function does \e not perform a deep copy of the
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index 6139cf99c9..3eb1e01863 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -1149,6 +1149,7 @@ bool QImageReader::autoTransform() const
     return false;
 }
 
+#if QT_DEPRECATED_SINCE(5, 15)
 /*!
     \since 5.6
 
@@ -1181,6 +1182,7 @@ float QImageReader::gamma() const
         return d->handler->option(QImageIOHandler::Gamma).toFloat();
     return 0.0;
 }
+#endif
 
 /*!
     Returns \c true if an image can be read for the device (i.e., the
diff --git a/src/gui/image/qimagereader.h b/src/gui/image/qimagereader.h
index 4e9a08b6e6..7cd3b81a7d 100644
--- a/src/gui/image/qimagereader.h
+++ b/src/gui/image/qimagereader.h
@@ -117,8 +117,12 @@ public:
     void setAutoTransform(bool enabled);
     bool autoTransform() const;
 
+#if QT_DEPRECATED_SINCE(5, 15)
+    QT_DEPRECATED_VERSION_X_5_15("Use QColorSpace instead")
     void setGamma(float gamma);
+    QT_DEPRECATED_VERSION_X_5_15("Use QColorSpace instead")
     float gamma() const;
+#endif
 
     QByteArray subType() const;
     QList<QByteArray> supportedSubTypes() const;
diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp
index 512da5c432..6e74b23f76 100644
--- a/src/gui/image/qimagewriter.cpp
+++ b/src/gui/image/qimagewriter.cpp
@@ -498,6 +498,7 @@ int QImageWriter::compression() const
     return d->compression;
 }
 
+#if QT_DEPRECATED_SINCE(5, 15)
 /*!
     This is an image format specific function that sets the gamma
     level of the image to \a gamma. For image formats that do not
@@ -522,6 +523,7 @@ float QImageWriter::gamma() const
 {
     return d->gamma;
 }
+#endif
 
 /*!
     \since 5.4
diff --git a/src/gui/image/qimagewriter.h b/src/gui/image/qimagewriter.h
index ef84a59b7c..5c8ed7e211 100644
--- a/src/gui/image/qimagewriter.h
+++ b/src/gui/image/qimagewriter.h
@@ -84,8 +84,12 @@ public:
     void setCompression(int compression);
     int compression() const;
 
+#if QT_DEPRECATED_SINCE(5, 15)
+    QT_DEPRECATED_VERSION_X_5_15("Use QColorSpace instead")
     void setGamma(float gamma);
+    QT_DEPRECATED_VERSION_X_5_15("Use QColorSpace instead")
     float gamma() const;
+#endif
 
     void setSubType(const QByteArray &type);
     QByteArray subType() const;
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index 49f9550519..8435e5a0fe 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -606,7 +606,7 @@ bool QPngHandlerPrivate::readPngHeader()
 #endif
         png_uint_32 profLen;
         png_get_iCCP(png_ptr, info_ptr, &name, &compressionType, &profileData, &profLen);
-        colorSpace = QColorSpace::fromIccProfile(QByteArray::fromRawData((const char *)profileData, profLen));
+        colorSpace = QColorSpace::fromIccProfile(QByteArray((const char *)profileData, profLen));
         if (!colorSpace.isValid()) {
             qWarning() << "QPngHandler: Failed to parse ICC profile";
         } else {