Merge branch '5.9' into 5.10

Conflicts:
	.qmake.conf
	src/core/core_module.pro
	src/core/delegated_frame_node.cpp
	src/core/surface_factory_qt.cpp
	src/webenginewidgets/api/qwebengineprofile.cpp
	tests/auto/widgets/widgets.pro

Change-Id: I92f3ef4eee779afef6c5381a7aa8b551417c1b17

1 files changed, 5 insertions, 0 deletions

diff --git a/src/core/type_conversion.h b/src/core/type_conversion.h
index d9ba735bd..eb7c9d48b 100644
--- a/src/core/type_conversion.h
+++ b/src/core/type_conversion.h
@@ -142,6 +142,11 @@ inline QRectF toQt(const gfx::RectF &rect)
     return QRectF(rect.x(), rect.y(), rect.width(), rect.height());
 }
 
+inline gfx::Size toGfx(const QSize &size)
+{
+    return gfx::Size(size.width(), size.height());
+}
+
 inline QSize toQt(const gfx::Size &size)
 {
     return QSize(size.width(), size.height());