diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-13 03:01:49 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-13 03:01:49 +0200 |
commit | 97213e13cd7f2ccae1d5215bbb503f8f59c0ad22 (patch) | |
tree | f5586f079726cf909b48bd9e55fa1b5e18381801 /src/multimediawidgets | |
parent | 2da4e162516830f4976f30c789a3fd9511dde932 (diff) | |
parent | 075fa6203856bdf9f58e737ee2f5d2a843a85cad (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I428528333e89214d96acef5c2ba8ea832b2b145f
Diffstat (limited to 'src/multimediawidgets')
-rw-r--r-- | src/multimediawidgets/qpaintervideosurface_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimediawidgets/qpaintervideosurface_p.h b/src/multimediawidgets/qpaintervideosurface_p.h index bf0a0ac5c..990d20cbe 100644 --- a/src/multimediawidgets/qpaintervideosurface_p.h +++ b/src/multimediawidgets/qpaintervideosurface_p.h @@ -68,7 +68,7 @@ QT_USE_NAMESPACE QT_BEGIN_NAMESPACE -class QVideoSurfacePainter +class Q_AUTOTEST_EXPORT QVideoSurfacePainter { public: virtual ~QVideoSurfacePainter(); |