diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-10-10 13:59:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-10-10 13:59:00 +0200 |
| commit | aa057451b35953018c4f94d0a4bd5e813767cbc9 (patch) | |
| tree | 8fd40c6d230e7e6171bca10e58178744326d5a5d /src/quick/items/qquickimage.cpp | |
| parent | 3fde977a817498817e98ce350d493658b0ed4458 (diff) | |
| parent | b418c2fe6c97aa63e990ce5ee349aa33266b6579 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp
tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
Change-Id: I117c8d62b21800329d1035021d312d9924f83a1b
Diffstat (limited to 'src/quick/items/qquickimage.cpp')
| -rw-r--r-- | src/quick/items/qquickimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp index c7e7ccea55..840cfe15da 100644 --- a/src/quick/items/qquickimage.cpp +++ b/src/quick/items/qquickimage.cpp @@ -676,13 +676,13 @@ QSGNode *QQuickImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) int xOffset = 0; if (d->hAlign == QQuickImage::AlignHCenter) - xOffset = qCeil((width() - pixWidth) / 2.); + xOffset = (width() - pixWidth) / 2; else if (d->hAlign == QQuickImage::AlignRight) xOffset = qCeil(width() - pixWidth); int yOffset = 0; if (d->vAlign == QQuickImage::AlignVCenter) - yOffset = qCeil((height() - pixHeight) / 2.); + yOffset = (height() - pixHeight) / 2; else if (d->vAlign == QQuickImage::AlignBottom) yOffset = qCeil(height() - pixHeight); |