Merge remote-tracking branch 'origin/api_changes'

Conflicts:
	dist/changes-5.0.0
	mkspecs/features/qt_module_config.prf
	qmake/project.cpp
	qmake/property.cpp

Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296

4 files changed, 3 insertions, 23 deletions

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 fed135ea87..44464ee788 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -279,7 +279,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 0dd0d99d2a..02fd921fac 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);