From 40828992ebfb1a5f33b523d1495668d271e726a7 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Wed, 26 Jan 2022 14:07:07 +0100
Subject: [PATCH] QCollator: port from QString::compare_helper to
 QtPrivate::compareStrings

The call becomes simpler, and QCollator no longer needs to befriend
QString.

Pick-to: 6.3
Change-Id: Ie2c977dc39973423f07563a0702a83fa3c75270d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/corelib/text/qcollator_icu.cpp | 4 +---
 src/corelib/text/qstring.h         | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/corelib/text/qcollator_icu.cpp b/src/corelib/text/qcollator_icu.cpp
index 0dca1ee9c99..d23edad6c28 100644
--- a/src/corelib/text/qcollator_icu.cpp
+++ b/src/corelib/text/qcollator_icu.cpp
@@ -123,9 +123,7 @@ int QCollator::compare(QStringView s1, QStringView s2) const
                             reinterpret_cast<const UChar *>(s2.data()), s2.size());
     }
 
-    return QString::compare_helper(s1.data(), s1.size(),
-                                   s2.data(), s2.size(),
-                                   d->caseSensitivity);
+    return QtPrivate::compareStrings(s1, s2, d->caseSensitivity);
 }
 
 QCollatorSortKey QCollator::sortKey(const QString &string) const
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h
index 80139205af4..40e023be839 100644
--- a/src/corelib/text/qstring.h
+++ b/src/corelib/text/qstring.h
@@ -1129,7 +1129,6 @@ private:
     void replace_helper(size_t *indices, qsizetype nIndices, qsizetype blen, const QChar *after, qsizetype alen);
     friend class QStringView;
     friend class QByteArray;
-    friend class QCollator;
     friend struct QAbstractConcatenable;
 
     template <typename T> static