diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-29 01:00:09 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-01-29 13:31:19 +0000 |
| commit | a4fe2d92099e33da39ad1216063a5869990eeab2 (patch) | |
| tree | c7d39d2a43929cbabc1d636cd9a09e55ece9243a /src/quick/items/qquicktextinput.cpp | |
| parent | 4b1c40570300248a7a7744aa7ddf8e77457bdc2b (diff) | |
| parent | deac8afcbf28ebe621ec3b8495ca1c9ad76843a5 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
Change-Id: I133bfd4bd9dd6f704252c956c90f05e8a8a40d6a
Diffstat (limited to 'src/quick/items/qquicktextinput.cpp')
| -rw-r--r-- | src/quick/items/qquicktextinput.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index eda2029783..6e0eb4e574 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -4695,6 +4695,18 @@ void QQuickTextInput::clear() These properties hold the padding around the content. This space is reserved in addition to the contentWidth and contentHeight. + + The individual padding properties assume the value of the \c padding + property unless they are set explicitly. For example, if \c padding is + set to \c 4 and \c leftPadding to \c 8, \c 8 will be used as the left + padding. + + \note If an explicit width or height is given to a TextInput, care must be + taken to ensure it is large enough to accommodate the relevant padding + values. For example: if \c topPadding and \c bottomPadding are set to + \c 10, but the height of the TextInput is only set to \c 20, the text will + not have enough vertical space in which to be rendered, and will appear + clipped. */ qreal QQuickTextInput::padding() const { |