diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-30 22:02:33 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-30 22:02:33 +0200 |
| commit | 893b73211c822da5e4cb1dcb5946ec58fc0c8dc6 (patch) | |
| tree | ae11cb42093190a236687704101750d966cffaff /src/corelib | |
| parent | 9155bb1413c8818d4283825a80650cfa978ff47c (diff) | |
| parent | 40e01de16235f523e020e641b77d0618117706d9 (diff) | |
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 e7dd769fe7..b06112de86 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. |