diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-10 16:08:03 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-12 07:10:25 +0000 |
| commit | 9031069e12a9870c61de2fb7bfe3569f8c8859b0 (patch) | |
| tree | 5964cdd7cd106ca81be94424cdefc99769d9564f /src/opengl/qgl.cpp | |
| parent | cf7a4016a17615df2952389bae11149a49b151bc (diff) | |
Add more Q_FALLTHROUGH()
Silence g++ 7.X warnings.
Change-Id: Id06d06e7e3b5be2cf3934d81f1891da58dea2649
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index a2124974d7..d9f2113c14 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1292,19 +1292,19 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co switch (versionString[2].toLatin1()) { case '5': versionFlags |= QGLFormat::OpenGL_Version_1_5; - // fall through + Q_FALLTHROUGH(); case '4': versionFlags |= QGLFormat::OpenGL_Version_1_4; - // fall through + Q_FALLTHROUGH(); case '3': versionFlags |= QGLFormat::OpenGL_Version_1_3; - // fall through + Q_FALLTHROUGH(); case '2': versionFlags |= QGLFormat::OpenGL_Version_1_2; - // fall through + Q_FALLTHROUGH(); case '1': versionFlags |= QGLFormat::OpenGL_Version_1_1; - // fall through + Q_FALLTHROUGH(); default: break; } @@ -1329,13 +1329,13 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co switch (versionString[2].toLatin1()) { case '3': versionFlags |= QGLFormat::OpenGL_Version_3_3; - // fall through + Q_FALLTHROUGH(); case '2': versionFlags |= QGLFormat::OpenGL_Version_3_2; - // fall through + Q_FALLTHROUGH(); case '1': versionFlags |= QGLFormat::OpenGL_Version_3_1; - // fall through + Q_FALLTHROUGH(); case '0': break; default: @@ -1360,13 +1360,13 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co switch (versionString[2].toLatin1()) { case '3': versionFlags |= QGLFormat::OpenGL_Version_4_3; - // fall through + Q_FALLTHROUGH(); case '2': versionFlags |= QGLFormat::OpenGL_Version_4_2; - // fall through + Q_FALLTHROUGH(); case '1': versionFlags |= QGLFormat::OpenGL_Version_4_1; - // fall through + Q_FALLTHROUGH(); case '0': break; default: |