diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-10 01:01:21 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-10 09:35:18 +0200 |
| commit | 35f59635087a36e5037a9590ce0b0da0b138c488 (patch) | |
| tree | 51e56fefa3b13fe69d290473f19e86cad3ef8ba6 /src/plugins | |
| parent | 96c4fffd8648e9c9fb95e8208a76933c8c2120bc (diff) | |
| parent | 8c3172d724f3ad03cdee7bae23443fa109d350b1 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/qml/qqmlmetatype.cpp
src/qml/types/qqmlmodelsmodule.cpp
Change-Id: Idc63689ba98d83a455283674f4b5cf3014473605
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp b/src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp index 6bc99d32a1..ab5cfb48b8 100644 --- a/src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp +++ b/src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp @@ -220,10 +220,10 @@ void qDrawTiled(VGImage image, const QSize imageSize, const QRectF &targetRect, void qDrawBorderImage(VGImage image, const QSizeF &textureSize, const QRectF &targetRect, const QRectF &innerTargetRect, const QRectF &subSourceRect) { // Create normalized margins - QMarginsF margins(qMax(innerTargetRect.left() - targetRect.left(), 0.0), - qMax(innerTargetRect.top() - targetRect.top(), 0.0), - qMax(targetRect.right() - innerTargetRect.right(), 0.0), - qMax(targetRect.bottom() - innerTargetRect.bottom(), 0.0)); + QMarginsF margins(qMax(innerTargetRect.left() - targetRect.left(), qreal(0.0)), + qMax(innerTargetRect.top() - targetRect.top(), qreal(0.0)), + qMax(targetRect.right() - innerTargetRect.right(), qreal(0.0)), + qMax(targetRect.bottom() - innerTargetRect.bottom(), qreal(0.0))); QRectF sourceRect(0, 0, textureSize.width(), textureSize.height()); |