6 files changed, 10 insertions, 22 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 6ce08d93cc..3e53b04728 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -5132,7 +5132,8 @@ bool qt_xForm_helper(const QTransform &trueMat, int xoffset, int type, int depth
 #undef IWX_LSB
 #undef IWX_PIX
 
-/*! \obsolete
+/*! \fn int QImage::serialNumber() const
+    \obsolete
     Returns a number that identifies the contents of this
     QImage object. Distinct QImage objects can only have the same
     serial number if they refer to the same contents (but they don't
@@ -5147,14 +5148,6 @@ bool qt_xForm_helper(const QTransform &trueMat, int xoffset, int type, int depth
     \sa operator==()
 */
 
-int QImage::serialNumber() const
-{
-    if (!d)
-        return 0;
-    else
-        return d->ser_no;
-}
-
 /*!
     Returns a number that identifies the contents of this QImage
     object. Distinct QImage objects can only have the same key if they
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 5a3ae8f886..e9192f1031 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -253,7 +253,9 @@ public:
     inline static QImage fromData(const QByteArray &data, const char *format = 0)
         { return fromData(reinterpret_cast<const uchar *>(data.constData()), data.size(), format); }
 
-    int serialNumber() const;
+#if QT_DEPRECATED_SINCE(5, 0)
+    QT_DEPRECATED inline int serialNumber() const { return cacheKey() >> 32; }
+#endif
     qint64 cacheKey() const;
 
     QPaintEngine *paintEngine() const;
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 504f583baf..65b9d62dfa 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -885,7 +885,8 @@ void QPixmap::fill(const QColor &color)
     data->fill(color);
 }
 
-/*! \obsolete
+/*! \fn int QPixmap::serialNumber() const
+    \obsolete
     Returns a number that identifies the contents of this QPixmap
     object. Distinct QPixmap objects can only have the same serial
     number if they refer to the same contents (but they don't have
@@ -898,12 +899,6 @@ void QPixmap::fill(const QColor &color)
     it as a cache key. For caching pixmaps, we recommend using the
     QPixmapCache class whenever possible.
 */
-int QPixmap::serialNumber() const
-{
-    if (isNull())
-        return 0;
-    return data->serialNumber();
-}
 
 /*!
     Returns a number that identifies this QPixmap. Distinct QPixmap
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 27bfe15688..3d78a43917 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -146,7 +146,7 @@ public:
     void scroll(int dx, int dy, const QRect &rect, QRegion *exposed = 0);
 
 #if QT_DEPRECATED_SINCE(5, 0)
-    QT_DEPRECATED int serialNumber() const;
+    QT_DEPRECATED inline int serialNumber() const { return cacheKey() >> 32; }
 #endif
     qint64 cacheKey() const;
 
diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp
index 8125b1360d..7c7c4652e3 100644
--- a/src/gui/image/qpixmap_raster.cpp
+++ b/src/gui/image/qpixmap_raster.cpp
@@ -115,7 +115,7 @@ void QRasterPlatformPixmap::resize(int width, int height)
         image.setColor(1, QColor(Qt::color1).rgba());
     }
 
-    setSerialNumber(image.serialNumber());
+    setSerialNumber(image.cacheKey() >> 32);
 }
 
 bool QRasterPlatformPixmap::fromData(const uchar *buffer, uint len, const char *format,
@@ -349,7 +349,7 @@ void QRasterPlatformPixmap::createPixmapForImage(QImage &sourceImage, Qt::ImageC
     }
     is_null = (w <= 0 || h <= 0);
 
-    setSerialNumber(image.serialNumber());
+    setSerialNumber(image.cacheKey() >> 32);
 }
 
 QImage* QRasterPlatformPixmap::buffer()
diff --git a/src/gui/image/qpixmapcache_p.h b/src/gui/image/qpixmapcache_p.h
index 6ca109b03f..426a6d9954 100644
--- a/src/gui/image/qpixmapcache_p.h
+++ b/src/gui/image/qpixmapcache_p.h
@@ -96,8 +96,6 @@ public:
     QPixmapCache::Key key;
 };
 
-inline bool qIsDetached(QPixmapCacheEntry &t) { return t.isDetached(); }
-
 QT_END_NAMESPACE
 
 #endif // QPIXMAPCACHE_P_H