summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-05-25 22:58:20 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-05-25 22:58:20 (GMT)
commit9797617e80469c79da096d6013e233d7d75de87a (patch)
treeae86463ea31f2f922a92978ef40db64e02433995 /src
parent301fb6805644f1af28687794f7d888c04a1da12f (diff)
parent2024a49b576bd39e17f995b980c1f66c5cb08175 (diff)
downloadQt-9797617e80469c79da096d6013e233d7d75de87a.zip
Qt-9797617e80469c79da096d6013e233d7d75de87a.tar.gz
Qt-9797617e80469c79da096d6013e233d7d75de87a.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
-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();
}