summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-09 15:40:48 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-09 15:40:48 (GMT)
commite32bb8f0e79232419b9516fa8273eadbaa8aad9e (patch)
tree7251daf2ae329d3df5a8ae2b98b448e004c13acf /doc
parentec82a2e2c596fd623c58a4a003dd2e7603931993 (diff)
parent48cce37f6faa2aae9b15edc9543f0e7e08236bb1 (diff)
downloadQt-e32bb8f0e79232419b9516fa8273eadbaa8aad9e.zip
Qt-e32bb8f0e79232419b9516fa8273eadbaa8aad9e.tar.gz
Qt-e32bb8f0e79232419b9516fa8273eadbaa8aad9e.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: Doc: the QTextDecoder need to be destroyed, reflect that in the example added CONFIG += console to qlalr.pro Add new benchmark for some qtext features. Add texture glyph width cache default. Update changes file
Diffstat (limited to 'doc')
-rw-r--r--doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp b/doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp
index 4e77e04..2fd723e 100644
--- a/doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp
+++ b/doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp
@@ -62,6 +62,7 @@ while (new_data_available()) {
QByteArray chunk = get_new_data();
string += decoder->toUnicode(chunk);
}
+delete decoder;
//! [2]