Remove deprecated members from several QtGui classes

Those can be trivially removed as they have direct replacements, or
are completely unused.

The migration path for QCursor::bitmap and QCursor::mask is

QBitmap *pb = c.bitmap(); // up to 5.15, warns in 5.15
QBitmap vb = c.bitmap(Qt::ReturnByValue); // from 5.15, works in 6
QBitmap b = c.bitmap(); // from 6.0 on

Change-Id: I3b3acd1c7f09c4c8414e98b3ce11986f1ecd5eda
Reviewed-by: Shawn Rutledge <[email protected]>

19 files changed, 28 insertions, 403 deletions

diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp
index d0325a7f9ee..bc76d0ea603 100644
--- a/src/gui/itemmodels/qstandarditemmodel.cpp
+++ b/src/gui/itemmodels/qstandarditemmodel.cpp
@@ -1371,24 +1371,6 @@ void QStandardItem::setCheckable(bool checkable)
 */
 
 /*!
-  \fn void QStandardItem::setTristate(bool tristate)
-  \obsolete
-
-  Use QStandardItem::setAutoTristate(bool tristate) instead.
-  For a tristate checkbox that the user can change between all three
-  states, use QStandardItem::setUserTristate(bool tristate) instead.
-*/
-
-/*!
-  \fn void QStandardItem::isTristate() const
-  \obsolete
-
-  Use QStandardItem::isAutoTristate() instead.
-  For a tristate checkbox that the user can change between all three
-  states, use QStandardItem::isUserTristate() instead.
-*/
-
-/*!
   Determines that the item is tristate and controlled by QTreeWidget if \a tristate
   is \c true.
   This enables automatic management of the state of parent items in QTreeWidget
@@ -1442,13 +1424,6 @@ void QStandardItem::setUserTristate(bool tristate)
   \sa setUserTristate(), isCheckable(), checkState()
 */
 
-#if QT_DEPRECATED_SINCE(5, 6)
-void QStandardItem::setTristate(bool tristate)
-{
-    setAutoTristate(tristate);
-}
-#endif
-
 #if QT_CONFIG(draganddrop)
 
 /*!
diff --git a/src/gui/itemmodels/qstandarditemmodel.h b/src/gui/itemmodels/qstandarditemmodel.h
index a66054a04ff..405f72d519d 100644
--- a/src/gui/itemmodels/qstandarditemmodel.h
+++ b/src/gui/itemmodels/qstandarditemmodel.h
@@ -171,11 +171,6 @@ public:
     }
     void setUserTristate(bool tristate);
 
-#if QT_DEPRECATED_SINCE(5, 6)
-    QT_DEPRECATED bool isTristate() const { return isAutoTristate(); }
-    QT_DEPRECATED void setTristate(bool tristate);
-#endif
-
 #if QT_CONFIG(draganddrop)
     inline bool isDragEnabled() const {
         return (flags() & Qt::ItemIsDragEnabled) != 0;
diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp
index 1efa28a5af5..7ebf59290c1 100644
--- a/src/gui/kernel/qcursor.cpp
+++ b/src/gui/kernel/qcursor.cpp
@@ -565,63 +565,25 @@ void QCursor::setShape(Qt::CursorShape shape)
     }
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
 /*!
-    \deprecated
-
-    New code should use the other overload which returns QBitmap by-value.
+    \fn QBitmap QCursor::bitmap(Qt::ReturnByValueConstant) const
+    \since 5.15
+    \obsolete Use the overload without argument instead.
 
-    Returns the cursor bitmap, or \nullptr if it is one of the
+    Returns the cursor bitmap, or a null bitmap if it is one of the
     standard cursors.
-*/
-const QBitmap *QCursor::bitmap() const
-{
-    if (!QCursorData::initialized)
-        QCursorData::initialize();
-    return d->bm;
-}
 
-/*!
-    \deprecated
-
-    New code should use the other overload which returns QBitmap by-value.
-
-    Returns the cursor bitmap mask, or \nullptr if it is one of the
-    standard cursors.
+    Previously, Qt provided a version of \c bitmap() which returned the bitmap
+    by-pointer. That version is now removed. To maintain compatibility
+    with old code, this function was provided to differentiate between the by-pointer
+    function and the by-value function.
 */
 
-const QBitmap *QCursor::mask() const
-{
-    if (!QCursorData::initialized)
-        QCursorData::initialize();
-    return d->bmm;
-}
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
 /*!
-    \since 5.15
-
     Returns the cursor bitmap, or a null bitmap if it is one of the
     standard cursors.
-
-    Previously, Qt provided a version of \c bitmap() which returned the bitmap
-    by-pointer. That version is now deprecated. To maintain compatibility
-    with old code, you can explicitly differentiate between the by-pointer
-    function and the by-value function:
-
-    \code
-    const QBitmap *bmpPtr = cursor->bitmap();
-    QBitmap bmpVal = cursor->bitmap(Qt::ReturnByValue);
-    \endcode
-
-    If you disable the deprecated version using the QT_DISABLE_DEPRECATED_BEFORE
-    macro, then you can omit \c Qt::ReturnByValue as shown below:
-
-    \code
-    QBitmap bmpVal = cursor->bitmap();
-    \endcode
 */
-QBitmap QCursor::bitmap(Qt::ReturnByValueConstant) const
+QBitmap QCursor::bitmap() const
 {
     if (!QCursorData::initialized)
         QCursorData::initialize();
@@ -631,29 +593,24 @@ QBitmap QCursor::bitmap(Qt::ReturnByValueConstant) const
 }
 
 /*!
+    \fn QBitmap QCursor::mask(Qt::ReturnByValueConstant) const
     \since 5.15
+    \obsolete Use the overload without argument instead.
 
     Returns the cursor bitmap mask, or a null bitmap if it is one of the
     standard cursors.
 
     Previously, Qt provided a version of \c mask() which returned the bitmap
-    by-pointer. That version is now deprecated. To maintain compatibility
-    with old code, you can explicitly differentiate between the by-pointer
-    function and the by-value function:
-
-    \code
-    const QBitmap *bmpPtr = cursor->mask();
-    QBitmap bmpVal = cursor->mask(Qt::ReturnByValue);
-    \endcode
-
-    If you disable the deprecated version using the QT_DISABLE_DEPRECATED_BEFORE
-    macro, then you can omit \c Qt::ReturnByValue as shown below:
+    by-pointer. That version is now removed. To maintain compatibility
+    with old code, this function was provided to differentiate between the by-pointer
+    function and the by-value function.
+*/
 
-    \code
-    QBitmap bmpVal = cursor->mask();
-    \endcode
+/*!
+    Returns the cursor bitmap mask, or a null bitmap if it is one of the
+    standard cursors.
 */
-QBitmap QCursor::mask(Qt::ReturnByValueConstant) const
+QBitmap QCursor::mask() const
 {
     if (!QCursorData::initialized)
         QCursorData::initialize();
diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h
index 3ae6b98ced7..d3b4140ec73 100644
--- a/src/gui/kernel/qcursor.h
+++ b/src/gui/kernel/qcursor.h
@@ -43,6 +43,7 @@
 #include <QtGui/qtguiglobal.h>
 #include <QtCore/qpoint.h>
 #include <QtGui/qwindowdefs.h>
+#include <QtGui/qbitmap.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -97,19 +98,13 @@ public:
     Qt::CursorShape shape() const;
     void setShape(Qt::CursorShape newShape);
 
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_VERSION_X(5, 15, "Use the other overload which returns QBitmap by-value")
-    const QBitmap *bitmap() const; // ### Qt 7: Remove function
+#if QT_DEPRECATED_SINCE(6, 6)
+    QBitmap bitmap(Qt::ReturnByValueConstant) const { return bitmap(); }
+    QBitmap mask(Qt::ReturnByValueConstant) const { return mask(); }
+#endif // QT_DEPRECATED_SINCE(6, 6)
+    QBitmap bitmap() const;
+    QBitmap mask() const;
 
-    QT_DEPRECATED_VERSION_X(5, 15, "Use the other overload which returns QBitmap by-value")
-    const QBitmap *mask() const; // ### Qt 7: Remove function
-
-    QBitmap bitmap(Qt::ReturnByValueConstant) const;
-    QBitmap mask(Qt::ReturnByValueConstant) const;
-#else
-    QBitmap bitmap(Qt::ReturnByValueConstant = Qt::ReturnByValue) const; // ### Qt 7: Remove arg
-    QBitmap mask(Qt::ReturnByValueConstant = Qt::ReturnByValue) const; // ### Qt 7: Remove arg
-#endif // QT_DEPRECATED_SINCE(5, 15)
     QPixmap pixmap() const;
     QPoint hotSpot() const;
 
diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp
index 3712eace154..d6dfc6387c6 100644
--- a/src/gui/kernel/qdrag.cpp
+++ b/src/gui/kernel/qdrag.cpp
@@ -287,36 +287,6 @@ Qt::DropAction QDrag::exec(Qt::DropActions supportedActions, Qt::DropAction defa
     return d->executed_action;
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-/*!
-    \obsolete
-
-    \b{Note:} It is recommended to use exec() instead of this function.
-
-    Starts the drag and drop operation and returns a value indicating the requested
-    drop action when it is completed. The drop actions that the user can choose
-    from are specified in \a request. Qt::CopyAction is always allowed.
-
-    \b{Note:} Although the drag and drop operation can take some time, this function
-    does not block the event loop. Other events are still delivered to the application
-    while the operation is performed.
-
-    \sa exec()
-*/
-Qt::DropAction QDrag::start(Qt::DropActions request)
-{
-    Q_D(QDrag);
-    if (!d->data) {
-        qWarning("QDrag: No mimedata set before starting the drag");
-        return d->executed_action;
-    }
-    d->supported_actions = request | Qt::CopyAction;
-    d->default_action = Qt::IgnoreAction;
-    d->executed_action = QDragManager::self()->drag(this);
-    return d->executed_action;
-}
-#endif
-
 /*!
     Sets the drag \a cursor for the \a action. This allows you
     to override the default native cursors. To revert to using the
diff --git a/src/gui/kernel/qdrag.h b/src/gui/kernel/qdrag.h
index 7acd5088bdd..eaa677b50dc 100644
--- a/src/gui/kernel/qdrag.h
+++ b/src/gui/kernel/qdrag.h
@@ -74,10 +74,6 @@ public:
     QObject *source() const;
     QObject *target() const;
 
-#if QT_DEPRECATED_SINCE(5, 13)
-    QT_DEPRECATED_X("Use QDrag::exec() instead")
-    Qt::DropAction start(Qt::DropActions supportedActions = Qt::CopyAction);
-#endif
     Qt::DropAction exec(Qt::DropActions supportedActions = Qt::MoveAction);
     Qt::DropAction exec(Qt::DropActions supportedActions, Qt::DropAction defaultAction);
 
diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h
index 67c79519e60..8b7ff12bed8 100644
--- a/src/gui/kernel/qkeysequence.h
+++ b/src/gui/kernel/qkeysequence.h
@@ -178,10 +178,6 @@ public:
     static QKeySequence mnemonic(const QString &text);
     static QList<QKeySequence> keyBindings(StandardKey key);
 
-#if QT_DEPRECATED_SINCE(5, 0)
-    QT_DEPRECATED operator QString() const { return toString(QKeySequence::NativeText); }
-    QT_DEPRECATED operator int() const { if (1 <= count()) return operator [](0); return 0; }
-#endif
     operator QVariant() const;
     int operator[](uint i) const;
     QKeySequence &operator=(const QKeySequence &other);
diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp
index f6180be8a8e..92c43688cc4 100644
--- a/src/gui/kernel/qpalette.cpp
+++ b/src/gui/kernel/qpalette.cpp
@@ -919,24 +919,6 @@ bool QPalette::isEqual(QPalette::ColorGroup group1, QPalette::ColorGroup group2)
     return true;
 }
 
-/*! \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
-    number if they refer to the same contents (but they don't have
-    to). Also, the serial number of a QPalette may change during the
-    lifetime of the object.
-
-    Use cacheKey() instead.
-
-    \warning The serial number doesn't necessarily change when the
-    palette is altered. This means that it may be dangerous to use it
-    as a cache key.
-
-    \sa operator==()
-*/
-
 /*!
     Returns a number that identifies the contents of this QPalette
     object. Distinct QPalette objects can have the same key if
diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h
index fd0ef2e2d9a..1f0f6725d86 100644
--- a/src/gui/kernel/qpalette.h
+++ b/src/gui/kernel/qpalette.h
@@ -152,9 +152,6 @@ public:
     inline bool operator!=(const QPalette &p) const { return !(operator==(p)); }
     bool isCopyOf(const QPalette &p) const;
 
-#if QT_DEPRECATED_SINCE(5, 0)
-    QT_DEPRECATED inline int serialNumber() const { return cacheKey() >> 32; }
-#endif
     qint64 cacheKey() const;
 
     QPalette resolve(const QPalette &other) const;
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index c8fc4474466..172d51a4878 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -908,20 +908,6 @@ void QBrush::setTransform(const QTransform &matrix)
 }
 
 
-#if QT_DEPRECATED_SINCE(5, 15)
-/*!
-    \fn void QBrush::matrix() const
-    \since 4.2
-    \obsolete
-
-    Use transform() instead.
-
-    Returns the current transformation matrix for the brush.
-
-    \sa setMatrix()
-*/
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
 /*!
     \fn bool QBrush::operator!=(const QBrush &brush) const
 
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index eac2a50c8c4..d9d32f6219d 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -2870,28 +2870,6 @@ QColor QColor::darker(int factor) const noexcept
     return hsv.convertTo(cspec);
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-/*!
-    \obsolete
-
-    Use lighter(\a factor) instead.
-*/
-QColor QColor::light(int factor) const noexcept
-{
-    return lighter(factor);
-}
-
-/*!
-    \obsolete
-
-    Use darker(\a factor) instead.
-*/
-QColor QColor::dark(int factor) const noexcept
-{
-    return darker(factor);
-}
-#endif
-
 /*! \overload
     Assigns a copy of \a color and returns a reference to this color.
  */
diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h
index ad624e6b601..683826fbe75 100644
--- a/src/gui/painting/qcolor.h
+++ b/src/gui/painting/qcolor.h
@@ -215,12 +215,6 @@ public:
     static QColor fromHsl(int h, int s, int l, int a = 255);
     static QColor fromHslF(qreal h, qreal s, qreal l, qreal a = 1.0);
 
-#if QT_DEPRECATED_SINCE(5, 13)
-    QT_DEPRECATED_X("Use QColor::lighter() instead")
-    Q_REQUIRED_RESULT QColor light(int f = 150) const noexcept;
-    QT_DEPRECATED_X("Use QColor::darker() instead")
-    Q_REQUIRED_RESULT QColor dark(int f = 200) const noexcept;
-#endif
     Q_REQUIRED_RESULT QColor lighter(int f = 150) const noexcept;
     Q_REQUIRED_RESULT QColor darker(int f = 200) const noexcept;
 
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index a10a2cb2d0b..8021b17c6bd 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -429,9 +429,6 @@ QDebug operator<<(QDebug s, const QRegion &r)
 
     \sa united(), operator+()
 */
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-const
-#endif
 QRegion QRegion::operator|(const QRegion &r) const
     { return united(r); }
 
@@ -441,9 +438,6 @@ QRegion QRegion::operator|(const QRegion &r) const
 
     \sa united(), operator|()
 */
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-const
-#endif
 QRegion QRegion::operator+(const QRegion &r) const
     { return united(r); }
 
@@ -451,9 +445,6 @@ QRegion QRegion::operator+(const QRegion &r) const
    \overload
    \since 4.4
  */
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-const
-#endif
 QRegion QRegion::operator+(const QRect &r) const
     { return united(r); }
 
@@ -463,9 +454,6 @@ QRegion QRegion::operator+(const QRect &r) const
 
     \sa intersected()
 */
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-const
-#endif
 QRegion QRegion::operator&(const QRegion &r) const
     { return intersected(r); }
 
@@ -473,9 +461,6 @@ QRegion QRegion::operator&(const QRegion &r) const
    \overload
    \since 4.4
  */
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-const
-#endif
 QRegion QRegion::operator&(const QRect &r) const
 {
     return intersected(r);
@@ -487,9 +472,6 @@ QRegion QRegion::operator&(const QRect &r) const
 
     \sa subtracted()
 */
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-const
-#endif
 QRegion QRegion::operator-(const QRegion &r) const
     { return subtracted(r); }
 
@@ -499,9 +481,6 @@ QRegion QRegion::operator-(const QRegion &r) const
 
     \sa xored()
 */
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-const
-#endif
 QRegion QRegion::operator^(const QRegion &r) const
     { return xored(r); }
 
@@ -744,21 +723,6 @@ QRegion QRegion::intersect(const QRect &r) const
 */
 
 /*!
-    \fn QRegion QRegion::unite(const QRegion &r) const
-    \obsolete
-
-    Use united(\a r) instead.
-*/
-
-/*!
-    \fn QRegion QRegion::unite(const QRect &rect) const
-    \since 4.4
-    \obsolete
-
-    Use united(\a rect) instead.
-*/
-
-/*!
     \fn QRegion QRegion::united(const QRect &rect) const
     \since 4.4
 
@@ -781,21 +745,6 @@ QRegion QRegion::intersect(const QRect &r) const
 */
 
 /*!
-    \fn QRegion QRegion::intersect(const QRegion &r) const
-    \obsolete
-
-    Use intersected(\a r) instead.
-*/
-
-/*!
-    \fn QRegion QRegion::intersect(const QRect &rect) const
-    \since 4.4
-    \obsolete
-
-    Use intersected(\a rect) instead.
-*/
-
-/*!
     \fn QRegion QRegion::intersected(const QRect &rect) const
     \since 4.4
 
@@ -818,13 +767,6 @@ QRegion QRegion::intersect(const QRect &r) const
 */
 
 /*!
-    \fn QRegion QRegion::subtract(const QRegion &r) const
-    \obsolete
-
-    Use subtracted(\a r) instead.
-*/
-
-/*!
     \fn QRegion QRegion::subtracted(const QRegion &r) const
     \since 4.2
 
@@ -839,13 +781,6 @@ QRegion QRegion::intersect(const QRect &r) const
 */
 
 /*!
-    \fn QRegion QRegion::eor(const QRegion &r) const
-    \obsolete
-
-    Use xored(\a r) instead.
-*/
-
-/*!
     \fn QRegion QRegion::xored(const QRegion &r) const
     \since 4.2
 
@@ -866,20 +801,6 @@ QRegion QRegion::intersect(const QRect &r) const
     gives a rectangle that is QRect::isNull().
 */
 
-#if QT_DEPRECATED_SINCE(5, 11)
-/*!
-    \fn QVector<QRect> QRegion::rects() const
-    \obsolete
-
-    Use begin() and end() instead.
-
-    Returns an array of non-overlapping rectangles that make up the
-    region.
-
-    The union of all the rectangles is equal to the original region.
-*/
-#endif
-
 /*!
     \typedef QRegion::const_iterator
     \since 5.8
@@ -4312,20 +4233,6 @@ bool qt_region_strictContains(const QRegion &region, const QRect &rect)
             && rect.top() >= r1.top() && rect.bottom() <= r1.bottom());
 }
 
-#if QT_DEPRECATED_SINCE(5, 11)
-QVector<QRect> QRegion::rects() const
-{
-    if (d->qt_rgn) {
-        d->qt_rgn->vectorize();
-        d->qt_rgn->rects.reserve(d->qt_rgn->numRects);
-        d->qt_rgn->rects.resize(d->qt_rgn->numRects);
-        return d->qt_rgn->rects;
-    } else {
-        return QVector<QRect>();
-    }
-}
-#endif
-
 QRegion::const_iterator QRegion::begin() const noexcept
 {
     return d->qt_rgn ? d->qt_rgn->begin() : nullptr;
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h
index 54de916198a..dac58bd2ebc 100644
--- a/src/gui/painting/qregion.h
+++ b/src/gui/painting/qregion.h
@@ -107,35 +107,13 @@ public:
     Q_REQUIRED_RESULT QRegion subtracted(const QRegion &r) const;
     Q_REQUIRED_RESULT QRegion xored(const QRegion &r) const;
 
-#if QT_DEPRECATED_SINCE(5, 0)
-    Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion unite(const QRegion &r) const { return united(r); }
-    Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion unite(const QRect &r) const { return united(r); }
-    Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion intersect(const QRegion &r) const { return intersected(r); }
-    Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion intersect(const QRect &r) const { return intersected(r); }
-    Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion subtract(const QRegion &r) const { return subtracted(r); }
-    Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion eor(const QRegion &r) const { return xored(r); }
-#endif
-
     bool intersects(const QRegion &r) const;
     bool intersects(const QRect &r) const;
 
     QRect boundingRect() const noexcept;
-#if QT_DEPRECATED_SINCE(5, 11)
-    QT_DEPRECATED_X("Use begin()/end() instead")
-    QVector<QRect> rects() const;
-#endif
     void setRects(const QRect *rect, int num);
     int rectCount() const noexcept;
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
-    // ### Qt 6: remove these, they're kept for MSVC compat
-    const QRegion operator|(const QRegion &r) const;
-    const QRegion operator+(const QRegion &r) const;
-    const QRegion operator+(const QRect &r) const;
-    const QRegion operator&(const QRegion &r) const;
-    const QRegion operator&(const QRect &r) const;
-    const QRegion operator-(const QRegion &r) const;
-    const QRegion operator^(const QRegion &r) const;
-#else
+
     QRegion operator|(const QRegion &r) const;
     QRegion operator+(const QRegion &r) const;
     QRegion operator+(const QRect &r) const;
@@ -143,7 +121,7 @@ public:
     QRegion operator&(const QRect &r) const;
     QRegion operator-(const QRegion &r) const;
     QRegion operator^(const QRegion &r) const;
-#endif // Q_COMPILER_MANGLES_RETURN_TYPE
+
     QRegion& operator|=(const QRegion &r);
     QRegion& operator+=(const QRegion &r);
     QRegion& operator+=(const QRect &r);
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 523895bc0ea..75a0171aabd 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -2472,27 +2472,6 @@ bool QFontDatabase::removeAllApplicationFonts()
 }
 
 /*!
-    \fn bool QFontDatabase::supportsThreadedFontRendering()
-    \since 4.4
-    \deprecated
-
-    Returns \c true if font rendering is supported outside the GUI
-    thread, false otherwise. In other words, a return value of false
-    means that all QPainter::drawText() calls outside the GUI thread
-    will not produce readable output.
-
-    As of 5.0, always returns \c true.
-
-    \sa {Thread-Support in Qt Modules#Painting In Threads}{Painting In Threads}
-*/
-#if QT_DEPRECATED_SINCE(5, 2)
-bool QFontDatabase::supportsThreadedFontRendering()
-{
-    return true;
-}
-#endif
-
-/*!
     \internal
 */
 QFontEngine *QFontDatabase::findFont(const QFontDef &request, int script)
diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h
index 63e6b48e4fb..d1f24837fde 100644
--- a/src/gui/text/qfontdatabase.h
+++ b/src/gui/text/qfontdatabase.h
@@ -149,10 +149,6 @@ public:
     static bool removeApplicationFont(int id);
     static bool removeAllApplicationFonts();
 
-#if QT_DEPRECATED_SINCE(5, 2)
-    QT_DEPRECATED static bool supportsThreadedFontRendering();
-#endif
-
     static QFont systemFont(SystemFont type);
 
 private:
diff --git a/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp b/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp
index 596908d84da..9b98ad04e95 100644
--- a/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp
+++ b/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp
@@ -308,18 +308,6 @@ void tst_QStandardItem::getSetFlags()
     item.setCheckState(Qt::Checked);
     item.setCheckable(true);
     QCOMPARE(item.checkState(), Qt::Checked);
-
-#if QT_DEPRECATED_SINCE(5, 6)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-    // deprecated API
-    item.setTristate(true);
-    QVERIFY(item.isTristate());
-    QVERIFY(item.flags() & Qt::ItemIsTristate);
-    item.setTristate(false);
-    QVERIFY(!(item.flags() & Qt::ItemIsTristate));
-QT_WARNING_POP
-#endif
 }
 
 void tst_QStandardItem::getSetRowAndColumnCount()
diff --git a/tests/auto/gui/kernel/qdrag/tst_qdrag.cpp b/tests/auto/gui/kernel/qdrag/tst_qdrag.cpp
index d67b17fd43b..91ff24ffd14 100644
--- a/tests/auto/gui/kernel/qdrag/tst_qdrag.cpp
+++ b/tests/auto/gui/kernel/qdrag/tst_qdrag.cpp
@@ -72,13 +72,6 @@ void tst_QDrag::getSetCheck()
     QCOMPARE(result, Qt::IgnoreAction);
     result = obj1.exec(Qt::MoveAction | Qt::LinkAction);
     QCOMPARE(result, Qt::IgnoreAction);
-
-#if QT_DEPRECATED_SINCE(5, 13)
-    result = obj1.start();
-    QCOMPARE(result, Qt::IgnoreAction);
-    result = obj1.start(Qt::MoveAction | Qt::LinkAction);
-    QCOMPARE(result, Qt::IgnoreAction);
-#endif
 }
 
 QTEST_MAIN(tst_QDrag)
diff --git a/tests/auto/gui/painting/qregion/tst_qregion.cpp b/tests/auto/gui/painting/qregion/tst_qregion.cpp
index aa9a84ba8e6..3aa556f2a87 100644
--- a/tests/auto/gui/painting/qregion/tst_qregion.cpp
+++ b/tests/auto/gui/painting/qregion/tst_qregion.cpp
@@ -155,19 +155,12 @@ void tst_QRegion::rects()
         QRegion region(rect);
         QVERIFY(region.isEmpty());
         QCOMPARE(region.begin(), region.end());
-#if QT_DEPRECATED_SINCE(5, 11)
-        QVERIFY(region.rects().isEmpty());
-#endif
     }
     {
         QRect rect(10, -20, 30, 40);
         QRegion region(rect);
         QCOMPARE(region.end(), region.begin() + 1);
         QCOMPARE(*region.begin(), rect);
-#if QT_DEPRECATED_SINCE(5, 11)
-        QCOMPARE(region.rects().count(), 1);
-        QCOMPARE(region.rects()[0], rect);
-#endif
     }
     {
         QRect r(QPoint(10, 10), QPoint(40, 40));
@@ -214,9 +207,6 @@ void tst_QRegion::setRects()
         QCOMPARE(region, QRegion());
         QCOMPARE(region.begin(), region.end());
         QVERIFY(!region.boundingRect().isValid());
-#if QT_DEPRECATED_SINCE(5, 11)
-        QVERIFY(region.rects().isEmpty());
-#endif
     }
     {
         QRegion region;
@@ -224,19 +214,12 @@ void tst_QRegion::setRects()
         region.setRects(&rect, 1);
         QCOMPARE(region.begin(), region.end());
         QVERIFY(!region.boundingRect().isValid());
-#if QT_DEPRECATED_SINCE(5, 11)
-        QVERIFY(region.rects().isEmpty());
-#endif
     }
     {
         QRegion region;
         QRect rect(10, -20, 30, 40);
         region.setRects(&rect, 1);
         QCOMPARE(region.end(), region.begin() + 1);
-#if QT_DEPRECATED_SINCE(5, 11)
-        QCOMPARE(region.rects().count(), 1);
-        QCOMPARE(region.rects()[0], rect);
-#endif
         QCOMPARE(*region.begin(), rect);
     }
 }
@@ -355,9 +338,6 @@ void tst_QRegion::emptyPolygonRegion()
     std::copy(r.begin(), r.end(), std::back_inserter(rects));
     QTEST(rects.size(), "numRects");
     QTEST(rects, "rects");
-#if QT_DEPRECATED_SINCE(5, 11)
-    QCOMPARE(r.rects(), rects);
-#endif
 }
 
 
@@ -900,9 +880,6 @@ void tst_QRegion::isEmpty()
     QCOMPARE(region, QRegion());
     QCOMPARE(region.rectCount(), 0);
     QCOMPARE(region.boundingRect(), QRect());
-#if QT_DEPRECATED_SINCE(5, 11)
-    QVERIFY(region.rects().isEmpty());
-#endif
 }
 
 void tst_QRegion::regionFromPath()
@@ -918,12 +895,6 @@ void tst_QRegion::regionFromPath()
         QCOMPARE(rgn.begin()[0], QRect(0, 0, 10, 10));
         QCOMPARE(rgn.begin()[1], QRect(0, 100, 100, 1000));
 
-#if QT_DEPRECATED_SINCE(5, 11)
-        QCOMPARE(rgn.rects().size(), 2);
-        QCOMPARE(rgn.rects().at(0), QRect(0, 0, 10, 10));
-        QCOMPARE(rgn.rects().at(1), QRect(0, 100, 100, 1000));
-#endif
-
         QCOMPARE(rgn.boundingRect(), QRect(0, 0, 100, 1100));
     }
 
@@ -940,14 +911,6 @@ void tst_QRegion::regionFromPath()
         QCOMPARE(rgn.begin()[2], QRect(90, 10, 10, 80));
         QCOMPARE(rgn.begin()[3], QRect(0, 90, 100, 10));
 
-#if QT_DEPRECATED_SINCE(5, 11)
-        QCOMPARE(rgn.rects().size(), 4);
-        QCOMPARE(rgn.rects().at(0), QRect(0, 0, 100, 10));
-        QCOMPARE(rgn.rects().at(1), QRect(0, 10, 10, 80));
-        QCOMPARE(rgn.rects().at(2), QRect(90, 10, 10, 80));
-        QCOMPARE(rgn.rects().at(3), QRect(0, 90, 100, 10));
-#endif
-
         QCOMPARE(rgn.boundingRect(), QRect(0, 0, 100, 100));
     }
 }