diff options
| author | Robin Burchell <robin.burchell@collabora.com> | 2011-12-20 18:14:58 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-27 18:37:10 +0100 |
| commit | 7f32f6d6828e7c2c7defc8f476541969e2821cfa (patch) | |
| tree | b5b6beb2990b6ed9152cc8f0610f1b3609d93927 | |
| parent | 38d640ae6718c75532cb4cbd853e926772ff8f46 (diff) | |
Merge QTextDocumentFragment::toHtml() overload per Qt 5 comment.
Change-Id: Ic8850684c2298b996354e27cc96ad6486d7a3679
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| -rw-r--r-- | src/gui/text/qtextdocumentfragment.cpp | 10 | ||||
| -rw-r--r-- | src/gui/text/qtextdocumentfragment.h | 3 |
2 files changed, 1 insertions, 12 deletions
diff --git a/src/gui/text/qtextdocumentfragment.cpp b/src/gui/text/qtextdocumentfragment.cpp index 0c8860e98e..5ab7daf6ad 100644 --- a/src/gui/text/qtextdocumentfragment.cpp +++ b/src/gui/text/qtextdocumentfragment.cpp @@ -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 diff --git a/src/gui/text/qtextdocumentfragment.h b/src/gui/text/qtextdocumentfragment.h index 151a1a1ba5..2add88233e 100644 --- a/src/gui/text/qtextdocumentfragment.h +++ b/src/gui/text/qtextdocumentfragment.h @@ -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); |