diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-05-18 21:19:21 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-05-22 16:02:15 +0000 |
| commit | c16fc5a2d8dbe1ba172347f67101027139af2cfd (patch) | |
| tree | 9c5686b6851fb903574ee4a404915c5da3c9c22b | |
| parent | 05d66444f572066d54225868305b727e918416d4 (diff) | |
Fix GCC 7 warnings about implicit fallthrough
Make them explicit.
Change-Id: I9bf1e35bffb044dcbf62fffd14bfe6f9d5c280f2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
| -rw-r--r-- | src/imports/qtcanvas3d/context3d.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/imports/qtcanvas3d/context3d.cpp b/src/imports/qtcanvas3d/context3d.cpp index 9040ccd..7b2e590 100644 --- a/src/imports/qtcanvas3d/context3d.cpp +++ b/src/imports/qtcanvas3d/context3d.cpp @@ -5856,9 +5856,9 @@ QJSValue CanvasContext::getUniform(QJSValue program3D, QJSValue location3D) locationId); switch (type) { case SAMPLER_2D: - // Intentional flow through + Q_FALLTHROUGH(); // Intentional flow through case SAMPLER_CUBE: - // Intentional flow through + Q_FALLTHROUGH(); // Intentional flow through case INT: { GLint value = 0; syncCommand.returnValue = &value; @@ -5889,10 +5889,10 @@ QJSValue CanvasContext::getUniform(QJSValue program3D, QJSValue location3D) } case INT_VEC2: numValues--; - // Intentional flow through + Q_FALLTHROUGH(); // Intentional flow through case INT_VEC3: numValues--; - // Intentional flow through + Q_FALLTHROUGH(); // Intentional flow through case INT_VEC4: { QV4::Scope scope(m_v4engine); QV4::Scoped<QV4::ArrayBuffer> buffer(scope, @@ -5914,10 +5914,10 @@ QJSValue CanvasContext::getUniform(QJSValue program3D, QJSValue location3D) } case FLOAT_VEC2: numValues--; - // Intentional flow through + Q_FALLTHROUGH(); // Intentional flow through case FLOAT_VEC3: numValues--; - // Intentional flow through + Q_FALLTHROUGH(); // Intentional flow through case FLOAT_VEC4: { QV4::Scope scope(m_v4engine); QV4::Scoped<QV4::ArrayBuffer> buffer(scope, @@ -5940,10 +5940,10 @@ QJSValue CanvasContext::getUniform(QJSValue program3D, QJSValue location3D) } case BOOL_VEC2: numValues--; - // Intentional flow through + Q_FALLTHROUGH(); // Intentional flow through case BOOL_VEC3: numValues--; - // Intentional flow through + Q_FALLTHROUGH(); // Intentional flow through case BOOL_VEC4: { GLint *value = new GLint[numValues]; QJSValue array = m_engine->newArray(numValues); @@ -5962,10 +5962,10 @@ QJSValue CanvasContext::getUniform(QJSValue program3D, QJSValue location3D) } case FLOAT_MAT2: numValues--; - // Intentional flow through + Q_FALLTHROUGH(); // Intentional flow through case FLOAT_MAT3: numValues--; - // Intentional flow through + Q_FALLTHROUGH(); // Intentional flow through case FLOAT_MAT4: { numValues = numValues * numValues; QV4::Scope scope(m_v4engine); |