From d688b7c07ccbe714eb93cb93648c5a181f537c48 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 20 Feb 2014 17:10:21 +0100 Subject: Deprecate QFont::setRawName() and QFont::rawName() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ø Reviewed-by: Konstantin Ritt Reviewed-by: Simon Hausmann Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/gui/text/qfont.cpp | 2 ++ src/gui/text/qfont.h | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') 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; -- cgit v1.2.3