diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 16:12:40 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 16:12:41 +0100 |
| commit | 24e2b39e7a06687322a18a158a083eb51a7c0dca (patch) | |
| tree | 1a32caf6dd6db74fbac9553a094bb00b216fa678 /src/qml/qml/qqmlcompiler.cpp | |
| parent | 39540124dd0900e0c99dcda8c0ebdf4f3cea8d5e (diff) | |
| parent | daff5f2988cef31442629a48c3b3088abf01837a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: If9a205bea219b9aca95d78b1e556ca9bbff58dd0
Diffstat (limited to 'src/qml/qml/qqmlcompiler.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcompiler.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcompiler.cpp b/src/qml/qml/qqmlcompiler.cpp index f07d4bb703..6717c97d88 100644 --- a/src/qml/qml/qqmlcompiler.cpp +++ b/src/qml/qml/qqmlcompiler.cpp @@ -3711,7 +3711,10 @@ bool QQmlCompiler::completeComponentBuild() JSCodeGen::IdMapping m; m.name = o->id; m.idIndex = o->idIndex; - m.type = o->metatype; + if (output->types[o->type].isFullyDynamicType) + m.type = 0; + else + m.type = o->metatype; idMapping << m; } } |