diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-29 12:18:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-29 12:37:04 +0100 |
| commit | 8ec2403603f82e7a0d43b4de04c97ef1c7f1ad35 (patch) | |
| tree | d7099d5a7cf813f378064ef0348647f4e68b2692 /src/quick/scenegraph | |
| parent | 15525d2a309a6028d548797bc777e38905f36c46 (diff) | |
| parent | 454676a8745a7334539449562a5fda47db2fc2ca (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/3rdparty/masm/yarr/YarrJIT.cpp
src/qml/compiler/qv4instr_moth.cpp
src/quick/handlers/qquicksinglepointhandler_p.h
src/quick/handlers/qquicktaphandler.cpp
src/quick/items/context2d/qquickcontext2d.cpp
Done-With: Ulf Hermann <ulf.hermann@qt.io>
Change-Id: I109453131f9f0a05316ae37c7d6ed1edc8c0f9d4
Diffstat (limited to 'src/quick/scenegraph')
| -rw-r--r-- | src/quick/scenegraph/util/qsgatlastexture.cpp | 4 |
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, |