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 <simon.hausmann@nokia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
This commit is contained in:
parent
b77b5cc5be
commit
1abf0ca5e3
@ -265,6 +265,15 @@ public:
|
||||
ElideNone
|
||||
};
|
||||
|
||||
enum WhiteSpaceMode {
|
||||
WhiteSpaceNormal,
|
||||
WhiteSpacePre,
|
||||
WhiteSpaceNoWrap,
|
||||
WhiteSpaceModeUndefined = -1
|
||||
};
|
||||
|
||||
enum HitTestAccuracy { ExactHit, FuzzyHit };
|
||||
|
||||
enum WindowType {
|
||||
Widget = 0x00000000,
|
||||
Window = 0x00000001,
|
||||
|
@ -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.
|
||||
*/
|
||||
|
||||
/*!
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user