diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-09-10 03:23:06 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-09-10 03:23:06 (GMT) |
| commit | 155f7c91e869092962f23c0e1d793cb82fb7544d (patch) | |
| tree | 407c119e3c158bdb321344abf1fa40cf7841ee0f /demos | |
| parent | 2c0255521f00a1fd95988161a03c39631350eaba (diff) | |
| parent | c41597a34b3435ea2d06f70e90f7d0c561a24215 (diff) | |
| download | Qt-155f7c91e869092962f23c0e1d793cb82fb7544d.zip Qt-155f7c91e869092962f23c0e1d793cb82fb7544d.tar.gz Qt-155f7c91e869092962f23c0e1d793cb82fb7544d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos')
4 files changed, 6 insertions, 6 deletions
diff --git a/demos/declarative/flickr/common/MediaLineEdit.qml b/demos/declarative/flickr/common/MediaLineEdit.qml index 094571f..7599ce6a05 100644 --- a/demos/declarative/flickr/common/MediaLineEdit.qml +++ b/demos/declarative/flickr/common/MediaLineEdit.qml @@ -90,7 +90,7 @@ Item { id: Editor font.bold: true color: "white" - highlightColor: "green" + selectionColor: "green" width: 0 clip: true anchors.left: Label.right diff --git a/demos/declarative/flickr/mobile/TitleBar.qml b/demos/declarative/flickr/mobile/TitleBar.qml index b95452a..13484a2 100644 --- a/demos/declarative/flickr/mobile/TitleBar.qml +++ b/demos/declarative/flickr/mobile/TitleBar.qml @@ -50,7 +50,7 @@ Item { verticalCenter: parent.verticalCenter } cursorVisible: true; font.bold: true - color: "#151515"; highlightColor: "Green" + color: "#151515"; selectionColor: "Green" } Keys.forwardTo: [ (ReturnKey), (Editor)] diff --git a/demos/declarative/twitter/content/AuthView.qml b/demos/declarative/twitter/content/AuthView.qml index febee94..3fe7e7e 100644 --- a/demos/declarative/twitter/content/AuthView.qml +++ b/demos/declarative/twitter/content/AuthView.qml @@ -27,7 +27,7 @@ Item { anchors.centerIn: parent maximumLength:21 font.bold: true - color: "#151515"; highlightColor: "green" + color: "#151515"; selectionColor: "green" Keys.forwardTo: [(tabber), (nameIn)] Item { id: tabber @@ -56,9 +56,9 @@ Item { height: parent.height - 12 anchors.centerIn: parent maximumLength:21 - echoMode: 2 + echoMode: TextInput.Password font.bold: true - color: "#151515"; highlightColor: "green" + color: "#151515"; selectionColor: "green" } } } diff --git a/demos/declarative/twitter/content/HomeTitleBar.qml b/demos/declarative/twitter/content/HomeTitleBar.qml index 9bca2c8..bd3bc2c 100644 --- a/demos/declarative/twitter/content/HomeTitleBar.qml +++ b/demos/declarative/twitter/content/HomeTitleBar.qml @@ -92,7 +92,7 @@ Item { height: parent.height - 8 font.pointSize: 10 wrap:true - color: "#151515"; highlightColor: "green" + color: "#151515"; selectionColor: "green" } Keys.forwardTo: [(ReturnKey), (Editor)] Item { |