aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJesus Fernandez <jesus.fernandez@qt.io>2019-01-24 12:14:07 +0100
committerJesus Fernandez <Jesus.Fernandez@qt.io>2019-01-25 10:30:39 +0000
commitf4ab0ab62496e63db72592845b285bab3d8388b9 (patch)
tree8eca2d8bf0e86b604ddb1b76deac2d135adc7d37 /src
parent8ad8a5ddec05832c34f0cab3c8cf6530ea6c66c8 (diff)
Silent -Wdouble-promotion warning
Change-Id: I44ba34365818adf6b9af022e4bf4ae9e02c3511a Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/quick/scenegraph/util/qsgatlastexture.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp
index 66c6d3a882..921ed0c1fc 100644
--- a/src/quick/scenegraph/util/qsgatlastexture.cpp
+++ b/src/quick/scenegraph/util/qsgatlastexture.cpp
@@ -517,8 +517,8 @@ Texture::Texture(Atlas *atlas, const QRect &textureRect, const QImage &image)
, m_nonatlas_texture(nullptr)
, m_has_alpha(image.hasAlphaChannel())
{
- float w = atlas->size().width();
- float h = atlas->size().height();
+ qreal w = atlas->size().width();
+ qreal h = atlas->size().height();
QRect nopad = atlasSubRectWithoutPadding();
m_texture_coords_rect = QRectF(nopad.x() / w,
nopad.y() / h,