Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I9ee4176f0a0078908d49896508826154c9f71530

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()) {