diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-04-29 08:21:56 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-04-29 07:24:17 +0000 |
| commit | a5cce7cbc95c4aea4a57bdee0d7d5e0a08d1a88b (patch) | |
| tree | 3fba7d30f1509a1197dd549bf3fca89cb85fa743 /src/quicktemplates2/qquicktextarea_p.h | |
| parent | bb34d8491c0089a43bd545d403194c06e6382543 (diff) | |
Avoid "implicitWidth/Height redefined" warnings
In the same way that QQuickImplicitSizeItem does.
Task-number: QTBUG-49371
Change-Id: I1a8315c41e49139a9375f66a5714493331d22318
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquicktextarea_p.h')
| -rw-r--r-- | src/quicktemplates2/qquicktextarea_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquicktextarea_p.h b/src/quicktemplates2/qquicktextarea_p.h index 84dd86d6..3d0e5040 100644 --- a/src/quicktemplates2/qquicktextarea_p.h +++ b/src/quicktemplates2/qquicktextarea_p.h @@ -62,8 +62,8 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTextArea : public QQuickTextEdit { Q_OBJECT Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override - Q_PROPERTY(qreal implicitWidth READ implicitWidth WRITE setImplicitWidth NOTIFY implicitWidthChanged FINAL) - Q_PROPERTY(qreal implicitHeight READ implicitHeight WRITE setImplicitHeight NOTIFY implicitHeightChanged FINAL) + Q_PROPERTY(qreal implicitWidth READ implicitWidth WRITE setImplicitWidth NOTIFY implicitWidthChanged3 FINAL) + Q_PROPERTY(qreal implicitHeight READ implicitHeight WRITE setImplicitHeight NOTIFY implicitHeightChanged3 FINAL) Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText NOTIFY placeholderTextChanged FINAL) Q_PROPERTY(Qt::FocusReason focusReason READ focusReason WRITE setFocusReason NOTIFY focusReasonChanged FINAL) @@ -88,8 +88,8 @@ public: Q_SIGNALS: void fontChanged(); - void implicitWidthChanged(); - void implicitHeightChanged(); + void implicitWidthChanged3(); + void implicitHeightChanged3(); void backgroundChanged(); void placeholderTextChanged(); void focusReasonChanged(); |