summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorRafael Roquetto <rafael.roquetto@kdab.com>2012-03-09 11:19:15 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-03-11 21:16:59 (GMT)
commit5a7619a459bce4fe0011044e7a1a2cff1297f800 (patch)
tree29b90e5183f63a095d7816be80400347f1527bb1 /src/corelib
parent333df91b9be25a2365287f0cd6fcfc285b365ce2 (diff)
downloadQt-5a7619a459bce4fe0011044e7a1a2cff1297f800.zip
Qt-5a7619a459bce4fe0011044e7a1a2cff1297f800.tar.gz
Qt-5a7619a459bce4fe0011044e7a1a2cff1297f800.tar.bz2
Fixes mismatching delete operator
cherry-picked from qt5/qtbase 657f634c0e8a1bf4f544b Change-Id: I35cbdd6fa947a98a6afa70bdc72631c4213c288a Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/codecs/qtextcodec.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index 74e5e90..4114495 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -413,7 +413,7 @@ QString QWindowsLocalCodec::convertToUnicodeCharByChar(const char *chars, int le
s.append(QChar(ws[i]));
delete [] ws;
#endif
- delete mbcs;
+ delete [] mbcs;
return s;
}