summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-05-26 00:03:37 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-05-26 00:03:37 (GMT)
commit334e406ff6441d3980741683714087c59c7dd123 (patch)
treee637baf0092e6db272b6b1fd32175994e5018dd8 /src/declarative
parentabb9a3b5031e86bdd89a9338c4f12d703e6f385b (diff)
parent93f0f38085e8fe2657ef3d7c5e24576d4475e85d (diff)
downloadQt-334e406ff6441d3980741683714087c59c7dd123.zip
Qt-334e406ff6441d3980741683714087c59c7dd123.tar.gz
Qt-334e406ff6441d3980741683714087c59c7dd123.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/qml/qmldom.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
index 9871fcb..b689ec5 100644
--- a/src/declarative/qml/qmldom.cpp
+++ b/src/declarative/qml/qmldom.cpp
@@ -44,13 +44,15 @@
#include "private/qmlcompiler_p.h"
#include "private/qmlengine_p.h"
#include "qmlcompiledcomponent_p.h"
-#include <QtCore/qbytearray.h>
-#include <QtCore/qstring.h>
-
+#include <QtCore/QByteArray>
+#include <QtCore/QDebug>
+#include <QtCore/QString>
#include "qmlscriptparser_p.h"
QT_BEGIN_NAMESPACE
+DEFINE_BOOL_CONFIG_OPTION(compilerDump, QML_COMPILER_DUMP)
+
QmlDomDocumentPrivate::QmlDomDocumentPrivate()
: root(0)
{
@@ -193,7 +195,11 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data, const QUrl
}
if (td->data.tree()) {
- td->data.tree()->dump();
+ if (compilerDump()) {
+ qWarning() << "-AST------------------------------------------------------------------------------";
+ td->data.tree()->dump();
+ qWarning() << "----------------------------------------------------------------------------------";
+ }
d->root = td->data.tree();
d->root->addref();
}