diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h
index 478e9e78ce0..24c014e2153 100644
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
@@ -1257,10 +1257,10 @@ public:
     inline const_key_value_iterator constKeyValueBegin() const noexcept { return const_key_value_iterator(begin()); }
     inline const_key_value_iterator keyValueEnd() const noexcept { return const_key_value_iterator(end()); }
     inline const_key_value_iterator constKeyValueEnd() const noexcept { return const_key_value_iterator(end()); }
-    auto asKeyValueRange() & { return QtPrivate::QKeyValueRange(*this); }
-    auto asKeyValueRange() const & { return QtPrivate::QKeyValueRange(*this); }
-    auto asKeyValueRange() && { return QtPrivate::QKeyValueRange(std::move(*this)); }
-    auto asKeyValueRange() const && { return QtPrivate::QKeyValueRange(std::move(*this)); }
+    auto asKeyValueRange() & { return QtPrivate::QKeyValueRange<QHash &>(*this); }
+    auto asKeyValueRange() const & { return QtPrivate::QKeyValueRange<const QHash &>(*this); }
+    auto asKeyValueRange() && { return QtPrivate::QKeyValueRange<QHash>(std::move(*this)); }
+    auto asKeyValueRange() const && { return QtPrivate::QKeyValueRange<QHash>(std::move(*this)); }
 
     struct TryEmplaceResult
     {
@@ -2179,10 +2179,10 @@ public:
     inline const_key_value_iterator constKeyValueBegin() const noexcept { return const_key_value_iterator(begin()); }
     inline const_key_value_iterator keyValueEnd() const noexcept { return const_key_value_iterator(end()); }
     inline const_key_value_iterator constKeyValueEnd() const noexcept { return const_key_value_iterator(end()); }
-    auto asKeyValueRange() & { return QtPrivate::QKeyValueRange(*this); }
-    auto asKeyValueRange() const & { return QtPrivate::QKeyValueRange(*this); }
-    auto asKeyValueRange() && { return QtPrivate::QKeyValueRange(std::move(*this)); }
-    auto asKeyValueRange() const && { return QtPrivate::QKeyValueRange(std::move(*this)); }
+    auto asKeyValueRange() & { return QtPrivate::QKeyValueRange<QMultiHash &>(*this); }
+    auto asKeyValueRange() const & { return QtPrivate::QKeyValueRange<const QMultiHash &>(*this); }
+    auto asKeyValueRange() && { return QtPrivate::QKeyValueRange<QMultiHash>(std::move(*this)); }
+    auto asKeyValueRange() const && { return QtPrivate::QKeyValueRange<QMultiHash>(std::move(*this)); }
 
     iterator detach(const_iterator it)
     {
diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h
index 8a2b493ef47..30b54951a55 100644
--- a/src/corelib/tools/qiterator.h
+++ b/src/corelib/tools/qiterator.h
@@ -7,6 +7,10 @@
 #include <QtCore/qglobal.h>
 #include <QtCore/qcontainertools_impl.h>
 
+#ifdef __cpp_lib_ranges
+#include <ranges>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 #if !defined(QT_NO_JAVA_STYLE_ITERATORS)
@@ -280,6 +284,8 @@ class QKeyValueRangeStorage
 {
 protected:
     Map m_map;
+    Map &map() { return m_map; }
+    const Map &map() const { return m_map; }
 public:
     explicit QKeyValueRangeStorage(const Map &map) : m_map(map) {}
     explicit QKeyValueRangeStorage(Map &&map) : m_map(std::move(map)) {}
@@ -287,11 +293,16 @@ public:
 
 template <typename Map>
 class QKeyValueRangeStorage<Map &>
+#ifdef __cpp_lib_ranges
+    : public std::ranges::view_base
+#endif
 {
 protected:
-    Map &m_map;
+    Map *m_map;
+    Map &map() { return *m_map; }
+    const Map &map() const { return *m_map; }
 public:
-    explicit QKeyValueRangeStorage(Map &map) : m_map(map) {}
+    explicit QKeyValueRangeStorage(Map &map) : m_map(&map) {}
 };
 
 template <typename Map>
@@ -299,18 +310,12 @@ class QKeyValueRange : public QKeyValueRangeStorage<Map>
 {
 public:
     using QKeyValueRangeStorage<Map>::QKeyValueRangeStorage;
-    auto begin() { return this->m_map.keyValueBegin(); }
-    auto begin() const { return this->m_map.keyValueBegin(); }
-    auto end() { return this->m_map.keyValueEnd(); }
-    auto end() const { return this->m_map.keyValueEnd(); }
+    auto begin() { return this->map().keyValueBegin(); }
+    auto begin() const { return this->map().keyValueBegin(); }
+    auto end() { return this->map().keyValueEnd(); }
+    auto end() const { return this->map().keyValueEnd(); }
 };
 
-template <typename Map>
-QKeyValueRange(Map &) -> QKeyValueRange<Map &>;
-
-template <typename Map, std::enable_if_t<!std::is_reference_v<Map>, bool> = false>
-QKeyValueRange(Map &&) -> QKeyValueRange<std::remove_const_t<Map>>;
-
 } // namespace QtPrivate
 
 
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h
index 15f41bfc426..01e614aa28b 100644
--- a/src/corelib/tools/qmap.h
+++ b/src/corelib/tools/qmap.h
@@ -620,10 +620,10 @@ public:
     const_key_value_iterator constKeyValueBegin() const { return const_key_value_iterator(begin()); }
     const_key_value_iterator keyValueEnd() const { return const_key_value_iterator(end()); }
     const_key_value_iterator constKeyValueEnd() const { return const_key_value_iterator(end()); }
-    auto asKeyValueRange() & { return QtPrivate::QKeyValueRange(*this); }
-    auto asKeyValueRange() const & { return QtPrivate::QKeyValueRange(*this); }
-    auto asKeyValueRange() && { return QtPrivate::QKeyValueRange(std::move(*this)); }
-    auto asKeyValueRange() const && { return QtPrivate::QKeyValueRange(std::move(*this)); }
+    auto asKeyValueRange() & { return QtPrivate::QKeyValueRange<QMap &>(*this); }
+    auto asKeyValueRange() const & { return QtPrivate::QKeyValueRange<const QMap &>(*this); }
+    auto asKeyValueRange() && { return QtPrivate::QKeyValueRange<QMap>(std::move(*this)); }
+    auto asKeyValueRange() const && { return QtPrivate::QKeyValueRange<QMap>(std::move(*this)); }
 
     iterator erase(const_iterator it)
     {
@@ -1353,10 +1353,10 @@ public:
     const_key_value_iterator constKeyValueBegin() const { return const_key_value_iterator(begin()); }
     const_key_value_iterator keyValueEnd() const { return const_key_value_iterator(end()); }
     const_key_value_iterator constKeyValueEnd() const { return const_key_value_iterator(end()); }
-    auto asKeyValueRange() & { return QtPrivate::QKeyValueRange(*this); }
-    auto asKeyValueRange() const & { return QtPrivate::QKeyValueRange(*this); }
-    auto asKeyValueRange() && { return QtPrivate::QKeyValueRange(std::move(*this)); }
-    auto asKeyValueRange() const && { return QtPrivate::QKeyValueRange(std::move(*this)); }
+    auto asKeyValueRange() & { return QtPrivate::QKeyValueRange<QMultiMap &>(*this); }
+    auto asKeyValueRange() const & { return QtPrivate::QKeyValueRange<const QMultiMap &>(*this); }
+    auto asKeyValueRange() && { return QtPrivate::QKeyValueRange<QMultiMap>(std::move(*this)); }
+    auto asKeyValueRange() const && { return QtPrivate::QKeyValueRange<QMultiMap>(std::move(*this)); }
 
     iterator erase(const_iterator it)
     {
diff --git a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
index ecfcdea4cb7..3aa4085251d 100644
--- a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
+++ b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
@@ -1233,6 +1233,9 @@ void tst_ContainerApiSymmetry::member_erase_set_impl() const
     QCOMPARE(it, c.cbegin());
 }
 
+template <typename T>
+using KeyValueRangeType = decltype(std::declval<T>().asKeyValueRange());
+
 template <typename Container>
 void tst_ContainerApiSymmetry::keyValueRange_impl() const
 {
@@ -1298,6 +1301,7 @@ void tst_ContainerApiSymmetry::keyValueRange_impl() const
     // auto &&, mutating
     keys.clear(); values.clear();
     for (auto &&[key, value] : c.asKeyValueRange()) {
+        static_assert(!std::is_const_v<std::remove_reference_t<decltype(value)>>);
         keys << key;
         values << value;
         QCOMPARE(key, value - 1);
@@ -1323,6 +1327,7 @@ void tst_ContainerApiSymmetry::keyValueRange_impl() const
     // auto &&, non-mutating (const map)
     keys.clear(); values.clear();
     for (auto &&[key, value] : std::as_const(c).asKeyValueRange()) {
+        static_assert(std::is_const_v<std::remove_reference_t<decltype(value)>>);
         keys << key;
         values << value;
         QCOMPARE(key, value - 2);
@@ -1345,6 +1350,7 @@ void tst_ContainerApiSymmetry::keyValueRange_impl() const
     // auto &&, non-mutating (rvalue map)
     keys.clear(); values.clear();
     for (auto &&[key, value] : returnC().asKeyValueRange()) {
+        static_assert(!std::is_const_v<std::remove_reference_t<decltype(value)>>);
         keys << key;
         values << value;
         QCOMPARE(key, value - 2);
@@ -1352,6 +1358,83 @@ void tst_ContainerApiSymmetry::keyValueRange_impl() const
     }
     QVERIFY(verify(keys, COUNT));
     QVERIFY(verify(values, COUNT, 2));
+
+    // auto &&, non-mutating (const rvalue map)
+    keys.clear(); values.clear();
+    for (auto &&[key, value] : const_cast<const Container &&>(returnC()).asKeyValueRange()) {
+        static_assert(!std::is_const_v<std::remove_reference_t<decltype(value)>>); // non-const
+        keys << key;
+        values << value;
+        QCOMPARE(key, value - 2);
+        QCOMPARE(c.value(key), value);
+    }
+    QVERIFY(verify(keys, COUNT));
+    QVERIFY(verify(values, COUNT, 2));
+
+#if defined(__cpp_lib_ranges) && __cpp_lib_ranges > 202110L // P2415R2
+    static_assert(std::ranges::viewable_range<KeyValueRangeType<Container>>);
+    static_assert(std::ranges::viewable_range<KeyValueRangeType<Container &>>);
+    static_assert(std::ranges::viewable_range<KeyValueRangeType<const Container>>);
+    static_assert(std::ranges::viewable_range<KeyValueRangeType<const Container &>>);
+
+    static_assert(!std::ranges::view<KeyValueRangeType<Container>>);
+    static_assert(std::ranges::view<KeyValueRangeType<Container &>>);
+    static_assert(!std::ranges::view<KeyValueRangeType<const Container>>);
+    static_assert(std::ranges::view<KeyValueRangeType<const Container &>>);
+
+    const auto keyValueTest = [](auto &&pair)
+    {
+        return pair.first == pair.second - 2;
+    };
+
+    {
+        auto range = c.asKeyValueRange();
+        static_assert(std::ranges::view<decltype(range)>);
+        QCOMPARE(std::ranges::distance(range), COUNT);
+
+        const bool ok = std::ranges::all_of(
+            range | std::views::transform(keyValueTest),
+            std::identity{}
+        );
+        QVERIFY(ok);
+    }
+
+    {
+        auto range = std::as_const(c).asKeyValueRange();
+        static_assert(std::ranges::view<decltype(range)>);
+        QCOMPARE(std::ranges::distance(range), COUNT);
+
+        const bool ok = std::ranges::all_of(
+            range | std::views::transform(keyValueTest),
+            std::identity{}
+        );
+        QVERIFY(ok);
+    }
+
+    {
+        auto range = returnC().asKeyValueRange();
+        static_assert(!std::ranges::view<decltype(range)>);
+        QCOMPARE(std::ranges::distance(range), COUNT);
+
+        const bool ok = std::ranges::all_of(
+            range | std::views::transform(keyValueTest),
+            std::identity{}
+        );
+        QVERIFY(ok);
+    }
+
+    {
+        auto range = const_cast<const Container &&>(returnC()).asKeyValueRange();
+        static_assert(!std::ranges::view<decltype(range)>);
+        QCOMPARE(std::ranges::distance(range), COUNT);
+
+        const bool ok = std::ranges::all_of(
+            range | std::views::transform(keyValueTest),
+            std::identity{}
+            );
+        QVERIFY(ok);
+    }
+#endif
 }
 
 template<typename Container>