diff options
Diffstat (limited to 'src/corelib/tools/qsharedpointer.cpp')
| -rw-r--r-- | src/corelib/tools/qsharedpointer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp index 385caa2e4b..44cbad94f7 100644 --- a/src/corelib/tools/qsharedpointer.cpp +++ b/src/corelib/tools/qsharedpointer.cpp @@ -1424,7 +1424,7 @@ QtSharedPointer::ExternalRefCountData *QtSharedPointer::ExternalRefCountData::ge */ QSharedPointer<QObject> QtSharedPointer::sharedPointerFromVariant_internal(const QVariant &variant) { - Q_ASSERT(QMetaType::typeFlags(variant.userType()) & QMetaType::SharedPointerToQObject); + Q_ASSERT(variant.metaType().flags() & QMetaType::SharedPointerToQObject); return *reinterpret_cast<const QSharedPointer<QObject>*>(variant.constData()); } @@ -1435,7 +1435,8 @@ QSharedPointer<QObject> QtSharedPointer::sharedPointerFromVariant_internal(const */ QWeakPointer<QObject> QtSharedPointer::weakPointerFromVariant_internal(const QVariant &variant) { - Q_ASSERT(QMetaType::typeFlags(variant.userType()) & QMetaType::WeakPointerToQObject || QMetaType::typeFlags(variant.userType()) & QMetaType::TrackingPointerToQObject); + Q_ASSERT(variant.metaType().flags() & QMetaType::WeakPointerToQObject || + variant.metaType().flags() & QMetaType::TrackingPointerToQObject); return *reinterpret_cast<const QWeakPointer<QObject>*>(variant.constData()); } |