diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp index cf2f9bee0c3..047fcbfc30b 100644 --- a/src/corelib/tools/qscopedpointer.cpp +++ b/src/corelib/tools/qscopedpointer.cpp @@ -95,6 +95,9 @@ QT_BEGIN_NAMESPACE this handler for pointers that were allocated with \c{new []}. \li QScopedPointerPodDeleter - deletes the pointer using \c{free()}. Use this handler for pointers that were allocated with \c{malloc()}. + \li QScopedPointerDeleteLater - deletes a pointer by calling \c{deleteLater()} + on it. Use this handler for pointers to QObject's that are actively + participating in a QEventLoop. \endlist You can pass your own classes as handlers, provided that they have a public diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h index c4a148c4e4f..dba37dae234 100644 --- a/src/corelib/tools/qscopedpointer.h +++ b/src/corelib/tools/qscopedpointer.h @@ -83,6 +83,17 @@ struct QScopedPointerPodDeleter static inline void cleanup(void *pointer) { if (pointer) free(pointer); } }; +#ifndef QT_NO_QOBJECT +template +struct QScopedPointerObjectDeleteLater +{ + static inline void cleanup(T *pointer) { if (pointer) pointer->deleteLater(); } +}; + +class QObject; +typedef QScopedPointerObjectDeleteLater QScopedPointerDeleteLater; +#endif + template > class QScopedPointer {