Docs: Label

Change-Id: I744f622edbc6589e9371518f82431220b667e03e
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

6 files changed, 55 insertions, 1 deletions

diff --git a/src/imports/controls/doc/images/qtlabscontrols-label-background.png b/src/imports/controls/doc/images/qtlabscontrols-label-background.png
new file mode 100644
index 00000000..ecd081df
--- /dev/null
+++ b/src/imports/controls/doc/images/qtlabscontrols-label-background.png
diff --git a/src/imports/controls/doc/images/qtlabscontrols-label.png b/src/imports/controls/doc/images/qtlabscontrols-label.png
new file mode 100644
index 00000000..c4c53871
--- /dev/null
+++ b/src/imports/controls/doc/images/qtlabscontrols-label.png
diff --git a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
index c3b577b6..474caba9 100644
--- a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
@@ -157,7 +157,13 @@
 
     \section1 Customizing Label
 
-        TODO
+        Label can have a visual \l {Label::background}{background} item.
+
+        \section3 Background
+
+            \image qtlabscontrols-label-background.png
+
+            Label has no background item by default.
 
 
     \section1 Customizing PageIndicator
diff --git a/src/templates/qquicklabel.cpp b/src/templates/qquicklabel.cpp
index a977313e..efc7ee74 100644
--- a/src/templates/qquicklabel.cpp
+++ b/src/templates/qquicklabel.cpp
@@ -49,6 +49,25 @@
 
 QT_BEGIN_NAMESPACE
 
+/*!
+    \qmltype Label
+    \inherits Text
+    \instantiates QQuickLabel
+    \inqmlmodule Qt.labs.controls
+    \ingroup text
+    \brief A text label.
+
+    Label extends \l Text with styling and \l {Control::font}{font}
+    inheritance. The default colors and font are style specific. Label
+    can also have a visual \l background item.
+
+    \image qtlabscontrols-label.png
+
+    \snippet qtlabscontrols-label.qml 1
+
+    \sa {Customizing Label}
+*/
+
 QQuickLabel::QQuickLabel(QQuickItem *parent) :
     QQuickText(*(new QQuickLabelPrivate), parent)
 {
@@ -130,6 +149,17 @@ void QQuickLabel::classBegin()
 #endif
 }
 
+/*!
+    \qmlproperty Item Qt.labs.controls::Label::background
+
+    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.
+
+    \sa {Customizing Label}
+*/
 QQuickItem *QQuickLabel::background() const
 {
     Q_D(const QQuickLabel);
diff --git a/tests/auto/snippets/data/qtlabscontrols-label-background.qml b/tests/auto/snippets/data/qtlabscontrols-label-background.qml
new file mode 100644
index 00000000..0281b4cd
--- /dev/null
+++ b/tests/auto/snippets/data/qtlabscontrols-label-background.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.0
+import Qt.labs.controls 1.0
+
+Label {
+    text: "Label"
+    background: Rectangle {
+        color: 'transparent'
+        border.color: 'red'
+    }
+}
diff --git a/tests/auto/snippets/data/qtlabscontrols-label.qml b/tests/auto/snippets/data/qtlabscontrols-label.qml
new file mode 100644
index 00000000..8ac6978a
--- /dev/null
+++ b/tests/auto/snippets/data/qtlabscontrols-label.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import Qt.labs.controls 1.0
+
+//! [1]
+Label {
+    text: "Label"
+}
+//! [1]