Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: I11ea57222ba5aa683b7bfd7735fbc1d2cf86e875

1 files changed, 4 insertions, 1 deletions

diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h
index fa7462c0c5..6aaa630839 100644
--- a/src/quick/items/qquicktextinput_p_p.h
+++ b/src/quick/items/qquicktextinput_p_p.h
@@ -84,7 +84,7 @@ public:
         bool explicitLeftPadding : 1;
         bool explicitRightPadding : 1;
         bool explicitBottomPadding : 1;
-        bool explicitImplicitSize : 1;
+        bool implicitResize : 1;
     };
     QLazilyAllocated<ExtraData> extra;
 
@@ -447,6 +447,9 @@ public:
     void setRightPadding(qreal value, bool reset = false);
     void setBottomPadding(qreal value, bool reset = false);
 
+    bool isImplicitResizeEnabled() const;
+    void setImplicitResizeEnabled(bool enabled);
+
 private:
     void removeSelectedText();
     void internalSetText(const QString &txt, int pos = -1, bool edited = true);