diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-07-07 08:59:55 +0200 |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-07-07 08:59:55 +0200 |
| commit | b2799a705b6d7655bb23ec4121fd76ce8a94b344 (patch) | |
| tree | db7e2a482ca35a40ca7cfb4f4999ec15396a8b55 /src/corelib/tools | |
| parent | 6415e22649dd8620728c8c32b918c7afb8efc4dc (diff) | |
| parent | e6843c5a9cf4949e7521c1304bb5dc5d48fbc9be (diff) | |
| download | qt4-tools-b2799a705b6d7655bb23ec4121fd76ce8a94b344.tar.gz | |
Merge remote branch 'mainline/4.8'
Conflicts:
dist/changes-4.8.0
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qscopedpointer.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h index b15bcacd97..a24f62e7ba 100644 --- a/src/corelib/tools/qscopedpointer.h +++ b/src/corelib/tools/qscopedpointer.h @@ -208,8 +208,10 @@ template <typename T, typename Cleanup = QScopedPointerArrayDeleter<T> > class QScopedArrayPointer : public QScopedPointer<T, Cleanup> { public: + inline QScopedArrayPointer() : QScopedPointer<T, Cleanup>(0) {} + template <typename D> - explicit inline QScopedArrayPointer(D *p = 0, typename QtPrivate::QScopedArrayEnsureSameType<T,D>::Type = 0) + explicit inline QScopedArrayPointer(D *p, typename QtPrivate::QScopedArrayEnsureSameType<T,D>::Type = 0) : QScopedPointer<T, Cleanup>(p) { } |