diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-17 01:01:11 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-17 01:01:11 (GMT) |
| commit | 3abcfa0872138edb00c0c82dd77bbf175462f5b4 (patch) | |
| tree | bcfc21736db5e6520c1db9d67609b87559ce8c82 | |
| parent | e40da5484563f7de6b06180408205b597dfb485f (diff) | |
| parent | 0e90936645f313153d15813c4e11620b93c797a6 (diff) | |
| download | Qt-3abcfa0872138edb00c0c82dd77bbf175462f5b4.zip Qt-3abcfa0872138edb00c0c82dd77bbf175462f5b4.tar.gz Qt-3abcfa0872138edb00c0c82dd77bbf175462f5b4.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlcompiler.cpp
| -rw-r--r-- | src/declarative/qml/qmlcompiler.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index 91ace10..220c464 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -941,7 +941,6 @@ bool QmlCompiler::buildComponent(QmlParser::Object *obj, COMPILE_EXCEPTION(obj, "id is not unique"); obj->id = idVal; - addId(idVal, obj); } @@ -1343,10 +1342,9 @@ bool QmlCompiler::buildIdProperty(QmlParser::Property *prop, if (compileState.ids.contains(val)) COMPILE_EXCEPTION(prop, "id is not unique"); - obj->id = val; - prop->values.at(0)->type = Value::Id; + obj->id = val; addId(val, obj); return true; |