diff options
| author | axis <qt-info@nokia.com> | 2009-11-06 14:44:39 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-06 14:44:39 (GMT) |
| commit | daf5f511ee813fc4fffba64bed558d0413270388 (patch) | |
| tree | 37fefb6189943606d184d2159577f7f2ce67b5db /src/corelib | |
| parent | 89b6de9091adbf0645ffe2aba59cb17cb233c170 (diff) | |
| parent | ded84966823eac0ae0275a2a7676d647d4d856ff (diff) | |
| download | Qt-daf5f511ee813fc4fffba64bed558d0413270388.zip Qt-daf5f511ee813fc4fffba64bed558d0413270388.tar.gz Qt-daf5f511ee813fc4fffba64bed558d0413270388.tar.bz2 | |
Merge branch '4.6-s60' into 4.6
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qvector.h | 2 |
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; |