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/templates/qquicktextarea_p.h | |
| 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/templates/qquicktextarea_p.h')
| -rw-r--r-- | src/templates/qquicktextarea_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/templates/qquicktextarea_p.h b/src/templates/qquicktextarea_p.h index a77cfeb8..13022ce5 100644 --- a/src/templates/qquicktextarea_p.h +++ b/src/templates/qquicktextarea_p.h @@ -64,7 +64,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickTextArea : public QQuickTextEdit Q_PROPERTY(qreal implicitWidth READ implicitWidth WRITE setImplicitWidth NOTIFY implicitWidthChanged FINAL) Q_PROPERTY(qreal implicitHeight READ implicitHeight WRITE setImplicitHeight NOTIFY implicitHeightChanged FINAL) Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) - Q_PROPERTY(QQuickText *placeholder READ placeholder WRITE setPlaceholder NOTIFY placeholderChanged FINAL) + Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText NOTIFY placeholderTextChanged FINAL) public: explicit QQuickTextArea(QQuickItem *parent = Q_NULLPTR); @@ -76,15 +76,15 @@ public: QQuickItem *background() const; void setBackground(QQuickItem *background); - QQuickText *placeholder() const; - void setPlaceholder(QQuickText *placeholder); + QString placeholderText() const; + void setPlaceholderText(const QString &text); Q_SIGNALS: void fontChanged(); void implicitWidthChanged(); void implicitHeightChanged(); void backgroundChanged(); - void placeholderChanged(); + void placeholderTextChanged(); void pressAndHold(QQuickMouseEvent *event); protected: |