From 1abf0ca5e39b2f9f95d96f805484b122b2dc5e05 Mon Sep 17 00:00:00 2001 From: Jan-Arve Saether Date: Thu, 6 Sep 2012 15:08:40 +0200 Subject: Move enums that was part of the Qt namespace to qnamespace.h This caused some headache wrt documentation, since in order to generate the proper documentation for the qt namespace qdoc also needed to parse the headers of gui, which breaks cross-module linking. (This is because qdoc will actually generate two almost identical nodes in the code tree; one from the header files from gui and another from the index file of gui). The best fix would maybe be to make it part of QAbstractTextDocumentLayout, but that will break source compat. Change-Id: I34e94d05fa4bec3034778d1f1cc0e53d0625e1ab Reviewed-by: Simon Hausmann Reviewed-by: Konstantin Ritt --- src/gui/text/qtextdocument.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/gui/text') diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h index 65ea1c8fd6..c4ececafea 100644 --- a/src/gui/text/qtextdocument.h +++ b/src/gui/text/qtextdocument.h @@ -75,14 +75,6 @@ template class QVector; namespace Qt { - enum HitTestAccuracy { ExactHit, FuzzyHit }; - enum WhiteSpaceMode { - WhiteSpaceNormal, - WhiteSpacePre, - WhiteSpaceNoWrap, - WhiteSpaceModeUndefined = -1 - }; - Q_GUI_EXPORT bool mightBeRichText(const QString&); Q_GUI_EXPORT QString convertFromPlainText(const QString &plain, WhiteSpaceMode mode = WhiteSpacePre); -- cgit v1.2.3