summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qmetatype.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-05-24 10:41:58 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-05-24 11:12:27 +0200
commit28b06fc1a7a4e175c2b802bae518c6dd2305309b (patch)
treeeb916f73eadbf9eef3533890518cfdf16a90aa81 /src/corelib/kernel/qmetatype.h
parent77e708d1676803ce4ed7a2511fd80f8848522c63 (diff)
QtPrivate::QSmartPointerConvertFunctor: Fix deprecation warning
Fix warning: src/corelib/kernel/qmetatype.h:1723:27: warning: ‘T* QWeakPointer<T>::data() const [with T = QFile]’ is deprecated: Use toStrongRef() instead, and data() on the returned QSharedPointer [-Wdeprecated-declarations] shown when compiling tst_QVariant by using QWeakPointer::internalData(). Change-Id: I5ea543019b4f8e5dfc829939cd2011ae65f12876 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
-rw-r--r--src/corelib/kernel/qmetatype.h2
1 files changed, 1 insertions, 1 deletions
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();
}
};
}