summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-11-06 14:44:39 (GMT)
committeraxis <qt-info@nokia.com>2009-11-06 14:44:39 (GMT)
commitdaf5f511ee813fc4fffba64bed558d0413270388 (patch)
tree37fefb6189943606d184d2159577f7f2ce67b5db /src/corelib/tools
parent89b6de9091adbf0645ffe2aba59cb17cb233c170 (diff)
parentded84966823eac0ae0275a2a7676d647d4d856ff (diff)
downloadQt-daf5f511ee813fc4fffba64bed558d0413270388.zip
Qt-daf5f511ee813fc4fffba64bed558d0413270388.tar.gz
Qt-daf5f511ee813fc4fffba64bed558d0413270388.tar.bz2
Merge branch '4.6-s60' into 4.6
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qvector.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h
index 7402d77..930b006 100644
--- a/src/corelib/tools/qvector.h
+++ b/src/corelib/tools/qvector.h
@@ -92,7 +92,7 @@ struct QVectorTypedData : private QVectorData
// as this would break strict aliasing rules. (in the case of shared_null)
T array[1];
- static inline void free(QVectorTypedData *x, int alignment) { QVectorData::free(x, alignment); }
+ static inline void free(QVectorTypedData<T> *x, int alignment) { QVectorData::free(static_cast<QVectorData *>(x), alignment); }
};
class QRegion;