From e40da5484563f7de6b06180408205b597dfb485f Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 17 Jul 2009 10:51:37 +1000
Subject: Must set id before call, since addId ASSERTs.

---
 src/declarative/qml/qmlcompiler.cpp | 4 ++--
 1 file 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
-- 
cgit v0.12