summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-07-17 00:51:37 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-07-17 00:51:37 (GMT)
commite40da5484563f7de6b06180408205b597dfb485f (patch)
treea367b436e264ff91fdf622e975a6b27f88c20b6b
parentb1690ae329a3b81628d3ac6c19b24960177b6e73 (diff)
downloadQt-e40da5484563f7de6b06180408205b597dfb485f.zip
Qt-e40da5484563f7de6b06180408205b597dfb485f.tar.gz
Qt-e40da5484563f7de6b06180408205b597dfb485f.tar.bz2
Must set id before call, since addId ASSERTs.
-rw-r--r--src/declarative/qml/qmlcompiler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index b0bc6e8..91ace10 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -940,9 +940,9 @@ bool QmlCompiler::buildComponent(QmlParser::Object *obj,
if (compileState.ids.contains(idVal))
COMPILE_EXCEPTION(obj, "id is not unique");
- addId(idVal, obj);
-
obj->id = idVal;
+
+ addId(idVal, obj);
}
// Check the Component tree is well formed