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 <martin.smith@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Topi Reinio 2013-11-29 15:51:12 +01:00 committed by The Qt Project
parent d1f9f2125e
commit 789b556ef1

View File

@ -71,6 +71,7 @@ class QTextCursor;
template<typename T> class QVector; template<typename T> class QVector;
#ifndef Q_QDOC // Workaround for QTBUG-35230
namespace Qt namespace Qt
{ {
Q_GUI_EXPORT bool mightBeRichText(const QString&); Q_GUI_EXPORT bool mightBeRichText(const QString&);
@ -80,6 +81,7 @@ namespace Qt
Q_GUI_EXPORT QTextCodec *codecForHtml(const QByteArray &ba); Q_GUI_EXPORT QTextCodec *codecForHtml(const QByteArray &ba);
#endif #endif
} }
#endif // Q_QDOC
class Q_GUI_EXPORT QAbstractUndoItem class Q_GUI_EXPORT QAbstractUndoItem
{ {