AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtOpenGl: compile with GCC 7

Browse Source 
GCC 7 warns about implicit fall-throughs now.

Fix by adding the missing comments.

Change-Id: I081d4db07c7f2b30ee6344a166aaec34ac639ee5
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
This commit is contained in:
Marc Mutz 2016-10-06 18:58:23 +02:00
parent eade394e99
commit 0c8b5b9a04
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/opengl/qgl.cpp
View File

@ -1287,14 +1287,19 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co
switch (versionString[2].toLatin1()) {
case '5':
versionFlags |= QGLFormat::OpenGL_Version_1_5;
// fall through
case '4':
versionFlags |= QGLFormat::OpenGL_Version_1_4;
// fall through
case '3':
versionFlags |= QGLFormat::OpenGL_Version_1_3;
// fall through
case '2':
versionFlags |= QGLFormat::OpenGL_Version_1_2;
// fall through
case '1':
versionFlags |= QGLFormat::OpenGL_Version_1_1;
// fall through
default:
break;
}
@ -1319,10 +1324,13 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co
switch (versionString[2].toLatin1()) {
case '3':
versionFlags |= QGLFormat::OpenGL_Version_3_3;
// fall through
case '2':
versionFlags |= QGLFormat::OpenGL_Version_3_2;
// fall through
case '1':
versionFlags |= QGLFormat::OpenGL_Version_3_1;
// fall through
case '0':
break;
default:
@ -1347,10 +1355,13 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co
switch (versionString[2].toLatin1()) {
case '3':
versionFlags |= QGLFormat::OpenGL_Version_4_3;
// fall through
case '2':
versionFlags |= QGLFormat::OpenGL_Version_4_2;
// fall through
case '1':
versionFlags |= QGLFormat::OpenGL_Version_4_1;
// fall through
case '0':
break;
default: