summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-08-31 04:59:26 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-08-31 04:59:26 (GMT)
commit0a3d5098320a72853bad643f01b08774af131cb4 (patch)
tree47a2db1e5c7433cd29c0418169a39aea50822776 /src/declarative/qml
parenta0b413c14b94c1ac3f394f22076fd12c370d07f3 (diff)
downloadQt-0a3d5098320a72853bad643f01b08774af131cb4.zip
Qt-0a3d5098320a72853bad643f01b08774af131cb4.tar.gz
Qt-0a3d5098320a72853bad643f01b08774af131cb4.tar.bz2
Don't double call classBegin()
QTBUG-13114
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/qdeclarativecompiler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index a6b0b34..5bfe5b2 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -974,7 +974,7 @@ void QDeclarativeCompiler::genObject(QDeclarativeParser::Object *obj)
}
// Begin the class
- if (obj->parserStatusCast != -1) {
+ if (tr.type && obj->parserStatusCast != -1) {
QDeclarativeInstruction begin;
begin.type = QDeclarativeInstruction::BeginObject;
begin.begin.castValue = obj->parserStatusCast;