diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-06 20:21:19 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-06 20:21:19 +0100 |
| commit | 82621148de82d63a562163a72598e15ed98797a8 (patch) | |
| tree | 030d345ad4a4ae612995949bbbeec66b36e69854 /src/multimediawidgets | |
| parent | 2fc515ea1eaa0f7ffb56c4dadee560095c3374bd (diff) | |
| parent | 7a3b8907060123fe5d487d4c9ba3a1e222f468bb (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I5acdc7e0bd3729b80522dfff0f388cf2507fb111
Diffstat (limited to 'src/multimediawidgets')
| -rw-r--r-- | src/multimediawidgets/qpaintervideosurface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp index 6e93e150d..0147690e1 100644 --- a/src/multimediawidgets/qpaintervideosurface.cpp +++ b/src/multimediawidgets/qpaintervideosurface.cpp @@ -1254,8 +1254,8 @@ QAbstractVideoSurface::Error QVideoSurfaceGlslPainter::paint( if (scissorTestEnabled) glEnable(GL_SCISSOR_TEST); - const int width = QOpenGLContext::currentContext()->surface()->size().width(); - const int height = QOpenGLContext::currentContext()->surface()->size().height(); + const int width = painter->viewport().width(); + const int height = painter->viewport().height(); const QTransform transform = painter->deviceTransform(); |