Skip to content

Commit 43df06d

Browse files
author
Qt Forward Merge Bot
committed
Merge remote-tracking branch 'origin/5.14.0' into 5.14
Change-Id: I737802a3333b678ed5385faf22436c211fe6ed44
2 parents 47bd603 + 2f47e95 commit 43df06d

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

dist/changes-5.14.0

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Qt 5.14 introduces many new features and improvements as well as bugfixes
2+
over the 5.13.x series. For more details, refer to the online documentation
3+
included in this distribution. The documentation is also available online:
4+
5+
https://doc.qt.io/qt-5/index.html
6+
7+
The Qt version 5.14 series is binary compatible with the 5.13.x series.
8+
Applications compiled for 5.13 will continue to run with 5.14.
9+
10+
Some of the changes listed in this file include issue tracking numbers
11+
corresponding to tasks in the Qt Bug Tracker:
12+
13+
https://bugreports.qt.io/
14+
15+
Each of these identifiers can be entered in the bug tracker to obtain more
16+
information about a particular change.
17+
18+
- This release contains only minor code improvements.

src/plugins/platforms/webgl/qwebglcontext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ inline int imageSize(GLsizei width, GLsizei height, GLenum format, GLenum type,
147147
{ GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, 2 },
148148
{ GL_RGB, GL_UNSIGNED_BYTE, 3 },
149149
{ GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 2 },
150-
{ GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 1 },
150+
{ GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 2 },
151151
{ GL_LUMINANCE, GL_UNSIGNED_BYTE, 1 },
152152
{ GL_ALPHA, GL_UNSIGNED_BYTE, 1 },
153153

0 commit comments

Comments
 (0)