From b88b09fb16754c5057b781d1b625855f75b22aee Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Fri, 3 May 2013 16:10:34 +0200
Subject: Make it possible to access QPair and std::pair elements from a
 QVariant.

Change-Id: I9dc73748073d0d1e43bdadbce73339dfcc1bc647
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
---
 src/corelib/kernel/qvariant.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/corelib/kernel/qvariant.cpp')

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 37b89b82f0..f747eb45ab 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -2782,6 +2782,12 @@ bool QVariant::canConvert(int targetTypeId) const
         return true;
     }
 
+    if (targetTypeId == qMetaTypeId<QPair<QVariant, QVariant> >() &&
+              QMetaType::hasRegisteredConverterFunction(d.type,
+                    qMetaTypeId<QtMetaTypePrivate::QPairVariantInterfaceImpl>())) {
+        return true;
+    }
+
     if ((d.type >= QMetaType::User || targetTypeId >= QMetaType::User)
         && QMetaType::hasRegisteredConverterFunction(d.type, targetTypeId)) {
         return true;
-- 
cgit v1.2.3