diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-28 14:40:59 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-28 16:48:32 +0100 |
| commit | b97f0eb87b6e6a6726b805c9de2159c6ad983f7d (patch) | |
| tree | ef5984369eb0fac54704725aa8c976e8c1b059ac /src/webengine/render_widget_host_view_qt_delegate_quick.cpp | |
| parent | d82ff4e1d1a93bf0a31745a5454346ac54959cf8 (diff) | |
| parent | de428e1a79708967f97aa8ffcbb2403d3b7d1e7f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/webengine/render_widget_host_view_qt_delegate_quick.cpp')
| -rw-r--r-- | src/webengine/render_widget_host_view_qt_delegate_quick.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp index 3a103b9aa..ac32671aa 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -106,7 +106,11 @@ QRectF RenderWidgetHostViewQtDelegateQuick::viewGeometry() const const QPointF p2 = mapToGlobal(mapFromScene(QPointF(width(), height()))); QRectF geometry = QRectF(p1, p2).normalized(); // But keep the size untransformed to behave like other QQuickItems. +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) geometry.setSize(size()); +#else + geometry.setSize(QSizeF(width(), height())); +#endif return geometry; } |