diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-17 03:00:40 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-17 03:00:40 +0200 |
| commit | d96b8afd40f83075c4f76edd0cf80b4fe05b74fa (patch) | |
| tree | e38903029ce9fd6a097a54953d93a794ee022612 /src | |
| parent | e3fa740d20b31270c09c258215f7d91d94da0cea (diff) | |
| parent | 434f3e9a952b5858abc1f0ed1179ea5d2fca6a19 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I146a45fb7ae41646d1cff42268e3a89ab2b92dfb
Diffstat (limited to 'src')
| -rw-r--r-- | src/shared/qwaylandsharedmemoryformathelper_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/qwaylandsharedmemoryformathelper_p.h b/src/shared/qwaylandsharedmemoryformathelper_p.h index e5b5faf02..85905c02f 100644 --- a/src/shared/qwaylandsharedmemoryformathelper_p.h +++ b/src/shared/qwaylandsharedmemoryformathelper_p.h @@ -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, |