Merge remote-tracking branch 'origin/5.12' into 5.13

Conflicts:
	src/core/profile_adapter.cpp
	src/core/profile_adapter.h
	src/webengine/api/qquickwebengineprofile.cpp
	src/webenginewidgets/api/qwebengineprofile.cpp
	tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp

Change-Id: Ic561f22b361e32a0a63668c73bf6c0fc9c1ce16f

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 74adbaba9..d3ea27fc2 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -197,6 +197,7 @@ private Q_SLOTS:
     void closeOpenerTab();
     void switchPage();
     void setPageDeletesImplicitPage();
+    void setPageDeletesImplicitPage2();
     void setViewDeletesImplicitPage();
     void setPagePreservesExplicitPage();
     void setViewPreservesExplicitPage();
@@ -3211,6 +3212,20 @@ void tst_QWebEngineView::setPageDeletesImplicitPage()
     QVERIFY(!implicitPage); // should be deleted
 }
 
+void tst_QWebEngineView::setPageDeletesImplicitPage2()
+{
+    QWebEngineView view1;
+    QWebEngineView view2;
+    QPointer<QWebEnginePage> implicitPage = view1.page();
+    view2.setPage(view1.page());
+    QVERIFY(implicitPage);
+    QVERIFY(view1.page() != implicitPage);
+    QWebEnginePage explicitPage;
+    view2.setPage(&explicitPage);
+    QCOMPARE(view2.page(), &explicitPage);
+    QVERIFY(!implicitPage); // should be deleted
+}
+
 void tst_QWebEngineView::setViewDeletesImplicitPage()
 {
     QWebEngineView view;