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

Conflicts:
	src/core/content_browser_client_qt.cpp
	src/core/content_browser_client_qt.h

Change-Id: I3da791a82dab56fd7535ba1e4c0ab1d9ca74f547

2 files changed, 0 insertions, 6 deletions

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 5940319c3..22ef8fffe 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -267,11 +267,6 @@ QRectF QWebEnginePagePrivate::viewportRect() const
     return view ? view->rect() : QRectF();
 }
 
-qreal QWebEnginePagePrivate::dpiScale() const
-{
-    return 1.0;
-}
-
 QColor QWebEnginePagePrivate::backgroundColor() const
 {
     return m_backgroundColor;
diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
index e60438d97..bf2f43f80 100644
--- a/src/webenginewidgets/api/qwebenginepage_p.h
+++ b/src/webenginewidgets/api/qwebenginepage_p.h
@@ -100,7 +100,6 @@ public:
     void selectionChanged() override;
     void recentlyAudibleChanged(bool recentlyAudible) override;
     QRectF viewportRect() const override;
-    qreal dpiScale() const override;
     QColor backgroundColor() const override;
     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
     void loadCommitted() override { }