diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-15 13:51:20 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-15 13:55:22 +0200 |
commit | 6f617349cf865ca3a7befc0dd472b7c2510fc431 (patch) | |
tree | 37e70da54a7f3101b82551ccd98508f8d9d64330 /examples/quickcontrols2/flatstyle | |
parent | 718e08392f34dc478ea010c08a4b9c77bb665dfc (diff) | |
parent | 8e2d1b1efe736760d27af17160f662454546b054 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Removed dependencies.yaml.
Change-Id: I1e2b3f486e9ace4bc8dc0419a64848990b3a6b39
Diffstat (limited to 'examples/quickcontrols2/flatstyle')
-rw-r--r-- | examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc | 2 |
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. |