diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-06 16:19:14 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-06 16:50:03 +0200 |
commit | 1326cd15f7ba985551f0fddc717e3bfc01ddda85 (patch) | |
tree | 024eb871ed5f4e8c02e21412475e6e9929a2b030 /src/tools/moc/generator.cpp | |
parent | fe70367fe06984d1ac84cc276ca3fd3edc4193c7 (diff) | |
parent | beb7258a56b6ec76531b73cc07ee30132a3f548f (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/qnx-x86-qcc/qplatformdefs.h
src/corelib/global/qglobal.h
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
src/opengl/qglpixelbuffer.cpp
src/opengl/qglshaderprogram.cpp
tests/auto/opengl/qglthreads/tst_qglthreads.cpp
Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5
Diffstat (limited to 'src/tools/moc/generator.cpp')
-rw-r--r-- | src/tools/moc/generator.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 3345cf4d64..c63e80f90f 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -985,6 +985,7 @@ void Generator::generateMetacall() fprintf(out, " case %d: *reinterpret_cast< %s*>(_v) = %s%s; break;\n", propindex, p.type.constData(), prefix.constData(), p.member.constData()); } + fprintf(out, " default: break;\n"); fprintf(out, " }\n"); } @@ -1033,6 +1034,7 @@ void Generator::generateMetacall() fprintf(out, " break;\n"); } } + fprintf(out, " default: break;\n"); fprintf(out, " }\n"); } @@ -1056,6 +1058,7 @@ void Generator::generateMetacall() fprintf(out, " case %d: %s%s; break;\n", propindex, prefix.constData(), p.reset.constData()); } + fprintf(out, " default: break;\n"); fprintf(out, " }\n"); } fprintf(out, @@ -1074,6 +1077,7 @@ void Generator::generateMetacall() fprintf(out, " case %d: *_b = %s; break;\n", propindex, p.designable.constData()); } + fprintf(out, " default: break;\n"); fprintf(out, " }\n"); } fprintf(out, @@ -1092,6 +1096,7 @@ void Generator::generateMetacall() fprintf(out, " case %d: *_b = %s; break;\n", propindex, p.scriptable.constData()); } + fprintf(out, " default: break;\n"); fprintf(out, " }\n"); } fprintf(out, @@ -1110,6 +1115,7 @@ void Generator::generateMetacall() fprintf(out, " case %d: *_b = %s; break;\n", propindex, p.stored.constData()); } + fprintf(out, " default: break;\n"); fprintf(out, " }\n"); } fprintf(out, @@ -1128,6 +1134,7 @@ void Generator::generateMetacall() fprintf(out, " case %d: *_b = %s; break;\n", propindex, p.editable.constData()); } + fprintf(out, " default: break;\n"); fprintf(out, " }\n"); } fprintf(out, @@ -1147,6 +1154,7 @@ void Generator::generateMetacall() fprintf(out, " case %d: *_b = %s; break;\n", propindex, p.user.constData()); } + fprintf(out, " default: break;\n"); fprintf(out, " }\n"); } fprintf(out, @@ -1228,6 +1236,7 @@ void Generator::generateStaticMetacall() fprintf(out, ");\n"); fprintf(out, " if (_a[0]) *reinterpret_cast<QObject**>(_a[0]) = _r; } break;\n"); } + fprintf(out, " default: break;\n"); fprintf(out, " }\n"); fprintf(out, " }"); needElse = true; |