diff options
author | Paul Wicking <paul.wicking@qt.io> | 2019-02-01 13:33:25 +0100 |
---|---|---|
committer | Paul Wicking <paul.wicking@qt.io> | 2019-02-01 13:33:26 +0100 |
commit | 2bc362c9fa37455afbeb56e5f1852188ede3eab4 (patch) | |
tree | b89e3c2c082a0285e8cd91733ddbc772fe4362a5 /src/widgets/widgets/qtabwidget.cpp | |
parent | 5de981d3bc3df874f9df35a6899345f4f61fa951 (diff) | |
parent | 481db443d502c8ebc169b7256cb696428cf02199 (diff) |
Merge dev into 5.13
Change-Id: I8113c6d8735a151bd152e6096f8c8b8e63a05474
Diffstat (limited to 'src/widgets/widgets/qtabwidget.cpp')
-rw-r--r-- | src/widgets/widgets/qtabwidget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp index 8a848554e3..547b8a82f9 100644 --- a/src/widgets/widgets/qtabwidget.cpp +++ b/src/widgets/widgets/qtabwidget.cpp @@ -579,7 +579,7 @@ void QTabWidget::setTabEnabled(int index, bool enable) All widgets set here will be deleted by the tab widget when it is destroyed unless you separately reparent the widget after setting - some other corner widget (or 0). + some other corner widget (or \nullptr). Note: Corner widgets are designed for \l North and \l South tab positions; other orientations are known to not work properly. @@ -605,7 +605,7 @@ void QTabWidget::setCornerWidget(QWidget * widget, Qt::Corner corner) } /*! - Returns the widget shown in the \a corner of the tab widget or 0. + Returns the widget shown in the \a corner of the tab widget or \nullptr. */ QWidget * QTabWidget::cornerWidget(Qt::Corner corner) const { @@ -1146,8 +1146,8 @@ void QTabWidget::keyPressEvent(QKeyEvent *e) } /*! - Returns the tab page at index position \a index or 0 if the \a - index is out of range. + Returns the tab page at index position \a index or \nullptr if the + \a index is out of range. */ QWidget *QTabWidget::widget(int index) const { |