summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2015-02-27 09:55:52 +0100
committerMartin Smith <martin.smith@digia.com>2015-03-07 09:47:13 +0000
commit94bad40392ad89489744e4d59889fa0e920063b4 (patch)
treea7106c3582e486d09da1cc4b07698cff51f364a1
parentd5e56fd9135f61b05596cfdf095b301bc5cb3fef (diff)
qdoc: Remove unnecessary ifndef Q_QDOC
It was preventing some functions in the Qt namespace from being documented and hence auto-links to these functions failed. Change-Id: Ie820eb7c8172deac40554e993e4d61a765a616f4 Task-number: QTBUG-44688 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
-rw-r--r--src/gui/text/qtextdocument.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h
index 333bbb202f..ca80a88033 100644
--- a/src/gui/text/qtextdocument.h
+++ b/src/gui/text/qtextdocument.h
@@ -63,7 +63,6 @@ class QTextCursor;
template<typename T> class QVector;
-#ifndef Q_QDOC // Workaround for QTBUG-35230
namespace Qt
{
Q_GUI_EXPORT bool mightBeRichText(const QString&);
@@ -73,7 +72,6 @@ namespace Qt
Q_GUI_EXPORT QTextCodec *codecForHtml(const QByteArray &ba);
#endif
}
-#endif // Q_QDOC
class Q_GUI_EXPORT QAbstractUndoItem
{