diff options
| -rw-r--r-- | demos/declarative/flickr/common/MediaLineEdit.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/flickr/mobile/TitleBar.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/twitter/content/AuthView.qml | 6 | ||||
| -rw-r--r-- | demos/declarative/twitter/content/HomeTitleBar.qml | 2 | ||||
| -rw-r--r-- | src/declarative/fx/qfxtextinput.h | 1 |
5 files changed, 7 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 { diff --git a/src/declarative/fx/qfxtextinput.h b/src/declarative/fx/qfxtextinput.h index bc5bbf4..4fa4100 100644 --- a/src/declarative/fx/qfxtextinput.h +++ b/src/declarative/fx/qfxtextinput.h @@ -59,6 +59,7 @@ class Q_DECLARATIVE_EXPORT QFxTextInput : public QFxPaintedItem { Q_OBJECT Q_ENUMS(HAlignment) + Q_ENUMS(EchoMode) Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged) Q_PROPERTY(QColor color READ color WRITE setColor) |