6 files changed, 24 insertions, 12 deletions

diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp
index 92f5cf64..20fa8ef8 100644
--- a/src/quicktemplates2/qquicktextarea.cpp
+++ b/src/quicktemplates2/qquicktextarea.cpp
@@ -267,14 +267,14 @@ void QQuickTextAreaPrivate::implicitWidthChanged()
 {
     Q_Q(QQuickTextArea);
     QQuickItemPrivate::implicitWidthChanged();
-    emit q->implicitWidthChanged();
+    emit q->implicitWidthChanged3();
 }
 
 void QQuickTextAreaPrivate::implicitHeightChanged()
 {
     Q_Q(QQuickTextArea);
     QQuickItemPrivate::implicitHeightChanged();
-    emit q->implicitHeightChanged();
+    emit q->implicitHeightChanged3();
 }
 
 QQuickTextArea::QQuickTextArea(QQuickItem *parent) :
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();
diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp
index 3aae0791..551faf9e 100644
--- a/src/quicktemplates2/qquicktextfield.cpp
+++ b/src/quicktemplates2/qquicktextfield.cpp
@@ -135,14 +135,14 @@ void QQuickTextFieldPrivate::implicitWidthChanged()
 {
     Q_Q(QQuickTextField);
     QQuickItemPrivate::implicitWidthChanged();
-    emit q->implicitWidthChanged();
+    emit q->implicitWidthChanged3();
 }
 
 void QQuickTextFieldPrivate::implicitHeightChanged()
 {
     Q_Q(QQuickTextField);
     QQuickItemPrivate::implicitHeightChanged();
-    emit q->implicitHeightChanged();
+    emit q->implicitHeightChanged3();
 }
 
 QQuickTextField::QQuickTextField(QQuickItem *parent) :
diff --git a/src/quicktemplates2/qquicktextfield_p.h b/src/quicktemplates2/qquicktextfield_p.h
index 8953756e..976f4e69 100644
--- a/src/quicktemplates2/qquicktextfield_p.h
+++ b/src/quicktemplates2/qquicktextfield_p.h
@@ -61,8 +61,8 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTextField : public QQuickTextInput
 {
     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)
@@ -85,8 +85,8 @@ public:
 
 Q_SIGNALS:
     void fontChanged();
-    void implicitWidthChanged();
-    void implicitHeightChanged();
+    void implicitWidthChanged3();
+    void implicitHeightChanged3();
     void backgroundChanged();
     void placeholderTextChanged();
     void focusReasonChanged();
diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml
index f09304b0..3afa7193 100644
--- a/tests/auto/controls/data/tst_textarea.qml
+++ b/tests/auto/controls/data/tst_textarea.qml
@@ -77,10 +77,16 @@ TestCase {
 
     function test_implicitSize() {
         var control = textArea.createObject(testCase)
+
+        var implicitWidthSpy = signalSpy.createObject(control, { target: control, signalName: "implicitWidthChanged"} )
+        var implicitHeightSpy = signalSpy.createObject(control, { target: control, signalName: "implicitHeightChanged"} )
         control.background.implicitWidth = 400
         control.background.implicitHeight = 200
         compare(control.implicitWidth, 400)
         compare(control.implicitHeight, 200)
+        compare(implicitWidthSpy.count, 1)
+        compare(implicitHeightSpy.count, 1)
+
         control.destroy()
     }
 
diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml
index ef567450..012dedba 100644
--- a/tests/auto/controls/data/tst_textfield.qml
+++ b/tests/auto/controls/data/tst_textfield.qml
@@ -69,10 +69,16 @@ TestCase {
     function test_implicitSize() {
         var control = textField.createObject(testCase)
         verify(control.implicitWidth > control.leftPadding + control.rightPadding)
+
+        var implicitWidthSpy = signalSpy.createObject(control, { target: control, signalName: "implicitWidthChanged"} )
+        var implicitHeightSpy = signalSpy.createObject(control, { target: control, signalName: "implicitHeightChanged"} )
         control.background.implicitWidth = 400
         control.background.implicitHeight = 200
         compare(control.implicitWidth, 400)
         compare(control.implicitHeight, 200)
+        compare(implicitWidthSpy.count, 1)
+        compare(implicitHeightSpy.count, 1)
+
         control.destroy()
     }