diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:48:12 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:48:12 +0200 |
| commit | 7063fefe4b5e866b27001bb9b911fc2f68034e40 (patch) | |
| tree | 1ce35139475d83399572a3265414c2da3443a321 /src/quick/items/qquicktextedit_p_p.h | |
| parent | f3446071da8357620d0c8593a04e3b4fbba88f21 (diff) | |
| parent | 4f3379352a265bab00a7265f85ffc38a9ca4ffe4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I11ea57222ba5aa683b7bfd7735fbc1d2cf86e875
Diffstat (limited to 'src/quick/items/qquicktextedit_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktextedit_p_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h index e6f1c0ee21..a2b4c1ab99 100644 --- a/src/quick/items/qquicktextedit_p_p.h +++ b/src/quick/items/qquicktextedit_p_p.h @@ -94,7 +94,7 @@ public: bool explicitLeftPadding : 1; bool explicitRightPadding : 1; bool explicitBottomPadding : 1; - bool explicitImplicitSize : 1; + bool implicitResize : 1; }; QLazilyAllocated<ExtraData> extra; @@ -159,6 +159,9 @@ public: void setRightPadding(qreal value, bool reset = false); void setBottomPadding(qreal value, bool reset = false); + bool isImplicitResizeEnabled() const; + void setImplicitResizeEnabled(bool enabled); + QColor color; QColor selectionColor; QColor selectedTextColor; |