diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-16 21:55:23 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-16 21:55:23 (GMT) |
| commit | 1f5e32a11114370e4364fcfa77b9c4ab4bf192a3 (patch) | |
| tree | 5761a1e1d6dfac01c50d1c91187c20378383fe6f /src/tools | |
| parent | f60dea8315fef502f6f4c6941455a51bee66efd9 (diff) | |
| parent | 6470f646d0815f67bab507c1362cdda775c42a6e (diff) | |
| download | Qt-1f5e32a11114370e4364fcfa77b9c4ab4bf192a3.zip Qt-1f5e32a11114370e4364fcfa77b9c4ab4bf192a3.tar.gz Qt-1f5e32a11114370e4364fcfa77b9c4ab4bf192a3.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv
Conflicts:
src/declarative/fx/qfxitem.h
src/declarative/util/qfxview.h
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/moc/generator.cpp | 5 | ||||
| -rw-r--r-- | src/tools/moc/moc.cpp | 3 | ||||
| -rw-r--r-- | src/tools/moc/moc.h | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 328717c..990d20a 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -68,7 +68,8 @@ enum PropertyFlags { ResolveUser = 0x00200000, Notify = 0x00400000, Dynamic = 0x00800000, - Constant = 0x00000400 + Constant = 0x00000400, + Final = 0x00000800 }; enum MethodFlags { AccessPrivate = 0x00, @@ -604,6 +605,8 @@ void Generator::generateProperties() if (p.constant) flags |= Constant; + if (p.final) + flags |= Final; fprintf(out, " %4d, %4d, ", strreg(p.name), diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 7ad67c9..d2f40ee 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -917,6 +917,9 @@ void Moc::parseProperty(ClassDef *def) if (l[0] == 'C' && l == "CONSTANT") { propDef.constant = true; continue; + } else if(l[0] == 'F' && l == "FINAL") { + propDef.final = true; + continue; } QByteArray v, v2; diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h index f459032..d68907f 100644 --- a/src/tools/moc/moc.h +++ b/src/tools/moc/moc.h @@ -115,10 +115,11 @@ struct FunctionDef struct PropertyDef { - PropertyDef():notifyId(-1), constant(false), gspec(ValueSpec){} + PropertyDef():notifyId(-1), constant(false), final(false), gspec(ValueSpec){} QByteArray name, type, read, write, reset, designable, scriptable, editable, stored, user, notify; int notifyId; bool constant; + bool final; enum Specification { ValueSpec, ReferenceSpec, PointerSpec }; Specification gspec; bool stdCppSet() const { |