diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:03:34 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:03:34 +0100 |
| commit | 045eeb8c929eeca306152670d001f1c6aff1ffb4 (patch) | |
| tree | 9069965e947f98612cf06fa8714dc88bf5597e14 /src | |
| parent | d4c5e69944a48407d50fbe42c1af4be9bb8c4b87 (diff) | |
| parent | 43df06dd013cb9d1282144543d2e33fca0071b4a (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ia6f1bc0234ebb5cda8ccdb639bb89b56d9c9acf5
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/webgl/qwebglcontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/webgl/qwebglcontext.cpp b/src/plugins/platforms/webgl/qwebglcontext.cpp index c1ee009..5857883 100644 --- a/src/plugins/platforms/webgl/qwebglcontext.cpp +++ b/src/plugins/platforms/webgl/qwebglcontext.cpp @@ -147,7 +147,7 @@ inline int imageSize(GLsizei width, GLsizei height, GLenum format, GLenum type, { GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, 2 }, { GL_RGB, GL_UNSIGNED_BYTE, 3 }, { GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 2 }, - { GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 1 }, + { GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 2 }, { GL_LUMINANCE, GL_UNSIGNED_BYTE, 1 }, { GL_ALPHA, GL_UNSIGNED_BYTE, 1 }, |