From 94bad40392ad89489744e4d59889fa0e920063b4 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@digia.com>
Date: Fri, 27 Feb 2015 09:55:52 +0100
Subject: qdoc: Remove unnecessary ifndef Q_QDOC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/gui/text/qtextdocument.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/gui/text/qtextdocument.h')

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
 {
-- 
cgit v1.2.3