diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-16 01:00:11 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-16 01:00:11 +0200 |
| commit | 264e66afb2739b502464e6ed972207bd3ea89d22 (patch) | |
| tree | 8ea62cb4d48c900f5971c0645e70308fb6660f75 /src/gui/painting | |
| parent | 1e5deb06416b6efc33a2009d9678fd8f743c5ce7 (diff) | |
| parent | d441f6bba7b2aaf1e11b95c1ad4c785e6939f6ba (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I1bdc28a3ae825ea35e83f20fe16d2409515e5a3d
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qpaintengine_raster_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h index 881144d1c2..5d527207a4 100644 --- a/src/gui/painting/qpaintengine_raster_p.h +++ b/src/gui/painting/qpaintengine_raster_p.h @@ -448,7 +448,7 @@ public: void resetBuffer(int val=0); - uchar *scanLine(int y) { Q_ASSERT(y>=0); Q_ASSERT(y<m_height); return m_buffer + y * bytes_per_line; } + uchar *scanLine(int y) { Q_ASSERT(y>=0); Q_ASSERT(y<m_height); return m_buffer + y * qsizetype(bytes_per_line); } #ifndef QT_NO_DEBUG QImage bufferImage() const; |