diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-11 13:19:30 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-11 13:19:30 +0200 |
| commit | 3408d28e3c058c620f4dfb167a1e25c3618fc90f (patch) | |
| tree | f70f55faf78e89e2260f7464868c0feefbbf647a /src/imports/controls/doc | |
| parent | 40f59da21a74b5999db90e1eb7073f292ac3e54e (diff) | |
| parent | 880475bbe620a533db7b7b744e0b4c98fbf34d1b (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/quicktemplates2/qquickcontrol.cpp
Change-Id: I73a9946da4214dcb8c877e716af5a8bb64335f69
Diffstat (limited to 'src/imports/controls/doc')
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc index 230690ea..e6e2977f 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc @@ -246,9 +246,7 @@ \li \l [QML QtQuickControls] {ComboBox} \li \l [QML QtQuickControls2] {ComboBox} \li - \li \list - \li \b {Qt Quick Controls 2}: \c ComboBox is not editable. - \endlist + \li \row \li \l [QML QtQuickControls] {ExclusiveGroup} \li \mdash |