diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 07:13:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 07:13:58 (GMT) |
| commit | 95633f67f1f8ae4a9ddcc47e718fc250d00922ec (patch) | |
| tree | e1dc84526b2ac520c51a965aa8e6e07bd84ef7e9 /doc/src/snippets/code | |
| parent | a87b7b965a68fbb3171ffedeb3354f14c60d1751 (diff) | |
| parent | 4870f1d4afb41041aa097ad24dd7f147199f4066 (diff) | |
| download | Qt-95633f67f1f8ae4a9ddcc47e718fc250d00922ec.zip Qt-95633f67f1f8ae4a9ddcc47e718fc250d00922ec.tar.gz Qt-95633f67f1f8ae4a9ddcc47e718fc250d00922ec.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QLineEdit shows leftovers of edit cursor after clear()
doc: Added indication of default modality value for panels.
doc: Added QScopedArrayPointer and corrected QScopedPointer snippet.
Improve test coverage of QScriptString::toArrayIndex()
QColorDialog::open() freezes the app the *second* time it is used on Mac
doc: Corrected typo.
doc: Removed bad grammar.
doc: Added \obsolete.
doc: Added \since 4.6 to the properties.
doc: Removed some erroneous text.
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp index c068ba9..4158388 100644 --- a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp +++ b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp @@ -128,7 +128,7 @@ private: QScopedPointer<int, QScopedPointerArrayDeleter<int> > arrayPointer(new int[42]); // this QScopedPointer frees its data using free(): -QScopedPointer<int, QScopedPointerPodDeleter<int> > podPointer(reinterpret_cast<int *>(malloc(42))); +QScopedPointer<int, QScopedPointerPodDeleter> podPointer(reinterpret_cast<int *>(malloc(42))); // this struct calls "myCustomDeallocator" to delete the pointer struct ScopedPointerCustomDeleter |