summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qpointer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/kernel/qpointer.cpp')
-rw-r--r--src/corelib/kernel/qpointer.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp
index f81451d906..e0e14e5b79 100644
--- a/src/corelib/kernel/qpointer.cpp
+++ b/src/corelib/kernel/qpointer.cpp
@@ -56,7 +56,7 @@
destroyed while you still hold a reference to it. You can safely
test the pointer for validity.
- Note that Qt 5 introduces two slight changes in behavior when using QPointer.
+ Note that Qt 5 introduces a slight change in behavior when using QPointer.
\list
@@ -66,12 +66,6 @@
cleared). Any QPointers tracking a widget will \b NOT be cleared before the
QWidget destructor destroys the children for the widget being tracked.
- \li When constructing a QSharedPointer to take ownership of an object after a
- QPointer is already tracking the object. Previously, the shared pointer
- construction would not be affected by the QPointer, but now that QPointer
- is implemented using QWeakPoiner, constructing the QSharedPointer will
- cause an \c abort().
-
\endlist
Qt also provides QSharedPointer, an implementation of a reference-counted