diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-05 14:10:47 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-05 14:10:47 (GMT) |
| commit | 1d7d5436eea09a232187836e59d2a937a752dee4 (patch) | |
| tree | 6bd9ae61abb1467aceddc5a828fc2e65d93b2534 /src/tools/moc/moc.h | |
| parent | 791bddfcd5cc7540219835ef5d91486acd833c4b (diff) | |
| parent | fb8bb148affec842e8fa1a70616c64c7d3066ee8 (diff) | |
| download | Qt-1d7d5436eea09a232187836e59d2a937a752dee4.zip Qt-1d7d5436eea09a232187836e59d2a937a752dee4.tar.gz Qt-1d7d5436eea09a232187836e59d2a937a752dee4.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
src/script/qscriptextqobject.cpp
Diffstat (limited to 'src/tools/moc/moc.h')
| -rw-r--r-- | src/tools/moc/moc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h index 9fa9ac2..767f84e 100644 --- a/src/tools/moc/moc.h +++ b/src/tools/moc/moc.h @@ -115,9 +115,11 @@ struct FunctionDef struct PropertyDef { - PropertyDef():notifyId(-1), 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 { |