diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-19 10:03:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-19 10:03:47 +0100 |
| commit | 698a8268f786d74726eb07255df2d26ac2269079 (patch) | |
| tree | 7f63974c3a13b507166e84459be7b5fc2787d2e1 /src/controls/doc/src/qtquickcontrols-index.qdoc | |
| parent | 314d1bdf7d56462102639e12d34596cbfd4fce95 (diff) | |
| parent | eb048e486daa3644476fdec5b0bd016b1729fc01 (diff) | |
| download | qtquickcontrols-698a8268f786d74726eb07255df2d26ac2269079.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/dialogs/qquickabstractfiledialog_p.h
tests/auto/controls/data/tst_combobox.qml
Change-Id: I62e54d0a2e89d987e05e8dfad6ae6aac1a32cc72
Diffstat (limited to 'src/controls/doc/src/qtquickcontrols-index.qdoc')
| -rw-r--r-- | src/controls/doc/src/qtquickcontrols-index.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/doc/src/qtquickcontrols-index.qdoc b/src/controls/doc/src/qtquickcontrols-index.qdoc index 2dc7d13b..63753ae1 100644 --- a/src/controls/doc/src/qtquickcontrols-index.qdoc +++ b/src/controls/doc/src/qtquickcontrols-index.qdoc @@ -34,7 +34,7 @@ The Qt Quick Controls module provides a set of controls that can be used to build complete interfaces in Qt Quick. - The module is new in Qt 5.1. + The module was introduced in Qt 5.1. Visit the \l{Qt Quick Controls Overview} page to get started. |