summaryrefslogtreecommitdiffstats
path: root/examples/declarative/searchbox/SearchBox.qml
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-04-13 06:53:18 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-04-13 06:53:18 (GMT)
commited5cbe3cc5d57360c205d22deb8bb77063227b8f (patch)
tree508cf4323e9fe9cf4e3a82de114d7cc10fcfa42c /examples/declarative/searchbox/SearchBox.qml
parent00b802ca9b2b09bc0357bc4b8f213657e24b02f8 (diff)
parent7544b0ddf02c5302eed430452efc5da311d8b1c7 (diff)
downloadQt-ed5cbe3cc5d57360c205d22deb8bb77063227b8f.zip
Qt-ed5cbe3cc5d57360c205d22deb8bb77063227b8f.tar.gz
Qt-ed5cbe3cc5d57360c205d22deb8bb77063227b8f.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'examples/declarative/searchbox/SearchBox.qml')
-rw-r--r--examples/declarative/searchbox/SearchBox.qml6
1 files changed, 4 insertions, 2 deletions
diff --git a/examples/declarative/searchbox/SearchBox.qml b/examples/declarative/searchbox/SearchBox.qml
index adeddd1..aae7ee9 100644
--- a/examples/declarative/searchbox/SearchBox.qml
+++ b/examples/declarative/searchbox/SearchBox.qml
@@ -21,7 +21,9 @@ FocusScope {
id: typeSomething
anchors.fill: parent; anchors.leftMargin: 8
verticalAlignment: Text.AlignVCenter
- text: "Type something..."; color: "gray"; font.italic: true
+ text: "Type something..."
+ color: "gray"
+ font.italic: true
}
MouseArea { anchors.fill: parent; onClicked: focusScope.focus = true }
@@ -29,7 +31,7 @@ FocusScope {
TextInput {
id: textInput
anchors { left: parent.left; leftMargin: 8; verticalCenter: parent.verticalCenter }
- focus: if (1) true
+ focus: true
}
Image {