diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:49:37 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:49:37 +0200 |
| commit | 8b88e37bf79a53eb0cb34226aacb25ad9b01d7cf (patch) | |
| tree | 6087ee08b55f69f9c4981d9026d3162f2ee50c31 /src/qml/compiler | |
| parent | 61edb86ed4cc0ac31d77d3793936fa1e8476b504 (diff) | |
| parent | 7ceca6ac0535a957e9f87f789119c288f6d93837 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: Id95f7b01de36bccecbb7b73acc041654a1fe2ebe
Diffstat (limited to 'src/qml/compiler')
| -rw-r--r-- | src/qml/compiler/qqmltypecompiler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp index e2636a57c3..b8ada7ceaf 100644 --- a/src/qml/compiler/qqmltypecompiler.cpp +++ b/src/qml/compiler/qqmltypecompiler.cpp @@ -277,12 +277,12 @@ bool QQmlTypeCompiler::compile() if (qmlType->parserStatusCast() != -1) ++parserStatusCount; } + ++objectCount; if (typeRef->component) { bindingCount += typeRef->component->totalBindingsCount; parserStatusCount += typeRef->component->totalParserStatusCount; objectCount += typeRef->component->totalObjectCount; - } else - ++objectCount; + } } } |