1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.11' into dev

Browse Source 
Change-Id: I146a45fb7ae41646d1cff42268e3a89ab2b92dfb
This commit is contained in:
Qt Forward Merge Bot 2018-04-17 03:00:40 +02:00
commit 69b9686236
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/shared/qwaylandsharedmemoryformathelper_p.h
View File

@ -89,7 +89,7 @@ private:
WL_SHM_FORMAT_ABGR8888, //Format_RGBA8888,
WL_SHM_FORMAT_ABGR8888, //Format_RGBA8888_Premultiplied,
WL_SHM_FORMAT_XBGR2101010, //Format_BGR30,
WL_SHM_FORMAT_ARGB2101010, //Format_A2BGR30_Premultiplied,
WL_SHM_FORMAT_ABGR2101010, //Format_A2BGR30_Premultiplied,
WL_SHM_FORMAT_XRGB2101010, //Format_RGB30,
WL_SHM_FORMAT_ARGB2101010, //Format_A2RGB30_Premultiplied,
WL_SHM_FORMAT_C8, //Format_Alpha8,