diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-04 01:00:07 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-04 01:00:07 +0200 |
| commit | f80b7995f3e5bc289f3255dfe914e1acde328af2 (patch) | |
| tree | 6cb3e1043532c8157a3163f3b1630c6486cb440f /src/corelib/tools/qsharedpointer.cpp | |
| parent | c4d46723eb8cd17b17b87df230d502a071f4ac19 (diff) | |
| parent | 06d753e87b71e6b02bbe937b488c8598c9945521 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ia7328524f2cd9d5995ac8705f0fe0bf570b2e831
Diffstat (limited to 'src/corelib/tools/qsharedpointer.cpp')
| -rw-r--r-- | src/corelib/tools/qsharedpointer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp index 8bc0dc8a74f..62b76c5bb72 100644 --- a/src/corelib/tools/qsharedpointer.cpp +++ b/src/corelib/tools/qsharedpointer.cpp @@ -875,7 +875,7 @@ \b without ensuring that it cannot get deleted. To have that guarantee, use toStrongRef(), which returns a QSharedPointer object. If this function can determine that the pointer has already been deleted, it - returns 0. + returns \nullptr. It is ok to obtain the value of the pointer and using that value itself, like for example in debugging statements: |