diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-29 22:25:11 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-30 09:51:36 +0000 |
| commit | 19e7cc53a7189c5c35a478d06b435433297771c5 (patch) | |
| tree | a1b1958cdaf36813b362b943acc4a55ba5294b27 /src/imports/templates | |
| parent | 390fb0d4a8e4f308b225a86b48205b14633cf0e2 (diff) | |
Simplify TextField & TextArea placeholder
Better not expose the extra Text item in the API. Ideally it should
be implemented as a scenegraph node. We might even want to promote
the placeholderText property (and add placeholderColor) to TextInput
and TextEdit in Qt Quick core.
Change-Id: I4f443c77d1c696b87a50ee184f868713dd50316f
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src/imports/templates')
| -rw-r--r-- | src/imports/templates/plugins.qmltypes | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes index 571ed723..1aa4a52b 100644 --- a/src/imports/templates/plugins.qmltypes +++ b/src/imports/templates/plugins.qmltypes @@ -853,7 +853,7 @@ Module { Property { name: "implicitWidth"; type: "double" } Property { name: "implicitHeight"; type: "double" } Property { name: "background"; type: "QQuickItem"; isPointer: true } - Property { name: "placeholder"; type: "QQuickText"; isPointer: true } + Property { name: "placeholderText"; type: "string" } Signal { name: "pressAndHold" Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } @@ -1130,7 +1130,7 @@ Module { Property { name: "implicitWidth"; type: "double" } Property { name: "implicitHeight"; type: "double" } Property { name: "background"; type: "QQuickItem"; isPointer: true } - Property { name: "placeholder"; type: "QQuickText"; isPointer: true } + Property { name: "placeholderText"; type: "string" } Signal { name: "pressAndHold" Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true } |