diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-07-15 13:14:37 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-07-15 13:14:37 (GMT) |
| commit | 8106f716043c22d71ff3dcdf9cd8a4db258fa81f (patch) | |
| tree | fef8ef2bcc78da549037c94451058fde10268edd /examples/declarative/ui-components/searchbox | |
| parent | a98bda4b42b068c9c3220ae2aded41a263387ac2 (diff) | |
| parent | 03c01176ebf423085e56ceabcf8335ca5027a786 (diff) | |
| download | Qt-8106f716043c22d71ff3dcdf9cd8a4db258fa81f.zip Qt-8106f716043c22d71ff3dcdf9cd8a4db258fa81f.tar.gz Qt-8106f716043c22d71ff3dcdf9cd8a4db258fa81f.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/kernel/qapplication.h
Diffstat (limited to 'examples/declarative/ui-components/searchbox')
| -rw-r--r-- | examples/declarative/ui-components/searchbox/SearchBox.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/ui-components/searchbox/SearchBox.qml b/examples/declarative/ui-components/searchbox/SearchBox.qml index e6b9c8f..6d87837 100644 --- a/examples/declarative/ui-components/searchbox/SearchBox.qml +++ b/examples/declarative/ui-components/searchbox/SearchBox.qml @@ -73,7 +73,7 @@ FocusScope { TextInput { id: textInput - anchors { left: parent.left; leftMargin: 8; verticalCenter: parent.verticalCenter } + anchors { left: parent.left; leftMargin: 8; right: clear.left; rightMargin: 8; verticalCenter: parent.verticalCenter } focus: true } |