From 668efc29fd85bbae2395a4eca8d0ad71ad6ee3d1 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 9 Jun 2012 22:57:35 +0200 Subject: Add some internal API for extracting a QSharedPointer from QVariant. The T must be derived from QObject, or it will fail to compile. This will allow scripting or other 'wrapping' and runtime environments like QtDeclarative to handle QSharedPointers to types derived from QObject properly. A QSharedPointer can be inserted into a QVariant, and where T derives from QObject, a QSharedPointer can be extracted from the QVariant, and its properties are then accessible. Change-Id: I68d6d89aceceb019267bd7301baa2047f9c09b90 Reviewed-by: Thiago Macieira --- src/corelib/kernel/qpointer.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/corelib/kernel/qpointer.h') diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h index 88d8225621..ef1d4dc1d5 100644 --- a/src/corelib/kernel/qpointer.h +++ b/src/corelib/kernel/qpointer.h @@ -50,6 +50,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +class QVariant; class QPointerBase { @@ -184,6 +185,13 @@ inline bool operator!= (int i, const QPointer &p) { Q_ASSERT(i == 0); return !i && !p.isNull(); } #endif +template +QPointer +qPointerFromVariant(const QVariant &variant) +{ + return QPointer(qobject_cast(QtSharedPointer::weakPointerFromVariant_internal(variant).data())); +} + QT_END_NAMESPACE QT_END_HEADER -- cgit v1.2.3