diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-10 23:22:23 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-10 23:22:23 +0200 |
commit | bcbec4bc49774b80780872c8234acb256c38d779 (patch) | |
tree | 038e1c47f9156877b89a840fb69947e0774218b4 /src/corelib/tools | |
parent | 507a7b4df918a091c45af35110fd2cdeff3713aa (diff) | |
parent | 2346ae167568bb9e5d247da0b946067b7f9aad48 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/tools')
-rw-r--r-- | src/corelib/tools/qbytearray.cpp | 2 | ||||
-rw-r--r-- | src/corelib/tools/qvector.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 20d4339a19..a2d3891f00 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -646,8 +646,6 @@ static inline char qToLower(char c) store raw binary data, and when memory conservation is critical (e.g., with Qt for Embedded Linux). - The maximum array size of a QByteArray is under 2^30. - One way to initialize a QByteArray is simply to pass a \c{const char *} to its constructor. For example, the following code creates a byte array of size 5 containing the data "Hello": diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 288404f3c2..0f2acd6986 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -642,7 +642,7 @@ typename QVector<T>::iterator QVector<T>::erase(iterator abegin, iterator aend) iterator moveEnd = d->end(); while (moveBegin != moveEnd) { if (QTypeInfo<T>::isComplex) - abegin->~T(); + static_cast<T *>(abegin)->~T(); new (abegin++) T(*moveBegin++); } if (abegin < d->end()) { |