diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-09-09 03:46:48 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-10 09:44:04 +0200 |
| commit | b0b786a2f05e9451a65519ab8904f55c35f51b7d (patch) | |
| tree | 0a0049f5851e50bd7d553f1aec00b90ac72b8be5 /src/gui | |
| parent | 8c58640fdfe5d182cd8ab9ad0598c54c0487eb7c (diff) | |
Deprecate QFontDatabase::supportsThreadedFontRendering()
As of 5.0, this always return true.
Change-Id: If225c7219e283da97e870f0d66a87b21c3cacfc0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 6 | ||||
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 3 | ||||
| -rw-r--r-- | src/gui/text/qfontdatabase.h | 4 | ||||
| -rw-r--r-- | src/gui/text/qfontdatabase_qpa.cpp | 5 |
4 files changed, 6 insertions, 12 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 64c07a8f4e..b315017d6d 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -6349,12 +6349,6 @@ void QPainterPrivate::drawTextItem(const QPointF &p, const QTextItem &_ti, QText if (!engine) return; -#ifndef QT_NO_DEBUG - qt_painter_thread_test(device->devType(), - "text and fonts", - QFontDatabase::supportsThreadedFontRendering()); -#endif - QTextItemInt &ti = const_cast<QTextItemInt &>(static_cast<const QTextItemInt &>(_ti)); if (!extended && state->bgMode == Qt::OpaqueMode) { 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 */ |