1 files changed, 13 insertions, 10 deletions
diff --git a/src/corelib/tools/qcollator.h b/src/corelib/tools/qcollator.h
index 6fa199cb0f..6bb5038371 100644
--- a/src/corelib/tools/qcollator.h
+++ b/src/corelib/tools/qcollator.h
@@ -57,11 +57,9 @@ public:
     QCollatorSortKey(const QCollatorSortKey &other);
     ~QCollatorSortKey();
     QCollatorSortKey &operator=(const QCollatorSortKey &other);
-#ifdef Q_COMPILER_RVALUE_REFS
-    inline QCollatorSortKey &operator=(QCollatorSortKey &&other) Q_DECL_NOTHROW
+    inline QCollatorSortKey &operator=(QCollatorSortKey &&other) noexcept
     { swap(other); return *this; }
-#endif
-    void swap(QCollatorSortKey &other) Q_DECL_NOTHROW
+    void swap(QCollatorSortKey &other) noexcept
     { d.swap(other.d); }
 
     int compare(const QCollatorSortKey &key) const;
@@ -83,18 +81,17 @@ inline bool operator<(const QCollatorSortKey &lhs, const QCollatorSortKey &rhs)
 class Q_CORE_EXPORT QCollator
 {
 public:
-    explicit QCollator(const QLocale &locale = QLocale());
+    QCollator();
+    explicit QCollator(const QLocale &locale);
     QCollator(const QCollator &);
     ~QCollator();
     QCollator &operator=(const QCollator &);
-#ifdef Q_COMPILER_RVALUE_REFS
-    QCollator(QCollator &&other) Q_DECL_NOTHROW
+    QCollator(QCollator &&other) noexcept
         : d(other.d) { other.d = nullptr; }
-    QCollator &operator=(QCollator &&other) Q_DECL_NOTHROW
+    QCollator &operator=(QCollator &&other) noexcept
     { swap(other); return *this; }
-#endif
 
-    void swap(QCollator &other) Q_DECL_NOTHROW
+    void swap(QCollator &other) noexcept
     { qSwap(d, other.d); }
 
     void setLocale(const QLocale &locale);
@@ -109,12 +106,18 @@ public:
     void setIgnorePunctuation(bool on);
     bool ignorePunctuation() const;
 
+#if QT_STRINGVIEW_LEVEL < 2
     int compare(const QString &s1, const QString &s2) const;
     int compare(const QStringRef &s1, const QStringRef &s2) const;
     int compare(const QChar *s1, int len1, const QChar *s2, int len2) const;
 
     bool operator()(const QString &s1, const QString &s2) const
     { return compare(s1, s2) < 0; }
+#endif
+    int compare(QStringView s1, QStringView s2) const;
+
+    bool operator()(QStringView s1, QStringView s2) const
+    { return compare(s1, s2) < 0; }
 
     QCollatorSortKey sortKey(const QString &string) const;