diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-14 01:00:21 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-03-14 10:49:29 +0100 |
| commit | 32084b073362e52df597cc388cf54f5173e20b0d (patch) | |
| tree | 9a6f881f0ab0bc22e3a491fae81d494815cc514f /src/gui | |
| parent | 8d4e8217fdc01417ab8ea33303dd0ce7f769d10e (diff) | |
| parent | eb25acc05b177c49eb81b190a476854fbf3c6fb1 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/tools/qcollator_win.cpp
Change-Id: I6d806d7c58b2057ebde3ad915bb5551f34b700e5
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/itemmodels/qstandarditemmodel.cpp | 8 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformcursor.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwindow.cpp | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index 97cbf5f9d3..3e3c7a6211 100644 --- a/src/gui/itemmodels/qstandarditemmodel.cpp +++ b/src/gui/itemmodels/qstandarditemmodel.cpp @@ -1905,7 +1905,7 @@ QStandardItem *QStandardItem::takeChild(int row, int column) /*! Removes \a row without deleting the row items, and returns a list of pointers to the removed items. For items in the row that have not been - set, the corresponding pointers in the list will be 0. + set, the corresponding pointers in the list will be \nullptr. \sa removeRow(), insertRow(), takeColumn() */ @@ -1939,7 +1939,7 @@ QList<QStandardItem*> QStandardItem::takeRow(int row) /*! Removes \a column without deleting the column items, and returns a list of pointers to the removed items. For items in the column that have not been - set, the corresponding pointers in the list will be 0. + set, the corresponding pointers in the list will be \nullptr. \sa removeColumn(), insertColumn(), takeRow() */ @@ -2718,7 +2718,7 @@ QStandardItem *QStandardItemModel::takeItem(int row, int column) Removes the given \a row without deleting the row items, and returns a list of pointers to the removed items. The model releases ownership of the items. For items in the row that have not been set, the corresponding - pointers in the list will be 0. + pointers in the list will be \nullptr. \sa takeColumn() */ @@ -2734,7 +2734,7 @@ QList<QStandardItem*> QStandardItemModel::takeRow(int row) Removes the given \a column without deleting the column items, and returns a list of pointers to the removed items. The model releases ownership of the items. For items in the column that have not been set, the - corresponding pointers in the list will be 0. + corresponding pointers in the list will be \nullptr. \sa takeRow() */ diff --git a/src/gui/kernel/qplatformcursor.cpp b/src/gui/kernel/qplatformcursor.cpp index 76e38ab12d..49eff2ad23 100644 --- a/src/gui/kernel/qplatformcursor.cpp +++ b/src/gui/kernel/qplatformcursor.cpp @@ -89,7 +89,7 @@ QT_BEGIN_NAMESPACE set or the system default cursor should take effect. \a window is a pointer to the window currently displayed at QCursor::pos(). Note - that this may be 0 if the current position is not occupied by a displayed widget. + that this may be \nullptr if the current position is not occupied by a displayed widget. \sa QCursor::pos() */ diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 3040a20308..1cc2435239 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -688,7 +688,8 @@ QWindow *QWindow::parent() const Sets the \a parent Window. This will lead to the windowing system managing the clip of the window, so it will be clipped to the \a parent window. - Setting \a parent to be 0 will make the window become a top level window. + Setting \a parent to be \nullptr will make the window become a top level + window. If \a parent is a window created by fromWinId(), then the current window will be embedded inside \a parent, if the platform supports it. |