From e880fd512f8535d19b1e1a939bf7fa76c1a9c480 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Thu, 1 Dec 2022 10:30:53 +0100
Subject: Port d_ptr of QWebEngineUrlRequestInfo to std::unique_ptr

Fix compiler warning about deprecated QScopedPointer::take.

Pick-to: 6.4
Change-Id: I71f714e0dd301db51580b5e03d860d6d214a84b3
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
---
 src/core/api/qwebengineurlrequestinfo.cpp | 14 ++++++++++++--
 src/core/api/qwebengineurlrequestinfo.h   |  5 +++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/core/api/qwebengineurlrequestinfo.cpp b/src/core/api/qwebengineurlrequestinfo.cpp
index 31a2963f2..162ae7daf 100644
--- a/src/core/api/qwebengineurlrequestinfo.cpp
+++ b/src/core/api/qwebengineurlrequestinfo.cpp
@@ -6,8 +6,15 @@
 
 #include "web_contents_adapter_client.h"
 
+#include <memory>
+#include <utility>
+
 QT_BEGIN_NAMESPACE
 
+// We changed the type from QScopedPointer to unique_ptr, make sure it's binary compatible:
+static_assert(sizeof(QScopedPointer<QWebEngineUrlRequestInfoPrivate>)
+              == sizeof(std::unique_ptr<QWebEngineUrlRequestInfoPrivate>));
+
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::LinkNavigation, QWebEngineUrlRequestInfo::NavigationTypeLink)
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::TypedNavigation, QWebEngineUrlRequestInfo::NavigationTypeTyped)
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::FormSubmittedNavigation,
@@ -93,14 +100,17 @@ QWebEngineUrlRequestInfo::QWebEngineUrlRequestInfo() {}
 /*!
     \internal
 */
-QWebEngineUrlRequestInfo::QWebEngineUrlRequestInfo(QWebEngineUrlRequestInfo &&p) : d_ptr(p.d_ptr.take()) {}
+QWebEngineUrlRequestInfo::QWebEngineUrlRequestInfo(QWebEngineUrlRequestInfo &&p)
+    : d_ptr(std::move(p.d_ptr))
+{
+}
 
 /*!
     \internal
 */
 QWebEngineUrlRequestInfo &QWebEngineUrlRequestInfo::operator=(QWebEngineUrlRequestInfo &&p)
 {
-    d_ptr.reset(p.d_ptr.take());
+    d_ptr = std::move(p.d_ptr);
     return *this;
 }
 
diff --git a/src/core/api/qwebengineurlrequestinfo.h b/src/core/api/qwebengineurlrequestinfo.h
index c1696c9c2..3678b52f4 100644
--- a/src/core/api/qwebengineurlrequestinfo.h
+++ b/src/core/api/qwebengineurlrequestinfo.h
@@ -6,9 +6,10 @@
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
-#include <QtCore/qscopedpointer.h>
 #include <QtCore/qurl.h>
 
+#include <memory>
+
 namespace QtWebEngineCore {
 class ContentBrowserClientQt;
 class InterceptedRequest;
@@ -87,7 +88,7 @@ private:
     QWebEngineUrlRequestInfo(QWebEngineUrlRequestInfo &&p);
     QWebEngineUrlRequestInfo &operator=(QWebEngineUrlRequestInfo &&p);
     ~QWebEngineUrlRequestInfo();
-    QScopedPointer<QWebEngineUrlRequestInfoPrivate> d_ptr;
+    std::unique_ptr<QWebEngineUrlRequestInfoPrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3