diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 79ee5eec11..154ccf62bb 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -1720,7 +1720,7 @@ namespace QtPrivate {
     {
         QObject* operator()(const QWeakPointer<T> &p) const
         {
-            return p.data();
+            return p.internalData();
         }
     };
 }
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index f0aca7c14e..0d1dcb051b 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -684,6 +684,7 @@ public:
     template<typename X>
     friend QPointer<X>
     qPointerFromVariant(const QVariant &variant);
+    friend QtPrivate::QSmartPointerConvertFunctor<QWeakPointer>;
 #endif
 
     template <class X>