aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-06 13:31:44 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-06 13:31:45 +0200
commit3703d57161dc4ad7df000403bfcc43ac78eb6617 (patch)
tree4ab8ca921336f38ca539b699c6f4c0d7dc3de949 /examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
parent94fdd09199b3373bc6d6e9d9c873cd16d54184a5 (diff)
parent567a5cf69ef39ba5e9d0558ee7d6caec4d69bf71 (diff)
Merge remote-tracking branch 'origin/5.13' into 5.14
Diffstat (limited to 'examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc')
-rw-r--r--examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc b/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
index a71c2093..5da21ff4 100644
--- a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
+++ b/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
@@ -31,7 +31,7 @@
\title Qt Quick Controls - Flat Style
\keyword Qt Quick Controls 2 - Flat Style
\ingroup qtquickcontrols2-examples
- \brief A QML app using Qt Quick Controls 2 and a QML plugin
+ \brief A QML app using Qt Quick Controls and a QML plugin
with customized controls.
\e Flat Style shows how to integrate customized controls into Qt Quick Designer.