whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge QTextDocumentFragment::toHtml() overload per Qt 5 comment. 

Change-Id: Ic8850684c2298b996354e27cc96ad6486d7a3679
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
bb10
Robin Burchell 2011-12-20 18:14:58 +01:00 committed by Qt by Nokia
parent 38d640ae67
commit 7f32f6d682
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/text/qtextdocumentfragment.cpp
View File

@ -372,18 +372,8 @@ QString QTextDocumentFragment::toPlainText() const
return d->doc->toPlainText();
}
// #### Qt 5: merge with other overload
/*!
\overload
*/
#ifndef QT_NO_TEXTHTMLPARSER
QString QTextDocumentFragment::toHtml() const
{
return toHtml(QByteArray());
}
/*!
\since 4.2

3
src/gui/text/qtextdocumentfragment.h
View File

@ -69,8 +69,7 @@ public:
QString toPlainText() const;
#ifndef QT_NO_TEXTHTMLPARSER
QString toHtml() const;
QString toHtml(const QByteArray &encoding) const;
QString toHtml(const QByteArray &encoding = QByteArray()) const;
#endif // QT_NO_TEXTHTMLPARSER
static QTextDocumentFragment fromPlainText(const QString &plainText);