diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-12-03 10:23:41 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-12-03 10:23:41 (GMT) |
| commit | f57eaeb3c46a375113e5d5ebaf0c2cb289795606 (patch) | |
| tree | 70dc33f63d7b1ea3adb9eeecf67b8d05fdd66270 /src/tools/moc/generator.cpp | |
| parent | 4a58e7f64e5922e7815a98244c4b8dda1689ff26 (diff) | |
| parent | 831e286f811c0e0238f3dd061ae41782f8637a16 (diff) | |
| download | Qt-f57eaeb3c46a375113e5d5ebaf0c2cb289795606.zip Qt-f57eaeb3c46a375113e5d5ebaf0c2cb289795606.tar.gz Qt-f57eaeb3c46a375113e5d5ebaf0c2cb289795606.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-staging1
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoawindow_mac.mm
Diffstat (limited to 'src/tools/moc/generator.cpp')
| -rw-r--r-- | src/tools/moc/generator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 1ed6586..8fcc0df 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -292,7 +292,8 @@ void Generator::generateCode() QList<QByteArray> extraList; for (int i = 0; i < cdef->propertyList.count(); ++i) { const PropertyDef &p = cdef->propertyList.at(i); - if (!isVariantType(p.type) && !metaTypes.contains(p.type)) { + if (!isVariantType(p.type) && !metaTypes.contains(p.type) && !p.type.contains('*') && + !p.type.contains('<') && !p.type.contains('>')) { int s = p.type.lastIndexOf("::"); if (s > 0) { QByteArray scope = p.type.left(s); |