From bf6ac0f0df5510aa65ecd9bb050bd13d47089d4a Mon Sep 17 00:00:00 2001 From: VaL Doroshchuk Date: Tue, 24 Sep 2019 12:25:29 +0200 Subject: Move QVideoFrame::Format_ABGR32 to the end of the Pixel Formats Since ABGR32 was introduced in 5.13.0 but placed in the middle of the list, which breaks enum values. [ChangeLog] In Qt 5.13.0 binary compatibility was broken for usage of the enum QVideoFrame::PixelFormat by introducing QVideoFrame::Format_ABGR32. To minimize the impact of this, the break has been reverted, thus introducing a binary compatibility break with earlier Qt 5.13.x versions, but restoring compatibility with all earlier versions of Qt 5. Change-Id: I3c490f2fc30f3b6914306b2d496724f12729338e Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/multimedia/video/qvideoframe.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h index 375f80dac..206658bc5 100644 --- a/src/multimedia/video/qvideoframe.h +++ b/src/multimedia/video/qvideoframe.h @@ -75,7 +75,6 @@ public: Format_ARGB8565_Premultiplied, Format_BGRA32, Format_BGRA32_Premultiplied, - Format_ABGR32, Format_BGR32, Format_BGR24, Format_BGR565, @@ -102,6 +101,7 @@ public: Format_CameraRaw, Format_AdobeDng, + Format_ABGR32, // ### Qt 6: reorder #ifndef Q_QDOC NPixelFormats, -- cgit v1.2.3