diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-04-23 07:02:24 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-04-23 07:02:24 (GMT) |
| commit | 80d1bc3da3ac03deb321a307a87df1f5f331e48f (patch) | |
| tree | 54f3ef183a295d7682db3c92bd86cc6f21370f1c /src/declarative/graphicsitems/qdeclarativetextedit.cpp | |
| parent | 8ede65299dc5644d84a394d6a96cbdbd39e69ecf (diff) | |
| parent | 571de030b02a5549c6069bf31dec69eb239870a6 (diff) | |
| download | Qt-80d1bc3da3ac03deb321a307a87df1f5f331e48f.zip Qt-80d1bc3da3ac03deb321a307a87df1f5f331e48f.tar.gz Qt-80d1bc3da3ac03deb321a307a87df1f5f331e48f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index 77fb459..25eaef6 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -495,19 +495,6 @@ void QDeclarativeTextEdit::setWrapMode(WrapMode mode) emit wrapModeChanged(); } -bool QDeclarativeTextEdit::wrap() const -{ - Q_D(const QDeclarativeTextEdit); - return d->wrapMode != QDeclarativeTextEdit::NoWrap; -} - -void QDeclarativeTextEdit::setWrap(bool w) -{ - - qmlInfo(this) << "\"wrap\" property is deprecated and will soon be removed. Use wrapMode"; - setWrapMode(w ? WordWrap : NoWrap); -} - /*! \qmlproperty bool TextEdit::cursorVisible If true the text edit shows a cursor. |