summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-06-25 03:22:08 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-06-25 03:22:08 (GMT)
commit5272bfe03522e671e832a8cbd9e5b2d4d71a18f2 (patch)
tree815d008b71de7ac5f381745f1d399ca4f0441626 /src/declarative/qml
parent2426502f372f1c1a33ccaba3549dc0eda2a754de (diff)
downloadQt-5272bfe03522e671e832a8cbd9e5b2d4d71a18f2.zip
Qt-5272bfe03522e671e832a8cbd9e5b2d4d71a18f2.tar.gz
Qt-5272bfe03522e671e832a8cbd9e5b2d4d71a18f2.tar.bz2
Fix assert
QTBUG-11600
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/qdeclarativetypenamescriptclass.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
index 2a3417a..764a8db 100644
--- a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
+++ b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
@@ -107,8 +107,7 @@ QDeclarativeTypeNameScriptClass::queryProperty(Object *obj, const Identifier &na
return 0;
}
- } else {
- Q_ASSERT(data->type);
+ } else if (data->type) {
QString strName = toString(name);
@@ -134,6 +133,7 @@ QDeclarativeTypeNameScriptClass::queryProperty(Object *obj, const Identifier &na
if (!object) return 0;
return ep->objectClass->queryProperty(object, name, flags, 0);
}
+
}
return 0;