path: root/src/gui/text/qtextdocument.h
diff options
authorJiang Jiang <>2011-05-11 12:13:01 +0200
committerJiang Jiang <>2011-05-11 15:28:09 +0200
commit16628b76c0d24927cb6160447a1439d40a4f0fea (patch)
tree1cb8282fbce932e8031cb28c960922d7820aa2f1 /src/gui/text/qtextdocument.h
parent3032ba0f8eae871db2f36443f26a7977b5261740 (diff)
Move QTextCursor::MoveStyle to Qt namespace
We cannot use QTextCursor::MoveStyle enums in QTextLine because QTextCursor is not a QObject, while referring to that enum in Q_PROPERTY requires it to be. That's why we need to move the enums in Qt namespace. Reviewed-by: David Boddie (cherry picked from commit 5eba82b752e85a5d6cb3a893214ed2646d75f362)
Diffstat (limited to 'src/gui/text/qtextdocument.h')
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h
index e515b36cc0..b826dc1777 100644
--- a/src/gui/text/qtextdocument.h
+++ b/src/gui/text/qtextdocument.h
@@ -46,7 +46,6 @@
#include <QtCore/qsize.h>
#include <QtCore/qrect.h>
#include <QtGui/qfont.h>
-#include <QtGui/qtextcursor.h>
@@ -70,6 +69,7 @@ class QUrl;
class QVariant;
class QRectF;
class QTextOption;
+class QTextCursor;
template<typename T> class QVector;
@@ -269,8 +269,8 @@ public:
QTextOption defaultTextOption() const;
void setDefaultTextOption(const QTextOption &option);
- QTextCursor::MoveStyle defaultCursorMoveStyle() const;
- void setDefaultCursorMoveStyle(QTextCursor::MoveStyle style);
+ Qt::CursorMoveStyle defaultCursorMoveStyle() const;
+ void setDefaultCursorMoveStyle(Qt::CursorMoveStyle style);
void contentsChange(int from, int charsRemoves, int charsAdded);