diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 18:33:02 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-01-26 19:40:45 +0000 |
| commit | f3060312c89344744832e3352fe4f53efcb94c9b (patch) | |
| tree | de69be5e25a1acd3207a8952376f634fe94fefcc /src/tools | |
| parent | c29d3692d700f7ef6d5833242878b4ec6f81c928 (diff) | |
| parent | a15c3d086dafea83e4760f0b447be43d26b80697 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/moc/generator.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index a7a7195fd4..587aa5971d 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -1255,6 +1255,7 @@ void Generator::generateStaticMetacall() fprintf(out, " if (*reinterpret_cast<_t *>(func) == static_cast<_t>(&%s::%s)) {\n", cdef->classname.constData(), f.name.constData()); fprintf(out, " *result = %d;\n", methodindex); + fprintf(out, " return;\n"); fprintf(out, " }\n }\n"); } if (!anythingUsed) |