path: root/src/gui/text/qtextdocument.h
diff options
authorTopi Reinio <>2013-11-29 15:51:12 +0100
committerThe Qt Project <>2013-12-03 11:41:03 +0100
commit789b556ef1241dd3169c6040944fff44b88d9be6 (patch)
tree21ae49bb122be2820480f68c955357c53e4cb612 /src/gui/text/qtextdocument.h
parentd1f9f2125e6cbba236dc50309a4aee2dc16a6345 (diff)
Use Q_QDOC for Qt namespace declaration in Qt Gui
This is a workaround for letting qdoc to successfully generate documentation for the Qt namespace. qdoc doesn't properly handle multiple declarations for the same namespace spread across multiple modules. Task-number: QTBUG-35230 Change-Id: I449b17e1171d1a4481b9cf07cd48c803feed5be9 Reviewed-by: Martin Smith <> Reviewed-by: Lars Knoll <>
Diffstat (limited to 'src/gui/text/qtextdocument.h')
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 // Q_QDOC
class Q_GUI_EXPORT QAbstractUndoItem