1 files changed, 15 insertions, 8 deletions
diff --git a/src/core/api/qwebenginefilesystemaccessrequest.h b/src/core/api/qwebenginefilesystemaccessrequest.h
index ade737652..37b1e1861 100644
--- a/src/core/api/qwebenginefilesystemaccessrequest.h
+++ b/src/core/api/qwebenginefilesystemaccessrequest.h
@@ -5,9 +5,8 @@
 #define QWEBENGINEFILESYSTEMACCESSREQUEST_H
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
-
-#include <QtCore/qsharedpointer.h>
 #include <QtCore/qurl.h>
+#include <memory>
 
 namespace QtWebEngineCore {
 class FileSystemAccessPermissionRequestController;
@@ -27,10 +26,12 @@ class Q_WEBENGINECORE_EXPORT QWebEngineFileSystemAccessRequest
 public:
     QWebEngineFileSystemAccessRequest(const QWebEngineFileSystemAccessRequest &other);
     QWebEngineFileSystemAccessRequest &operator=(const QWebEngineFileSystemAccessRequest &other);
-    QWebEngineFileSystemAccessRequest(QWebEngineFileSystemAccessRequest &&other);
-    QWebEngineFileSystemAccessRequest &operator=(QWebEngineFileSystemAccessRequest &&other);
+    QWebEngineFileSystemAccessRequest(QWebEngineFileSystemAccessRequest &&other) noexcept = default;
+    QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QWebEngineFileSystemAccessRequest)
     ~QWebEngineFileSystemAccessRequest();
 
+    void swap(QWebEngineFileSystemAccessRequest &other) noexcept { d_ptr.swap(other.d_ptr); }
+
     enum HandleType { File, Directory };
     Q_ENUM(HandleType)
 
@@ -45,17 +46,23 @@ public:
     HandleType handleType() const;
     AccessFlags accessFlags() const;
 
-    bool operator==(const QWebEngineFileSystemAccessRequest &that) const;
-    bool operator!=(const QWebEngineFileSystemAccessRequest &that) const;
+    inline friend bool operator==(const QWebEngineFileSystemAccessRequest &lhs,
+                                  const QWebEngineFileSystemAccessRequest &rhs) noexcept
+    { return lhs.d_ptr == rhs.d_ptr; }
+    inline friend bool operator!=(const QWebEngineFileSystemAccessRequest &lhs,
+                                  const QWebEngineFileSystemAccessRequest &rhs) noexcept
+    { return lhs.d_ptr != rhs.d_ptr; }
 
 private:
     QWebEngineFileSystemAccessRequest(
-            QSharedPointer<QtWebEngineCore::FileSystemAccessPermissionRequestController>);
+            std::shared_ptr<QtWebEngineCore::FileSystemAccessPermissionRequestController>);
     friend QtWebEngineCore::FileSystemAccessPermissionRequestManagerQt;
 
-    QSharedPointer<QtWebEngineCore::FileSystemAccessPermissionRequestController> d_ptr;
+    std::shared_ptr<QtWebEngineCore::FileSystemAccessPermissionRequestController> d_ptr;
 };
 
+Q_DECLARE_SHARED(QWebEngineFileSystemAccessRequest)
+
 Q_DECLARE_OPERATORS_FOR_FLAGS(QWebEngineFileSystemAccessRequest::AccessFlags)
 
 QT_END_NAMESPACE