diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 01:00:39 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-01-28 14:14:20 +0000 |
| commit | 558fc903acc610769279da2737ad679aa9fd728d (patch) | |
| tree | ebe36deb140e47ca32fea9b0753cde06f465a0fa /src/widgets/util/qundoview.cpp | |
| parent | 089d54f06ff327f5212cb08fdbcb540066357dd5 (diff) | |
| parent | be8c257da9a264994243c120231965ff0008ef09 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/io/qsettings.cpp
src/corelib/kernel/qvariant.cpp
src/corelib/serialization/qjsoncbor.cpp
src/corelib/serialization/qjsonvalue.cpp
src/corelib/tools/tools.pri
src/gui/image/qimage.cpp
src/gui/kernel/qguivariant.cpp
src/widgets/kernel/qshortcut.cpp
tests/auto/tools/moc/allmocs_baseline_in.json
tests/auto/tools/moc/tst_moc.cpp
src/opengl/qglframebufferobject.cpp
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Done-With: Leander Beernaert <leander.beernaert@qt.io>
Change-Id: Ie7f5fa646c607fe70c314bf7195f7578ded1d271
Diffstat (limited to 'src/widgets/util/qundoview.cpp')
| -rw-r--r-- | src/widgets/util/qundoview.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/util/qundoview.cpp b/src/widgets/util/qundoview.cpp index 9ca83a1da2..a39276a2b8 100644 --- a/src/widgets/util/qundoview.cpp +++ b/src/widgets/util/qundoview.cpp @@ -358,8 +358,8 @@ QUndoStack *QUndoView::stack() const } /*! - Sets the stack displayed by this view to \a stack. If \a stack is 0, the view - will be empty. + Sets the stack displayed by this view to \a stack. If \a stack is \nullptr, + the view will be empty. If the view was previously looking at a QUndoGroup, the group is set to \nullptr. @@ -378,10 +378,10 @@ void QUndoView::setStack(QUndoStack *stack) #if QT_CONFIG(undogroup) /*! - Sets the group displayed by this view to \a group. If \a group is 0, the view will - be empty. + Sets the group displayed by this view to \a group. If \a group is \nullptr, + the view will be empty. - The view will update itself autmiatically whenever the active stack of the group changes. + The view will update itself automatically whenever the active stack of the group changes. \sa group(), setStack() */ |