diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 19:53:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-05 19:53:16 +0100 |
| commit | af47adede0de1e2420161d7b2f348343134a5009 (patch) | |
| tree | b60afed38e32a67c1be6f0178a6daff3b9268699 /src/gui | |
| parent | 47efa9213d92a4366e03bd6d056837cd5bbadb1e (diff) | |
| parent | 733ace5a7ad5b9e9f93ac87667d7d37fa5f894d5 (diff) | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qtextdocument.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h index a85e9c86c9..d8f52e9f98 100644 --- a/src/gui/text/qtextdocument.h +++ b/src/gui/text/qtextdocument.h @@ -71,6 +71,7 @@ class QTextCursor; template<typename T> class QVector; +#ifndef Q_QDOC // Workaround for QTBUG-35230 namespace Qt { Q_GUI_EXPORT bool mightBeRichText(const QString&); @@ -80,6 +81,7 @@ namespace Qt Q_GUI_EXPORT QTextCodec *codecForHtml(const QByteArray &ba); #endif } +#endif // Q_QDOC class Q_GUI_EXPORT QAbstractUndoItem { |