diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-10-08 03:56:17 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-10-08 03:56:17 (GMT) |
| commit | 08a1c212752bd1c1eeda1706c9531ac502441f35 (patch) | |
| tree | 5e006d239fce38d78e72a2a18c3f9aeeb0ded006 /src/declarative/fx/qfxtextedit.h | |
| parent | 28c8570d38fe1a5f57300a48668506a6235a9081 (diff) | |
| parent | 1cd996492f2776ef44a73057aa5a110d0e0d24d9 (diff) | |
| download | Qt-08a1c212752bd1c1eeda1706c9531ac502441f35.zip Qt-08a1c212752bd1c1eeda1706c9531ac502441f35.tar.gz Qt-08a1c212752bd1c1eeda1706c9531ac502441f35.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxtextedit.h')
| -rw-r--r-- | src/declarative/fx/qfxtextedit.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h index 1a5d968..f4f101a 100644 --- a/src/declarative/fx/qfxtextedit.h +++ b/src/declarative/fx/qfxtextedit.h @@ -83,7 +83,7 @@ class Q_DECLARATIVE_EXPORT QFxTextEdit : public QFxPaintedItem Q_PROPERTY(int selectionEnd READ selectionEnd WRITE setSelectionEnd NOTIFY selectionEndChanged) Q_PROPERTY(QString selectedText READ selectedText NOTIFY selectionChanged) Q_PROPERTY(bool focusOnPress READ focusOnPress WRITE setFocusOnPress) - Q_PROPERTY(bool preserveSelection READ preserveSelection WRITE setPreserveSelection) + Q_PROPERTY(bool persistentSelection READ persistentSelection WRITE setPersistentSelection) Q_PROPERTY(qreal textMargin READ textMargin WRITE setTextMargin) public: @@ -154,8 +154,8 @@ public: bool focusOnPress() const; void setFocusOnPress(bool on); - bool preserveSelection() const; - void setPreserveSelection(bool on); + bool persistentSelection() const; + void setPersistentSelection(bool on); qreal textMargin() const; void setTextMargin(qreal margin); |