diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-02-20 17:10:21 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-27 22:02:39 +0100 |
| commit | d688b7c07ccbe714eb93cb93648c5a181f537c48 (patch) | |
| tree | dab2b5c27166e051d27ebf7efa7dd3b77e75896d /src/gui | |
| parent | 3df521dd98d32017b124ec1985389632056d3b5e (diff) | |
Deprecate QFont::setRawName() and QFont::rawName()
We don't support xlfd fonts anymore and indeed QFont::setRawName()
is an empty method.
[Changelog][QtGui] QFont::setRawName() and QFont::rawName() are
deprecated.
Change-Id: Ic52d42a9bc200ba8b246dd4e28c77f84e086dad5
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qfont.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qfont.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index e6bddeebf7..cf40dd028d 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -546,6 +546,7 @@ QFontEngineData::~QFontEngineData() /*! \fn QString QFont::rawName() const + \deprecated Returns the name of the font within the underlying window system. @@ -559,6 +560,7 @@ QFontEngineData::~QFontEngineData() /*! \fn void QFont::setRawName(const QString &name) + \deprecated Sets a font by its system specific name. diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index a207a1d60e..7fbaf24861 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -242,9 +242,11 @@ public: { qSwap(d, other.d); qSwap(resolve_mask, other.resolve_mask); return *this; } #endif +#if QT_DEPRECATED_SINCE(5, 3) // needed for X11 - void setRawName(const QString &); - QString rawName() const; + QT_DEPRECATED void setRawName(const QString &); + QT_DEPRECATED QString rawName() const; +#endif QString key() const; |