summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qlist.cpp
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2010-02-07 23:53:17 (GMT)
committerKurt Korbatits <kurt.korbatits@nokia.com>2010-02-07 23:53:17 (GMT)
commitac33de5bf257eb215a09c232d950be265d57d22f (patch)
tree3947891872c1a41deaa32e8995e2e233548b3352 /src/corelib/tools/qlist.cpp
parent3108f02f35685bd57486e198277c600e09d98b13 (diff)
parent8ca95cbc98a97a8208120e4aa76bfd5c16b01df9 (diff)
downloadQt-ac33de5bf257eb215a09c232d950be265d57d22f.zip
Qt-ac33de5bf257eb215a09c232d950be265d57d22f.tar.gz
Qt-ac33de5bf257eb215a09c232d950be265d57d22f.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6
Diffstat (limited to 'src/corelib/tools/qlist.cpp')
-rw-r--r--src/corelib/tools/qlist.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp
index f1df9bd..c302857 100644
--- a/src/corelib/tools/qlist.cpp
+++ b/src/corelib/tools/qlist.cpp
@@ -208,7 +208,7 @@ void **QListData::append2(const QListData& l)
int n = l.d->end - l.d->begin;
if (n) {
if (e + n > d->alloc)
- realloc(grow(e + l.d->end - l.d->begin));
+ realloc(grow(e + n));
d->end += n;
}
return d->array + e;