diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-10 16:47:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-10 16:47:26 +0100 |
| commit | efa04c2ae8427c70848477ace3d8f6e82baaab11 (patch) | |
| tree | c0394c9cd5ce51961337a7a15e169074dd41632b /examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc | |
| parent | 9c7429219d36e8eb40e1fe6e679715c89209fc40 (diff) | |
| parent | 6476de0b669162cf08c11f5c8d5ad0b42419f365 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
src/imports/controls/qtquickcontrols2plugin.cpp
Change-Id: I27f1260b539354e084beb28be78385e57fda63e1
Diffstat (limited to 'examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc')
| -rw-r--r-- | examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc b/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc index c123b27e..a71c2093 100644 --- a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc +++ b/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc @@ -28,7 +28,8 @@ /*! \example flatstyle \keyword Qt Quick Controls - Flat Style - \title Qt Quick Controls 2 - Flat Style + \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 with customized controls. |