diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-30 13:19:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-30 13:19:57 (GMT) |
| commit | 40e01de16235f523e020e641b77d0618117706d9 (patch) | |
| tree | 74f751e221ff714ddc4fc18cb327f08c61238dba /src/corelib | |
| parent | 096474565f9683515dddb7175bb64a77d9f805f2 (diff) | |
| parent | 7fac03fc111f0c5938eff80f96d25c03c70c4040 (diff) | |
| download | Qt-40e01de16235f523e020e641b77d0618117706d9.zip Qt-40e01de16235f523e020e641b77d0618117706d9.tar.gz Qt-40e01de16235f523e020e641b77d0618117706d9.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed a leak in QTextDocument::print().
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qscopedpointer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp index e7dd769..b06112d 100644 --- a/src/corelib/tools/qscopedpointer.cpp +++ b/src/corelib/tools/qscopedpointer.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE called resource acquisition is initialization(RAII). QScopedPointer guarantees that the object pointed to will get deleted when - the current scope dissapears. + the current scope disappears. Consider this function which does heap allocations, and have various exit points: @@ -227,7 +227,7 @@ QT_BEGIN_NAMESPACE /*! \class QScopedArrayPointer - + \brief The QScopedArrayPointer class stores a pointer to a dynamically allocated array of objects, and deletes it upon destruction. |