11 files changed, 18 insertions, 49 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 5b23dbf4dc..23d212cc92 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 e8c1304b74..1f325f5b6b 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/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp
index 6d3d1c9580..90d96674bc 100644
--- a/src/gui/kernel/qpalette.cpp
+++ b/src/gui/kernel/qpalette.cpp
@@ -844,7 +844,8 @@ bool QPalette::isEqual(QPalette::ColorGroup group1, QPalette::ColorGroup group2)
     return true;
 }
 
-/*! \obsolete
+/*! \fn int QPalette::serialNumber() const
+    \obsolete
 
     Returns a number that identifies the contents of this QPalette
     object. Distinct QPalette objects can only have the same serial
@@ -860,10 +861,6 @@ bool QPalette::isEqual(QPalette::ColorGroup group1, QPalette::ColorGroup group2)
 
     \sa operator==()
 */
-int QPalette::serialNumber() const
-{
-    return d->ser_no;
-}
 
 /*!
     Returns a number that identifies the contents of this QPalette
diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h
index cc710fa67a..ca619a89b4 100644
--- a/src/gui/kernel/qpalette.h
+++ b/src/gui/kernel/qpalette.h
@@ -139,7 +139,9 @@ public:
     inline bool operator!=(const QPalette &p) const { return !(operator==(p)); }
     bool isCopyOf(const QPalette &p) const;
 
-    int serialNumber() const;
+#if QT_DEPRECATED_SINCE(5, 0)
+    QT_DEPRECATED inline int serialNumber() const { return cacheKey() >> 32; }
+#endif
     qint64 cacheKey() const;
 
     QPalette resolve(const QPalette &) const;
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index a084a3dd8c..4bceb28ef7 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -1148,25 +1148,6 @@ QByteArray QFontEngine::convertToPostscriptFontFamilyName(const QByteArray &fami
     return f;
 }
 
-class QRgbGreyPalette: public QVector<QRgb>
-{
-public:
-    QRgbGreyPalette()
-    {
-        resize(256);
-        QRgb *it = data();
-        for (int i = 0; i < size(); ++i, ++it)
-            *it = 0xff000000 | i | (i<<8) | (i<<16);
-    }
-};
-
-Q_GLOBAL_STATIC(QVector<QRgb>, qt_grayPalette)
-
-const QVector<QRgb> &QFontEngine::grayPalette()
-{
-    return *qt_grayPalette();
-}
-
 QFixed QFontEngine::lastRightBearing(const QGlyphLayout &glyphs, bool round)
 {
     if (glyphs.numGlyphs >= 1) {
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index 023882d560..cf9c26f2a4 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -278,7 +278,6 @@ public:
     int m_subPixelPositionCount; // Number of positions within a single pixel for this cache
 
 protected:
-    static const QVector<QRgb> &grayPalette();
     QFixed lastRightBearing(const QGlyphLayout &glyphs, bool round = false);
 
 private:
diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h
index 7ddc8975e4..e48460ffd0 100644
--- a/src/gui/text/qfontmetrics.h
+++ b/src/gui/text/qfontmetrics.h
@@ -61,7 +61,7 @@ class QRect;
 class Q_GUI_EXPORT QFontMetrics
 {
 public:
-    QFontMetrics(const QFont &);
+    explicit QFontMetrics(const QFont &);
     QFontMetrics(const QFont &, QPaintDevice *pd);
     QFontMetrics(const QFontMetrics &);
     ~QFontMetrics();
@@ -127,7 +127,7 @@ private:
 class Q_GUI_EXPORT QFontMetricsF
 {
 public:
-    QFontMetricsF(const QFont &);
+    explicit QFontMetricsF(const QFont &);
     QFontMetricsF(const QFont &, QPaintDevice *pd);
     QFontMetricsF(const QFontMetrics &);
     QFontMetricsF(const QFontMetricsF &);
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index ddf2fb080e..cbffc4315f 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -2325,7 +2325,7 @@ void QTextCursor::insertImage(const QImage &image, const QString &name)
     }
     QString imageName = name;
     if (name.isEmpty())
-        imageName = QString::number(image.serialNumber());
+        imageName = QString::number(image.cacheKey());
     d->priv->document()->addResource(QTextDocument::ImageResource, QUrl(imageName), image);
     QTextImageFormat format;
     format.setName(imageName);