diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-20 05:16:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-20 05:16:30 (GMT) |
| commit | 42fa9ae8e755fe46653c6fa0bc943e11de99e9e4 (patch) | |
| tree | b6739be333f5daff4f304bc73e9040758a784f37 /src/tools/moc/moc.h | |
| parent | d129112034d600ea925a4199d8bad72388444335 (diff) | |
| parent | cb2cd4b08984278588d8dbba06de29522acd8a60 (diff) | |
| download | Qt-42fa9ae8e755fe46653c6fa0bc943e11de99e9e4.zip Qt-42fa9ae8e755fe46653c6fa0bc943e11de99e9e4.tar.gz Qt-42fa9ae8e755fe46653c6fa0bc943e11de99e9e4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed autotest compilation issue on solaris
Fixed build issue on Solaris
Remove wrong NOTIFY attribute.
Ignore LayoutDirectionChange event in QTextControl
Fix an obvious bug in tst_QGL::clipTest()
moc: Error if the NOTIFY signal is invalid.
QDateEdit/QTimeEdit: remove duplicate properties.
Diffstat (limited to 'src/tools/moc/moc.h')
| -rw-r--r-- | src/tools/moc/moc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h index 9f349b5..5e47d9a 100644 --- a/src/tools/moc/moc.h +++ b/src/tools/moc/moc.h @@ -238,6 +238,7 @@ public: bool testFunctionAttribute(Token tok, FunctionDef *def); void checkSuperClasses(ClassDef *def); + void checkProperties(ClassDef* cdef); }; inline QByteArray noRef(const QByteArray &type) |