From 2d0a5f7a014d1b84d5701d835aa28f1a047fbff5 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Mon, 19 Oct 2020 14:52:58 +0200
Subject: QAssociativeIterable: Unwrap variants on value()

Fixes: QTBUG-87688
Change-Id: I66515eaa1217c34f003648af6423b318b54977c4
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index d3feabfac1..8860d3cabf 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -4456,6 +4456,20 @@ void tst_QVariant::iterateContainerElements()
         numsCopy << *(it++);
         QCOMPARE(nums, numsCopy);
     }
+
+    {
+        auto container = QVariantMap();
+
+        container["one"] = 1;
+
+        auto containerVariant = QVariant::fromValue(container);
+        auto iter = containerVariant.value<QAssociativeIterable>();
+        auto value = iter.value("one");
+        QCOMPARE(value, QVariant(1));
+
+        auto f = iter.constFind("one");
+        QCOMPARE(*f, QVariant(1));
+    }
 }
 
 void tst_QVariant::pairElements()
-- 
cgit v1.2.3