3 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 6da103e931..6703f66e29 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -2167,12 +2167,15 @@ QFont QFontDatabase::systemFont(QFontDatabase::SystemFont type)
 /*!
     \fn bool QFontDatabase::supportsThreadedFontRendering()
     \since 4.4
+    \deprecated
 
     Returns 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 true.
+
     \sa {Thread-Support in Qt Modules#Painting In Threads}{Painting In Threads}
 */
 
diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h
index bd603c3c4a..4e8f718962 100644
--- a/src/gui/text/qfontdatabase.h
+++ b/src/gui/text/qfontdatabase.h
@@ -150,7 +150,9 @@ public:
     static bool removeApplicationFont(int id);
     static bool removeAllApplicationFonts();
 
-    static bool supportsThreadedFontRendering();
+#if QT_DEPRECATED_SINCE(5, 2)
+    QT_DEPRECATED static inline bool supportsThreadedFontRendering() { return true; }
+#endif
 
     static QFont systemFont(SystemFont type);
 
diff --git a/src/gui/text/qfontdatabase_qpa.cpp b/src/gui/text/qfontdatabase_qpa.cpp
index 8e6ad7cd97..0e9c21799b 100644
--- a/src/gui/text/qfontdatabase_qpa.cpp
+++ b/src/gui/text/qfontdatabase_qpa.cpp
@@ -267,11 +267,6 @@ bool QFontDatabase::removeAllApplicationFonts()
     return true;
 }
 
-bool QFontDatabase::supportsThreadedFontRendering()
-{
-    return true;
-}
-
 /*!
     \internal
 */