diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-17 03:03:34 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-17 03:03:34 +0100 |
| commit | af14eb27c49e88721bd559245480d58c14ca9224 (patch) | |
| tree | 253d56a841b1db60c5edd0c361bd141586369f88 | |
| parent | 9c3df6579763e2bd45e51a1f5e7d276947b85f6f (diff) | |
| parent | 045eeb8c929eeca306152670d001f1c6aff1ffb4 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ica166f282941cad9632711e617328c764a85db80
| -rw-r--r-- | dist/changes-5.14.0 | 18 | ||||
| -rw-r--r-- | src/plugins/platforms/webgl/qwebglcontext.cpp | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/dist/changes-5.14.0 b/dist/changes-5.14.0 new file mode 100644 index 0000000..29a2c83 --- /dev/null +++ b/dist/changes-5.14.0 @@ -0,0 +1,18 @@ +Qt 5.14 introduces many new features and improvements as well as bugfixes +over the 5.13.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.14 series is binary compatible with the 5.13.x series. +Applications compiled for 5.13 will continue to run with 5.14. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. 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 }, |