diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-03 14:36:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-03 14:36:34 (GMT) |
| commit | fe67f6ec257174199665ff0ee3e04208b63cd582 (patch) | |
| tree | 64763f25802604b26f2266b731776d612130f948 /src/tools/moc/moc.h | |
| parent | 711229c3380f31201f16faeb489cc89730971336 (diff) | |
| parent | 782535ac548c582542bd1c17207e288e816870a8 (diff) | |
| download | Qt-fe67f6ec257174199665ff0ee3e04208b63cd582.zip Qt-fe67f6ec257174199665ff0ee3e04208b63cd582.tar.gz Qt-fe67f6ec257174199665ff0ee3e04208b63cd582.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (689 commits)
Remove QFontEngineFT::loadGlyphMetrics
Make autotest more resilient against network timeout
Do not filter adhoc clients
Lancelot: Add configurable client filtering to baseline server
Improve error reporting on failure to connect to baseline server
Fixed bug in X11 backend when creating translucent windows.
Only cleanup share widget if it has been created.
Add required font metrics functions to QRawFont
Fixed bug in QPdfEngine::addImage causing mono images to be made 32 bit
Make pixel size a qreal in QRawFont
Revert "Added QStringRef::toLatin1 and QStringRef::toUtf8"
Added QStringRef::toLatin1 and QStringRef::toUtf8
Make QLineControl send accessibility updates.
Fix warning (unused variable) in QAccessibility test.
Add accessible events as defined by IAccessible2.
Return name and allow actions for invisible accessible items.
Skip child count test on Intel compiler.
Legal: add the license header to the hand-edits
Specify swap behavior preserved bit in openvg engine.
Clear the root index when the model is reset.
...
Diffstat (limited to 'src/tools/moc/moc.h')
| -rw-r--r-- | src/tools/moc/moc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h index 38c3917..4049534 100644 --- a/src/tools/moc/moc.h +++ b/src/tools/moc/moc.h @@ -83,7 +83,7 @@ struct ArgumentDef struct FunctionDef { - FunctionDef(): returnTypeIsVolatile(false), access(Private), isConst(false), isVirtual(false), + FunctionDef(): returnTypeIsVolatile(false), access(Private), isConst(false), isVirtual(false), isStatic(false), inlineCode(false), wasCloned(false), isCompat(false), isInvokable(false), isScriptable(false), isSlot(false), isSignal(false), isConstructor(false), isDestructor(false), isAbstract(false), revision(0) {} @@ -99,6 +99,7 @@ struct FunctionDef Access access; bool isConst; bool isVirtual; + bool isStatic; bool inlineCode; bool wasCloned; |