diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-11 07:40:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-11 07:40:32 +0200 |
| commit | 905329200f2f3f9372bf07a001371c30c0663684 (patch) | |
| tree | e6f072ea693c377ae306b3960f4bde36ee20bc17 /src/widgets/doc | |
| parent | 91cde062968f97041bca8d2a30d13aa03b606c3d (diff) | |
| parent | 1a78ef09b93b0a7337075555dc91032f39fab2a9 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/gui/image/qpixmap.cpp
src/widgets/kernel/qformlayout.cpp
Change-Id: I8a8391a202adf7f18464a22ddf0a6c4974eab692
Diffstat (limited to 'src/widgets/doc')
| -rw-r--r-- | src/widgets/doc/src/model-view-programming.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/doc/src/model-view-programming.qdoc b/src/widgets/doc/src/model-view-programming.qdoc index 6a4aaa489a..e727d7fe56 100644 --- a/src/widgets/doc/src/model-view-programming.qdoc +++ b/src/widgets/doc/src/model-view-programming.qdoc @@ -737,7 +737,7 @@ \image spinboxdelegate-example.png - We subclass the delegate from \l QItemDelegate because we do not want + We subclass the delegate from \l QStyledItemDelegate because we do not want to write custom display functions. However, we must still provide functions to manage the editor widget: |