diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:44:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:44:51 +0200 |
| commit | b78372c4ba31da2d941d70ba23a927deae7d830c (patch) | |
| tree | 25d9eeefbbb4c6ace084c56e58ac7bd1927217b5 /src/qml/compiler/qv4jsir.cpp | |
| parent | 9990c0f577f6a6a67ccebffb56ad1afc7a98ed1d (diff) | |
| parent | 7ea1f75fd877f312d70a90ab0405f3ca03914171 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I996a85744753598bb48c7e0d7954049202f4f037
Diffstat (limited to 'src/qml/compiler/qv4jsir.cpp')
| -rw-r--r-- | src/qml/compiler/qv4jsir.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/qml/compiler/qv4jsir.cpp b/src/qml/compiler/qv4jsir.cpp index 0ba71e03bf..5d30d6e3b9 100644 --- a/src/qml/compiler/qv4jsir.cpp +++ b/src/qml/compiler/qv4jsir.cpp @@ -42,7 +42,9 @@ #include "qv4jsir_p.h" #include <private/qqmljsast_p.h> +#ifndef V4_BOOTSTRAP #include <private/qqmlpropertycache_p.h> +#endif #include <QtCore/qtextstream.h> #include <QtCore/qdebug.h> #include <QtCore/qset.h> @@ -279,12 +281,14 @@ static QString dumpStart(const Expr *e) { return QString(); QString result = typeName(e->type); +#ifndef V4_BOOTSTRAP const Temp *temp = const_cast<Expr*>(e)->asTemp(); if (e->type == QObjectType && temp && temp->memberResolver.isQObjectResolver) { result += QLatin1Char('<'); result += QString::fromUtf8(static_cast<QQmlPropertyCache*>(temp->memberResolver.data)->className()); result += QLatin1Char('>'); } +#endif result += QLatin1Char('{'); return result; } @@ -557,8 +561,10 @@ void Member::dump(QTextStream &out) const else base->dump(out); out << '.' << *name; +#ifndef V4_BOOTSTRAP if (property) out << " (meta-property " << property->coreIndex << " <" << QMetaType::typeName(property->propType) << ">)"; +#endif } void Exp::dump(QTextStream &out, Mode) |