apply upstream commit

upstream commit:
ad9f5c7e93

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

src/core/io/qfileinfo.cpp

@@ -368,16 +368,6 @@ const QFileInfoPrivate* QFileInfo::d_func() const
     return d_ptr.constData();
 }
 
-
-/*!
-    \fn bool QFileInfo::operator!=(const QFileInfo &fileinfo)
-
-    Returns true if this QFileInfo object refers to a different file
-    than the one specified by \a fileinfo; otherwise returns false.
-
-    \sa operator==()
-*/
-
 /*!
     \overload
     \fn bool QFileInfo::operator!=(const QFileInfo &fileinfo) const

src/core/tools/qmap.h

@@ -324,8 +324,8 @@ public:
         // ### Qt 5: not sure this is necessary anymore
 #ifdef QT_STRICT_ITERATORS
     private:
-        inline bool operator==(const iterator &o) { return operator==(const_iterator(o)); }
+        inline bool operator==(const iterator &o) const { return operator==(const_iterator(o)); }
-        inline bool operator!=(const iterator &o) { return operator!=(const_iterator(o)); }
+        inline bool operator!=(const iterator &o) const { return operator!=(const_iterator(o)); }
 #endif
 
         friend class QMap<Key, T>;

src/gui/graphicsview/qgraphicslayout_p.h

@@ -90,9 +90,9 @@ public:
     inline QStyle *style() const { return m_style; }
     inline QWidget *widget() const { return m_widget; }
 
-    inline bool operator==(const QLayoutStyleInfo &other)
+    inline bool operator==(const QLayoutStyleInfo &other) const
         { return m_style == other.m_style && m_widget == other.m_widget; }
-    inline bool operator!=(const QLayoutStyleInfo &other)
+    inline bool operator!=(const QLayoutStyleInfo &other) const
         { return !(*this == other); }
 
     inline void setDefaultSpacing(Qt::Orientation o, qreal spacing){

src/gui/itemviews/qwidgetitemdata_p.h

@@ -54,7 +54,7 @@ public:
     inline QWidgetItemData(int r, QVariant v) : role(r), value(v) {}
     int role;
     QVariant value;
-    inline bool operator==(const QWidgetItemData &other) { return role == other.role && value == other.value; }
+    inline bool operator==(const QWidgetItemData &other) const { return role == other.role && value == other.value; }
 };
 
 #ifndef QT_NO_DATASTREAM

src/gui/text/qfontengine_p.h

@@ -244,7 +244,7 @@ private:
     struct GlyphCacheEntry {
         void *context;
         QExplicitlySharedDataPointer<QFontEngineGlyphCache> cache;
-        bool operator==(const GlyphCacheEntry &other) { return context == other.context && cache == other.cache; }
+        bool operator==(const GlyphCacheEntry &other) const { return context == other.context && cache == other.cache; }
     };
 
     mutable QLinkedList<GlyphCacheEntry> m_glyphCaches;

src/gui/text/qfontmetrics.cpp

@@ -238,18 +238,6 @@ bool QFontMetrics::operator ==(const QFontMetrics &other) const
     return d == other.d;
 }
 
-/*!
-    \fn bool QFontMetrics::operator!=(const QFontMetrics &other)
-
-    Returns true if \a other is not equal to this object; otherwise returns false.
-
-    Two font metrics are considered equal if they were constructed
-    from the same QFont and the paint devices they were constructed
-    for are considered compatible.
-
-    \sa operator==()
-*/
-
 /*!
     \fn bool QFontMetrics::operator !=(const QFontMetrics &other) const
 
@@ -1117,15 +1105,6 @@ bool QFontMetricsF::operator ==(const QFontMetricsF &other) const
     return d == other.d;
 }
 
-/*!
-    \fn bool QFontMetricsF::operator!=(const QFontMetricsF &other)
-
-    Returns true if the font metrics are not equal to the \a other font
-    metrics; otherwise returns false.
-
-    \sa operator==()
-*/
-
 /*!
     \fn bool QFontMetricsF::operator !=(const QFontMetricsF &other) const
     \overload