diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-14 12:09:39 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-14 12:09:39 +0200 |
| commit | a6ca9472de6d4cbdb85dfceaa4f8c10b243cea07 (patch) | |
| tree | 719e2c3a1732ab0cc82c32d560484b5740f40a05 /src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc | |
| parent | 658b0f610a71fab8c103b913d2cfd11c3c7c6bef (diff) | |
| parent | b3619f32c20b5851ada0826ec2e7ddc2ec8a210b (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/quicktemplates2/qquicktextarea_p_p.h
src/quicktemplates2/qquicktextfield_p_p.h
Change-Id: Ie7b4a114ad27a4cad337c91e8ebcf696b0e845d7
Diffstat (limited to 'src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc')
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc index bbdf7f89..5cb7a9a5 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc @@ -300,6 +300,9 @@ \li \l [QML QtQuickControls] {Slider} \li \l [QML QtQuickControls2] {Slider} \row + \li \l [QML QtQuickControls] {SplitView} + \li \mdash + \row \li \l [QML QtQuickControls] {SpinBox} \li \l [QML QtQuickControls2] {SpinBox} \row |