diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-12 11:02:01 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-12 12:48:12 +0200 |
| commit | 6697f2a899fac47a65122a85691b2cfe63c6152c (patch) | |
| tree | 6ae8ad93c7455f9571d1b1b868ae077af89d96df /src/widgets/widgets/qlineedit.h | |
| parent | e577d02cc9cba2033cd21c23a4420a1f0d5469a4 (diff) | |
| parent | 1f806aa1b40db276dad359863d018171080d93f9 (diff) | |
Merge remote branch 'origin/master' into refactor
Conflicts:
src/gui/gui.pro
src/gui/painting/painting.pri
src/opengl/opengl.pro
src/openvg/openvg.pro
Diffstat (limited to 'src/widgets/widgets/qlineedit.h')
| -rw-r--r-- | src/widgets/widgets/qlineedit.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/widgets/qlineedit.h b/src/widgets/widgets/qlineedit.h index 7f7a7287fb..2718f71549 100644 --- a/src/widgets/widgets/qlineedit.h +++ b/src/widgets/widgets/qlineedit.h @@ -85,6 +85,7 @@ class Q_GUI_EXPORT QLineEdit : public QWidget Q_PROPERTY(bool redoAvailable READ isRedoAvailable) Q_PROPERTY(bool acceptableInput READ hasAcceptableInput) Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText) + Q_PROPERTY(Qt::CursorMoveStyle cursorMoveStyle READ cursorMoveStyle WRITE setCursorMoveStyle) public: explicit QLineEdit(QWidget* parent=0); @@ -159,8 +160,8 @@ public: void setDragEnabled(bool b); bool dragEnabled() const; - void setCursorMoveStyle(QTextCursor::MoveStyle style); - QTextCursor::MoveStyle cursorMoveStyle() const; + void setCursorMoveStyle(Qt::CursorMoveStyle style); + Qt::CursorMoveStyle cursorMoveStyle() const; QString inputMask() const; void setInputMask(const QString &inputMask); |