diff options
author | aavit <qt-info@nokia.com> | 2010-11-19 12:30:09 (GMT) |
---|---|---|
committer | aavit <qt-info@nokia.com> | 2010-11-19 12:30:09 (GMT) |
commit | 8034cab2cce55b43dcc1100d0b22f8c85eb733c2 (patch) | |
tree | 5a1637fa48ce23e12c6a51490f6a481fd1ca1a5a /tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml | |
parent | e614223831f2b3cc9051ae88586370a7d5b63db2 (diff) | |
parent | 1d152964adec62d03ce2f4a45ca40ddbd05819ae (diff) | |
download | Qt-8034cab2cce55b43dcc1100d0b22f8c85eb733c2.zip Qt-8034cab2cce55b43dcc1100d0b22f8c85eb733c2.tar.gz Qt-8034cab2cce55b43dcc1100d0b22f8c85eb733c2.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml')
-rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml index f03e1cc..bf5e7a0 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml @@ -3,12 +3,12 @@ import QtQuick 1.0 Rectangle{ width: 280 height: 140 - Column{ - MultilineEdit{ + Column { + MultilineEdit { text: 'I am the very model of a modern major general. I\'ve information vegetable, animal and mineral. I know the kings of england and I quote the fights historical - from Marathon to Waterloo in order categorical.'; width: 182; height: 60; } - Rectangle{height: 20; width: 20;}//Spacer - MultilineEdit{text: 'Hello world'} + Rectangle {height: 20; width: 20;}//Spacer + MultilineEdit {text: 'Hello world'} } } |