diff options
| -rw-r--r-- | src/corelib/global/qnamespace.h | 9 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 4 | ||||
| -rw-r--r-- | src/gui/text/qtextdocument.h | 8 |
3 files changed, 9 insertions, 12 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index a302c8ce51..1940c1acff 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -265,6 +265,15 @@ public: ElideNone }; + enum WhiteSpaceMode { + WhiteSpaceNormal, + WhiteSpacePre, + WhiteSpaceNoWrap, + WhiteSpaceModeUndefined = -1 + }; + + enum HitTestAccuracy { ExactHit, FuzzyHit }; + enum WindowType { Widget = 0x00000000, Window = 0x00000001, diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 453079ae63..a91e97a5f7 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -1665,8 +1665,6 @@ exactly with input-sensitive parts of the document. \value FuzzyHit The point at which input occurred can lie close to input-sensitive parts of the document. - - This enum is defined in the \c <QTextDocument> header file. */ /*! @@ -1683,8 +1681,6 @@ \value WhiteSpaceNoWrap \omitvalue WhiteSpaceModeUndefined - - This enum is defined in the \c <QTextDocument> header file. */ /*! 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<typename T> 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); |