summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-23 03:02:22 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-23 03:02:22 +0200
commitbfb7d1a9b026d3735930b31d79d936d5a3d4c79d (patch)
treed70fdb16dcb9525c28e0e2c5927c5372b2cc64b3
parentf2c24adbb3e9561bb2f49f9dfa4daf5d5f315f6a (diff)
parent3b71eea2e6e712103452c98756cd6ce53aa4ebca (diff)
downloadqtquickcontrols-bfb7d1a9b026d3735930b31d79d936d5a3d4c79d.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia4e23f05ee0dc32d13ad809f4021cd5f0cdff701
-rw-r--r--examples/quickcontrols/dialogs/systemdialogs/doc/src/systemdialogs.qdoc2
-rw-r--r--src/controls/Calendar.qml2
-rw-r--r--src/controls/Styles/Base/ApplicationWindowStyle.qml2
-rw-r--r--src/controls/Styles/Base/BusyIndicatorStyle.qml2
-rw-r--r--src/controls/Styles/Base/ButtonStyle.qml2
-rw-r--r--src/controls/Styles/Base/CalendarStyle.qml2
-rw-r--r--src/controls/Styles/Base/CheckBoxStyle.qml2
-rw-r--r--src/controls/Styles/Base/ComboBoxStyle.qml2
-rw-r--r--src/controls/Styles/Base/MenuBarStyle.qml2
-rw-r--r--src/controls/Styles/Base/MenuStyle.qml2
-rw-r--r--src/controls/Styles/Base/ProgressBarStyle.qml2
-rw-r--r--src/controls/Styles/Base/RadioButtonStyle.qml2
-rw-r--r--src/controls/Styles/Base/ScrollViewStyle.qml2
-rw-r--r--src/controls/Styles/Base/SliderStyle.qml2
-rw-r--r--src/controls/Styles/Base/SpinBoxStyle.qml2
-rw-r--r--src/controls/Styles/Base/StatusBarStyle.qml2
-rw-r--r--src/controls/Styles/Base/SwitchStyle.qml2
-rw-r--r--src/controls/Styles/Base/TabViewStyle.qml2
-rw-r--r--src/controls/Styles/Base/ToolBarStyle.qml2
-rw-r--r--src/controls/doc/src/qtquickcontrols-examples.qdoc6
-rw-r--r--src/controls/doc/src/qtquickcontrolsstyles-tableviewstyle.qdoc2
-rw-r--r--src/controls/doc/src/qtquickcontrolsstyles-treeviewstyle.qdoc2
-rw-r--r--src/controls/qquickaction.cpp2
-rw-r--r--src/extras/qquickpicture.cpp2
24 files changed, 26 insertions, 26 deletions
diff --git a/examples/quickcontrols/dialogs/systemdialogs/doc/src/systemdialogs.qdoc b/examples/quickcontrols/dialogs/systemdialogs/doc/src/systemdialogs.qdoc
index 1912a906..21032e85 100644
--- a/examples/quickcontrols/dialogs/systemdialogs/doc/src/systemdialogs.qdoc
+++ b/examples/quickcontrols/dialogs/systemdialogs/doc/src/systemdialogs.qdoc
@@ -28,7 +28,7 @@
/*!
\title Qt Quick System Dialog Examples
\example systemdialogs
- \brief This example demonstrates the system dialog types in QML
+ \brief This example demonstrates the system dialog types in QML.
\image systemdialogs-example.jpg
\ingroup qtquickdialog_examples
diff --git a/src/controls/Calendar.qml b/src/controls/Calendar.qml
index a5b32210..3a225744 100644
--- a/src/controls/Calendar.qml
+++ b/src/controls/Calendar.qml
@@ -47,7 +47,7 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls
\since 5.3
\ingroup controls
- \brief Provides a way to select dates from a calendar
+ \brief Provides a way to select dates from a calendar.
\image calendar.png
diff --git a/src/controls/Styles/Base/ApplicationWindowStyle.qml b/src/controls/Styles/Base/ApplicationWindowStyle.qml
index bd34e3c2..398567bb 100644
--- a/src/controls/Styles/Base/ApplicationWindowStyle.qml
+++ b/src/controls/Styles/Base/ApplicationWindowStyle.qml
@@ -46,7 +46,7 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls.Styles
\since 5.4
\ingroup controlsstyling
- \brief Provides custom styling for ApplicationWindow
+ \brief Provides custom styling for ApplicationWindow.
You can create a custom window background by replacing the "background"
delegate of ApplicationWindowStyle with a custom design.
diff --git a/src/controls/Styles/Base/BusyIndicatorStyle.qml b/src/controls/Styles/Base/BusyIndicatorStyle.qml
index ac49f6d1..da2a2aa5 100644
--- a/src/controls/Styles/Base/BusyIndicatorStyle.qml
+++ b/src/controls/Styles/Base/BusyIndicatorStyle.qml
@@ -46,7 +46,7 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls.Styles
\since 5.2
\ingroup controlsstyling
- \brief Provides custom styling for BusyIndicatorStyle
+ \brief Provides custom styling for BusyIndicatorStyle.
You can create a busy indicator by replacing the "indicator" delegate
of the BusyIndicatorStyle with a custom design.
diff --git a/src/controls/Styles/Base/ButtonStyle.qml b/src/controls/Styles/Base/ButtonStyle.qml
index bc597f35..5a3fa551 100644
--- a/src/controls/Styles/Base/ButtonStyle.qml
+++ b/src/controls/Styles/Base/ButtonStyle.qml
@@ -46,7 +46,7 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls.Styles
\since 5.1
\ingroup controlsstyling
- \brief Provides custom styling for Button
+ \brief Provides custom styling for Button.
You can create a custom button by replacing the "background" delegate
of the ButtonStyle with a custom design.
diff --git a/src/controls/Styles/Base/CalendarStyle.qml b/src/controls/Styles/Base/CalendarStyle.qml
index 9da43ce5..20459274 100644
--- a/src/controls/Styles/Base/CalendarStyle.qml
+++ b/src/controls/Styles/Base/CalendarStyle.qml
@@ -46,7 +46,7 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls.Styles
\since 5.3
\ingroup controlsstyling
- \brief Provides custom styling for \l Calendar
+ \brief Provides custom styling for \l Calendar.
\section2 Component Map
diff --git a/src/controls/Styles/Base/CheckBoxStyle.qml b/src/controls/Styles/Base/CheckBoxStyle.qml
index 98f45740..a476a953 100644
--- a/src/controls/Styles/Base/CheckBoxStyle.qml
+++ b/src/controls/Styles/Base/CheckBoxStyle.qml
@@ -48,7 +48,7 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls.Styles
\since 5.1
\ingroup controlsstyling
- \brief Provides custom styling for CheckBox
+ \brief Provides custom styling for CheckBox.
Example:
\qml
diff --git a/src/controls/Styles/Base/ComboBoxStyle.qml b/src/controls/Styles/Base/ComboBoxStyle.qml
index 764fe29f..ea13696c 100644
--- a/src/controls/Styles/Base/ComboBoxStyle.qml
+++ b/src/controls/Styles/Base/ComboBoxStyle.qml
@@ -48,7 +48,7 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls.Styles
\since 5.1
\ingroup controlsstyling
- \brief Provides custom styling for ComboBox
+ \brief Provides custom styling for ComboBox.
*/
Style {
diff --git a/src/controls/Styles/Base/MenuBarStyle.qml b/src/controls/Styles/Base/MenuBarStyle.qml
index 7add8f09..5992d981 100644
--- a/src/controls/Styles/Base/MenuBarStyle.qml
+++ b/src/controls/Styles/Base/MenuBarStyle.qml
@@ -46,7 +46,7 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls.Styles
\since 5.3
\ingroup controlsstyling
- \brief Provides custom styling for MenuBar
+ \brief Provides custom styling for MenuBar.
\note Styling menu bars may not be supported on platforms using native menu bars
through their QPA plugin.
diff --git a/src/controls/Styles/Base/MenuStyle.qml b/src/controls/Styles/Base/MenuStyle.qml
index dc92eb15..13a889c4 100644
--- a/src/controls/Styles/Base/MenuStyle.qml
+++ b/src/controls/Styles/Base/MenuStyle.qml
@@ -47,7 +47,7 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls.Styles
\since 5.3
\ingroup controlsstyling
- \brief Provides custom styling for Menu
+ \brief Provides custom styling for Menu.
\target styleData properties
The \b styleData object contains the following read-only properties:
diff --git a/src/controls/Styles/Base/ProgressBarStyle.qml b/src/controls/Styles/Base/ProgressBarStyle.qml
index caceff07..b65c0f40 100644
--- a/src/controls/Styles/Base/ProgressBarStyle.qml
+++ b/src/controls/Styles/Base/ProgressBarStyle.qml
@@ -47,7 +47,7 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls.Styles
\since 5.1
\ingroup controlsstyling
- \brief Provides custom styling for ProgressBar
+ \brief Provides custom styling for ProgressBar.
Example:
\qml
diff --git a/src/controls/Styles/Base/RadioButtonStyle.qml b/src/controls/Styles/Base/RadioButtonStyle.qml
index 768345b9..6e3a2dc4 100644
--- a/src/controls/Styles/Base/RadioButtonStyle.qml
+++ b/src/controls/Styles/Base/RadioButtonStyle.qml
@@ -46,7 +46,7 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls.Styles
\since 5.1
\ingroup controlsstyling
- \brief Provides custom styling for RadioButton
+ \brief Provides custom styling for RadioButton.
Example:
\qml
diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml
index 26285c85..6750399d 100644
--- a/src/controls/Styles/Base/ScrollViewStyle.qml
+++ b/src/controls/Styles/Base/ScrollViewStyle.qml
@@ -47,7 +47,7 @@ import QtQuick.Controls.Private 1.0
\since 5.1
\ingroup viewsstyling
\ingroup controlsstyling
- \brief Provides custom styling for ScrollView
+ \brief Provides custom styling for ScrollView.
*/
Style {
id: root
diff --git a/src/controls/Styles/Base/SliderStyle.qml b/src/controls/Styles/Base/SliderStyle.qml
index 085fa56e..ca503064 100644
--- a/src/controls/Styles/Base/SliderStyle.qml
+++ b/src/controls/Styles/Base/SliderStyle.qml
@@ -46,7 +46,7 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls.Styles
\since 5.1
\ingroup controlsstyling
- \brief Provides custom styling for Slider
+ \brief Provides custom styling for Slider.
The slider style allows you to create a custom appearance for
a \l Slider control.
diff --git a/src/controls/Styles/Base/SpinBoxStyle.qml b/src/controls/Styles/Base/SpinBoxStyle.qml
index c2a2e013..bc57ef6e 100644
--- a/src/controls/Styles/Base/SpinBoxStyle.qml
+++ b/src/controls/Styles/Base/SpinBoxStyle.qml
@@ -46,7 +46,7 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls.Styles
\since 5.2
\ingroup controlsstyling
- \brief Provides custom styling for SpinBox
+ \brief Provides custom styling for SpinBox.
Example:
\qml
diff --git a/src/controls/Styles/Base/StatusBarStyle.qml b/src/controls/Styles/Base/StatusBarStyle.qml
index a6348259..8b620424 100644
--- a/src/controls/Styles/Base/StatusBarStyle.qml
+++ b/src/controls/Styles/Base/StatusBarStyle.qml
@@ -46,7 +46,7 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls.Styles
\ingroup controlsstyling
\since 5.2
- \brief Provides custom styling for StatusBar
+ \brief Provides custom styling for StatusBar.
The status bar can be defined by overriding the background component and
setting the content padding.
diff --git a/src/controls/Styles/Base/SwitchStyle.qml b/src/controls/Styles/Base/SwitchStyle.qml
index bb4ca120..39db036b 100644
--- a/src/controls/Styles/Base/SwitchStyle.qml
+++ b/src/controls/Styles/Base/SwitchStyle.qml
@@ -46,7 +46,7 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls.Styles
\since 5.2
\ingroup controlsstyling
- \brief Provides custom styling for Switch
+ \brief Provides custom styling for Switch.
Example:
\qml
diff --git a/src/controls/Styles/Base/TabViewStyle.qml b/src/controls/Styles/Base/TabViewStyle.qml
index e6db324a..2d7d2d91 100644
--- a/src/controls/Styles/Base/TabViewStyle.qml
+++ b/src/controls/Styles/Base/TabViewStyle.qml
@@ -47,7 +47,7 @@ import QtQuick.Controls.Private 1.0
\since 5.1
\ingroup viewsstyling
\ingroup controlsstyling
- \brief Provides custom styling for TabView
+ \brief Provides custom styling for TabView.
\qml
TabView {
diff --git a/src/controls/Styles/Base/ToolBarStyle.qml b/src/controls/Styles/Base/ToolBarStyle.qml
index 967deccf..8c34efa9 100644
--- a/src/controls/Styles/Base/ToolBarStyle.qml
+++ b/src/controls/Styles/Base/ToolBarStyle.qml
@@ -46,7 +46,7 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls.Styles
\ingroup controlsstyling
\since 5.2
- \brief Provides custom styling for ToolBar
+ \brief Provides custom styling for ToolBar.
The tool bar can be defined by overriding the background component and
setting the content padding.
diff --git a/src/controls/doc/src/qtquickcontrols-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc
index 08f61e10..fff6103e 100644
--- a/src/controls/doc/src/qtquickcontrols-examples.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-examples.qdoc
@@ -208,7 +208,7 @@
\example touch
\title Qt Quick Controls - Touch Gallery
\ingroup qtquickcontrols_examples
- \brief Demonstrates UI controls for a touch interface
+ \brief Demonstrates UI controls for a touch interface.
\image qtquickcontrols-example-touch.png
\e {Touch Gallery} demonstrates how to implement a UI suitable for touch
@@ -454,7 +454,7 @@
\example calendar
\title Qt Quick Controls - Calendar Example
\ingroup qtquickcontrols_examples
- \brief Demonstrates the use of Calendar control
+ \brief Demonstrates the use of Calendar control.
\image qtquickcontrols-example-calendar.png
The Calendar example displays a Calendar control and an events list for
@@ -542,7 +542,7 @@
\example styles
\title Qt Quick Controls - Styles Example
\ingroup qtquickcontrols_examples
- \brief Demonstrates custom styles
+ \brief Demonstrates custom styles.
\image qtquickcontrols-example-styles.png
This example shows how to create custom styles for \l{Qt Quick Controls}.
diff --git a/src/controls/doc/src/qtquickcontrolsstyles-tableviewstyle.qdoc b/src/controls/doc/src/qtquickcontrolsstyles-tableviewstyle.qdoc
index efb4094d..51f7ca8b 100644
--- a/src/controls/doc/src/qtquickcontrolsstyles-tableviewstyle.qdoc
+++ b/src/controls/doc/src/qtquickcontrolsstyles-tableviewstyle.qdoc
@@ -32,7 +32,7 @@
\since 5.1
\ingroup viewsstyling
\ingroup controlsstyling
- \brief Provides custom styling for TableView
+ \brief Provides custom styling for TableView.
*/
/*!
diff --git a/src/controls/doc/src/qtquickcontrolsstyles-treeviewstyle.qdoc b/src/controls/doc/src/qtquickcontrolsstyles-treeviewstyle.qdoc
index 4e135f26..224621aa 100644
--- a/src/controls/doc/src/qtquickcontrolsstyles-treeviewstyle.qdoc
+++ b/src/controls/doc/src/qtquickcontrolsstyles-treeviewstyle.qdoc
@@ -32,7 +32,7 @@
\since 5.5
\ingroup viewsstyling
\ingroup controlsstyling
- \brief Provides custom styling for TreeView
+ \brief Provides custom styling for TreeView.
*/
/*!
diff --git a/src/controls/qquickaction.cpp b/src/controls/qquickaction.cpp
index 836c02da..27fd3377 100644
--- a/src/controls/qquickaction.cpp
+++ b/src/controls/qquickaction.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
\ingroup applicationwindow
\ingroup controls
\inqmlmodule QtQuick.Controls
- \brief Action provides an abstract user interface action that can be bound to items
+ \brief Action provides an abstract user interface action that can be bound to items.
\image menubar-action.png
diff --git a/src/extras/qquickpicture.cpp b/src/extras/qquickpicture.cpp
index 0a778288..73892572 100644
--- a/src/extras/qquickpicture.cpp
+++ b/src/extras/qquickpicture.cpp
@@ -51,7 +51,7 @@
\since QtQuick.Extras 1.4
\ingroup extras
\ingroup extras-non-interactive
- \brief An indicator that displays a colorized QPicture icon
+ \brief An indicator that displays a colorized QPicture icon.
Picture displays icons in a scalable vector format. It can also colorize
the icons via the \l color property.