summaryrefslogtreecommitdiffstats
path: root/src/tools/moc
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-11-12 00:45:53 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-11-12 00:45:53 (GMT)
commit517a48de8ec497f7e8367d64a28bf4c19e8a4744 (patch)
tree6d527cb9e6f4611ff72e74d416677a36f225d44d /src/tools/moc
parent49cc2d35d7da4a78d696503930720e88a6403722 (diff)
downloadQt-517a48de8ec497f7e8367d64a28bf4c19e8a4744.zip
Qt-517a48de8ec497f7e8367d64a28bf4c19e8a4744.tar.gz
Qt-517a48de8ec497f7e8367d64a28bf4c19e8a4744.tar.bz2
QML C++ class-in-namespace test
Diffstat (limited to 'src/tools/moc')
-rw-r--r--src/tools/moc/generator.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 1ed6586..b67b4cf 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);