From e6ddae07e1e571a7a6e0c531b961dbddcd217643 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Tue, 19 May 2015 15:03:12 +0200 Subject: Doc:added doc to undocumented functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-36985 Change-Id: Ic358682b276d67ef804f727bcf14191718613469 Reviewed-by: Topi Reiniö --- src/gui/text/qfontmetrics.cpp | 5 +++++ src/gui/text/qtextdocument.cpp | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/gui/text') diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp index e351d4d2c5..5bc9fe3c7f 100644 --- a/src/gui/text/qfontmetrics.cpp +++ b/src/gui/text/qfontmetrics.cpp @@ -208,6 +208,11 @@ QFontMetrics &QFontMetrics::operator=(const QFontMetrics &fm) \since 5.2 */ +/*! + \fn QFontMetricsF &QFontMetricsF::operator=(QFontMetricsF &&other) + + Move-assigns \a other to this QFontMetricsF instance. +*/ /*! \fn void QFontMetrics::swap(QFontMetrics &other) diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index d3b70aaf26..29e00d481e 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -135,9 +135,8 @@ bool Qt::mightBeRichText(const QString& text) return false; } -/*! - \fn QString Qt::convertFromPlainText(const QString &plain, WhiteSpaceMode mode) +/*! Converts the plain text string \a plain to an HTML-formatted paragraph while preserving most of its look. -- cgit v1.2.3