diff options
| author | Bill King <bill.king@nokia.com> | 2009-12-17 00:48:18 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-12-17 00:48:18 (GMT) |
| commit | c7d3627141c5d92f18ee18f22d70cdd60415ac15 (patch) | |
| tree | b2d08c43eb8542b11eae9df30e99622770473af2 /src | |
| parent | b1bec6c5fe862d603ef07ef682d3c813e1b9ff4c (diff) | |
| parent | 0414a73942272d8e863e464b3fbffeb9982964c1 (diff) | |
| download | Qt-c7d3627141c5d92f18ee18f22d70cdd60415ac15.zip Qt-c7d3627141c5d92f18ee18f22d70cdd60415ac15.tar.gz Qt-c7d3627141c5d92f18ee18f22d70cdd60415ac15.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src')
| -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"); |