diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-09-05 10:35:36 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 13:01:33 +0200 |
| commit | cc594d2064799f09f8d60981f75354745d98c717 (patch) | |
| tree | 043a5926b04988d9e32132d4c509185389d78c97 /src/corelib/kernel/qvariant.cpp | |
| parent | e9a69c3ba928bd88974563b386b000ad6583f969 (diff) | |
QVariant::canConvert: Use the old type when checking for QObject* conversion.
Change-Id: I8450c74ecfdeee96e73b82438c5ef83c3acf4444
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/kernel/qvariant.cpp')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 24bf25baea..c3ccc74a20 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -2946,7 +2946,7 @@ bool QVariant::convert(int targetTypeId) if (oldValue.isNull()) return false; - if ((QMetaType::typeFlags(d.type) & QMetaType::PointerToQObject) && (QMetaType::typeFlags(targetTypeId) & QMetaType::PointerToQObject)) { + if ((QMetaType::typeFlags(oldValue.userType()) & QMetaType::PointerToQObject) && (QMetaType::typeFlags(targetTypeId) & QMetaType::PointerToQObject)) { create(targetTypeId, &oldValue.d.data.o); return true; } |