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/styles/qstyle.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/styles/qstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qstyle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index e462d0696b..1110cc3323 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -2361,14 +2361,14 @@ QPalette QStyle::standardPalette() const \fn int QStyle::layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, - const QStyleOption *option = 0, const QWidget *widget = 0) const + const QStyleOption *option = nullptr, const QWidget *widget = nullptr) const Returns the spacing that should be used between \a control1 and \a control2 in a layout. \a orientation specifies whether the controls are laid out side by side or stacked vertically. The \a option parameter can be used to pass extra information about the parent widget. The \a widget parameter is optional and can also - be used if \a option is 0. + be used if \a option is \nullptr. This function is called by the layout system. It is used only if PM_LayoutHorizontalSpacing or PM_LayoutVerticalSpacing returns a @@ -2385,7 +2385,7 @@ QPalette QStyle::standardPalette() const controls are laid out side by side or stacked vertically. The \a option parameter can be used to pass extra information about the parent widget. The \a widget parameter is optional and can also - be used if \a option is 0. + be used if \a option is \nullptr. \a controls1 and \a controls2 are OR-combination of zero or more \l{QSizePolicy::ControlTypes}{control types}. |