diff options
author | Debao Zhang <dbzhang800@gmail.com> | 2012-03-16 16:05:09 -0700 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-18 03:55:07 +0100 |
commit | 78e0ab3342c9b877c55cb74d19fd87c8c9a5385a (patch) | |
tree | 8c3905d01a2f86e0fea65645eb36c1da67ce6c9c /src/corelib/kernel/qpointer.cpp | |
parent | 7b26a2cf2e8cc0b52d5f68ddbf43d5166be5ce22 (diff) |
QPointer: update its document and changes-5.0.0
QPointer has been un-deprecated and one behavior which slightly different
from Qt4 has been fixed.
see SHA: b8773165d76e0d5d46287d92f9d6bdbbd2110180
and SHA: 497622cafe235eadb5dd5056b196d8451ee89071
Change-Id: I4bae2cce3ebfebd8f59b18b5a6a7a7226b8353b9
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qpointer.cpp')
-rw-r--r-- | src/corelib/kernel/qpointer.cpp | 8 |
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 |