diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-15 21:25:00 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-16 09:12:10 (GMT) |
| commit | 0414a73942272d8e863e464b3fbffeb9982964c1 (patch) | |
| tree | e900bd26021e41c99133ea94efcb1978bf5815e5 /src/tools | |
| parent | 802efaf0b20e08bcc04763a288a05551121493e8 (diff) | |
| download | Qt-0414a73942272d8e863e464b3fbffeb9982964c1.zip Qt-0414a73942272d8e863e464b3fbffeb9982964c1.tar.gz Qt-0414a73942272d8e863e464b3fbffeb9982964c1.tar.bz2 | |
Fix moc generated code with dummy Q_PROPERTY
If there is properties, we cannot skip the code that substract
the property number from the id
Task-number: QTBUG-5590
Reviewed-by: Brad
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/moc/generator.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 8fcc0df..1a75cf6 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -725,16 +725,6 @@ void Generator::generateMetacall() needEditable |= p.editable.endsWith(')'); needUser |= p.user.endsWith(')'); } - bool needAnything = needGet - | needSet - | needReset - | needDesignable - | needScriptable - | needStored - | needEditable - | needUser; - if (!needAnything) - goto skip_properties; fprintf(out, "\n#ifndef QT_NO_PROPERTIES\n "); if (needElse) @@ -904,7 +894,6 @@ void Generator::generateMetacall() fprintf(out, "\n#endif // QT_NO_PROPERTIES"); } - skip_properties: if (methodList.size() || cdef->signalList.size() || cdef->propertyList.size()) fprintf(out, "\n "); fprintf(out,"return _id;\n}\n"); |