diff --git a/src/corelib/tools/qcontainertools_impl.h b/src/corelib/tools/qcontainertools_impl.h
index 723c984d81..335a193144 100644
--- a/src/corelib/tools/qcontainertools_impl.h
+++ b/src/corelib/tools/qcontainertools_impl.h
@@ -284,24 +284,51 @@ using IfIsNotSame =
 template<typename T, typename U>
 using IfIsNotConvertible = typename std::enable_if<!std::is_convertible<T, U>::value, bool>::type;
 
-template <typename Container, typename T>
-auto sequential_erase(Container &c, const T &t)
+template <typename Container, typename Predicate>
+auto sequential_erase_if(Container &c, Predicate &pred)
 {
-    // avoid a detach in case there is nothing to remove
+    // This is remove_if() modified to perform the find_if step on
+    // const_iterators to avoid shared container detaches if nothing needs to
+    // be removed. We cannot run remove_if after find_if: doing so would apply
+    // the predicate to the first matching element twice!
+
     const auto cbegin = c.cbegin();
     const auto cend = c.cend();
-    const auto t_it = std::find(cbegin, cend, t);
+    const auto t_it = std::find_if(cbegin, cend, pred);
     auto result = std::distance(cbegin, t_it);
     if (result == c.size())
         return result - result; // `0` of the right type
 
+    // now detach:
     const auto e = c.end();
-    const auto it = std::remove(std::next(c.begin(), result), e, t);
-    result = std::distance(it, e);
-    c.erase(it, e);
+
+    auto it = std::next(c.begin(), result);
+    auto dest = it;
+
+    // Loop Invariants:
+    // - it != e
+    // - [next(it), e[ still to be checked
+    // - [c.begin(), dest[ are result
+    while (++it != e) {
+        if (!pred(*it)) {
+            *dest = std::move(*it);
+            ++dest;
+        }
+    }
+
+    result = std::distance(dest, e);
+    c.erase(dest, e);
     return result;
 }
 
+template <typename Container, typename T>
+auto sequential_erase(Container &c, const T &t)
+{
+    // use the equivalence relation from http://eel.is/c++draft/list.erasure#1
+    auto cmp = [&](auto &e) { return e == t; };
+    return sequential_erase_if(c, cmp); // can't pass rvalues!
+}
+
 template <typename Container, typename T>
 auto sequential_erase_with_copy(Container &c, const T &t)
 {
@@ -321,24 +348,6 @@ auto sequential_erase_one(Container &c, const T &t)
     return true;
 }
 
-template <typename Container, typename Predicate>
-auto sequential_erase_if(Container &c, Predicate &pred)
-{
-    // avoid a detach in case there is nothing to remove
-    const auto cbegin = c.cbegin();
-    const auto cend = c.cend();
-    const auto t_it = std::find_if(cbegin, cend, pred);
-    auto result = std::distance(cbegin, t_it);
-    if (result == c.size())
-        return result - result; // `0` of the right type
-
-    const auto e = c.end();
-    const auto it = std::remove_if(std::next(c.begin(), result), e, pred);
-    result = std::distance(it, e);
-    c.erase(it, e);
-    return result;
-}
-
 template <typename T, typename Predicate>
 qsizetype qset_erase_if(QSet<T> &set, Predicate &pred)
 {
diff --git a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
index 7fe1dd9b4d..95d2076b6e 100644
--- a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
+++ b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
@@ -771,21 +771,35 @@ void tst_ContainerApiSymmetry::erase_if_impl() const
     auto c = make<Container>(7); // {1, 2, 3, 4, 5, 6, 7}
     QCOMPARE(c.size(), S(7));
 
-    auto result = erase_if(c, [](V i) { return Conv::toInt(i) % 2 == 0; });
+    decltype(c.size()) oldSize, count;
+
+    oldSize = c.size();
+    count = 0;
+    auto result = erase_if(c, [&](V i) { ++count; return Conv::toInt(i) % 2 == 0; });
     QCOMPARE(result, S(3));
     QCOMPARE(c.size(), S(4));
+    QCOMPARE(count, oldSize);
 
-    result = erase_if(c, [](V i) { return Conv::toInt(i) % 123 == 0; });
+    oldSize = c.size();
+    count = 0;
+    result = erase_if(c, [&](V i) { ++count; return Conv::toInt(i) % 123 == 0; });
     QCOMPARE(result, S(0));
     QCOMPARE(c.size(), S(4));
+    QCOMPARE(count, oldSize);
 
-    result = erase_if(c, [](V i) { return Conv::toInt(i) % 3 == 0; });
+    oldSize = c.size();
+    count = 0;
+    result = erase_if(c, [&](V i) { ++count; return Conv::toInt(i) % 3 == 0; });
     QCOMPARE(result, S(1));
     QCOMPARE(c.size(), S(3));
+    QCOMPARE(count, oldSize);
 
-    result = erase_if(c, [](V i) { return Conv::toInt(i) % 2 == 1; });
+    oldSize = c.size();
+    count = 0;
+    result = erase_if(c, [&](V i) { ++count; return Conv::toInt(i) % 2 == 1; });
     QCOMPARE(result, S(3));
     QCOMPARE(c.size(), S(0));
+    QCOMPARE(count, oldSize);
 }
 
 template <typename Container>