aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2016-10-13 14:06:55 +0200
committerMitch Curtis <mitch.curtis@qt.io>2016-10-13 12:18:54 +0000
commit21472cdc51507387b4d640c28bbd7aabf194fff3 (patch)
tree65fd8c4f4195089833bfbe57dc79a108e7d2defb
parent8144f238999f7636de58e832865ca53e7e2a9e75 (diff)
Share Control::background notes with TextArea and TextField
Change-Id: I4150dbbc272d63cd842e19a30138c9b734d260ee Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
-rw-r--r--src/imports/controls/doc/src/includes/qquickcontrol-background.qdocinc13
-rw-r--r--src/quicktemplates2/qquickcontrol.cpp10
-rw-r--r--src/quicktemplates2/qquicktextarea.cpp4
-rw-r--r--src/quicktemplates2/qquicktextfield.cpp4
4 files changed, 16 insertions, 15 deletions
diff --git a/src/imports/controls/doc/src/includes/qquickcontrol-background.qdocinc b/src/imports/controls/doc/src/includes/qquickcontrol-background.qdocinc
new file mode 100644
index 00000000..02d92de0
--- /dev/null
+++ b/src/imports/controls/doc/src/includes/qquickcontrol-background.qdocinc
@@ -0,0 +1,13 @@
+//! [notes]
+
+\note If the background item has no explicit size specified, it automatically
+ follows the control's size. In most cases, there is no need to specify
+ width or height for a background item.
+
+\note Most controls use the implicit size of the background item to calculate
+the implicit size of the control itself. If you replace the background item
+with a custom one, you should also consider providing a sensible implicit
+size for it (unless it is an item like \l Image which has its own implicit
+size).
+
+//! [notes]
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index d571a2d4..5479d3a3 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -1016,15 +1016,7 @@ void QQuickControl::setWheelEnabled(bool enabled)
}
\endcode
- \note If the background item has no explicit size specified, it automatically
- follows the control's size. In most cases, there is no need to specify
- width or height for a background item.
-
- \note Most controls use the implicit size of the background item to calculate
- the implicit size of the control itself. If you replace the background item
- with a custom one, you should also consider providing a sensible implicit
- size for it (unless it is an item like \l Image which has its own implicit
- size).
+ \input qquickcontrol-background.qdocinc notes
\sa {Control Layout}
*/
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp
index dcdafe22..053e1099 100644
--- a/src/quicktemplates2/qquicktextarea.cpp
+++ b/src/quicktemplates2/qquicktextarea.cpp
@@ -391,9 +391,7 @@ void QQuickTextArea::setFont(const QFont &font)
This property holds the background item.
- \note If the background item has no explicit size specified, it automatically
- follows the control's size. In most cases, there is no need to specify
- width or height for a background item.
+ \input qquickcontrol-background.qdocinc notes
\sa {Customizing TextArea}
*/
diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp
index f893bdb5..850bbc58 100644
--- a/src/quicktemplates2/qquicktextfield.cpp
+++ b/src/quicktemplates2/qquicktextfield.cpp
@@ -271,9 +271,7 @@ void QQuickTextField::setFont(const QFont &font)
This property holds the background item.
- \note If the background item has no explicit size specified, it automatically
- follows the control's size. In most cases, there is no need to specify
- width or height for a background item.
+ \input qquickcontrol-background.qdocinc notes
\sa {Customizing TextField}
*/