diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-24 23:11:57 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-24 23:11:57 (GMT) |
| commit | b1fc72462f178d70d6eaae8b649c5dda2040fdd5 (patch) | |
| tree | ed5fc44ab5d3b29c9ba493e1971ff84b45290b4f /src/declarative/graphicsitems/qdeclarativetextedit.cpp | |
| parent | 3af5a362a034fe7f9085a202adfdf13252de1715 (diff) | |
| download | Qt-b1fc72462f178d70d6eaae8b649c5dda2040fdd5.zip Qt-b1fc72462f178d70d6eaae8b649c5dda2040fdd5.tar.gz Qt-b1fc72462f178d70d6eaae8b649c5dda2040fdd5.tar.bz2 | |
Fix TextEdit implicit height.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index 7b00d2f..55843c1 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -1170,7 +1170,7 @@ void QDeclarativeTextEdit::updateSize() newWidth += 3;// ### Need a better way of accounting for space between char and cursor // ### Setting the implicitWidth triggers another updateSize(), and unless there are bindings nothing has changed. setImplicitWidth(newWidth); - setImplicitHeight(d->text.isEmpty() ? fm.height() : (int)d->document->size().height()); + setImplicitHeight(d->document->isEmpty() ? fm.height() : (int)d->document->size().height()); setContentsSize(QSize(width(), height())); } else { |