src/corelib/tools/qvarlengtharray.h
changeset 19 fcece45ef507
parent 18 2f34d5167611
child 29 b72c6db6890b
--- a/src/corelib/tools/qvarlengtharray.h	Fri Apr 16 15:50:13 2010 +0300
+++ b/src/corelib/tools/qvarlengtharray.h	Mon May 03 13:17:34 2010 +0300
@@ -222,7 +222,6 @@
                 }
             } else {
                 qMemCopy(ptr, oldPtr, qMin(asize, osize) * sizeof(T));
-                s = asize;
             }
         } else {
             ptr = oldPtr;
@@ -233,7 +232,7 @@
     if (QTypeInfo<T>::isComplex) {
         while (osize > asize)
             (oldPtr+(--osize))->~T();
-        if( oldPtr == ptr )
+        if (!QTypeInfo<T>::isStatic)
             s = osize;
     }