From 2a6ecd73faee2d6d9db2b5f8b895d52cd31b0e27 Mon Sep 17 00:00:00 2001
From: Julian de Bhal <julian.debhal@nokia.com>
Date: Mon, 25 May 2009 13:53:35 +1000
Subject: Update mkspecs for linux-g++-x11

Change QMAKE_INCDIR_OPENGL and QMAKE_LIBDIR_OPENGL to
QMAKE_INCDIR_OPENGL_QT and QMAKE_LIBDIR_OPENGL_QT so qmake will pick
them up.
---
 mkspecs/linux-g++-x11egl/qmake.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mkspecs/linux-g++-x11egl/qmake.conf b/mkspecs/linux-g++-x11egl/qmake.conf
index 3442d70..e9e5abc 100644
--- a/mkspecs/linux-g++-x11egl/qmake.conf
+++ b/mkspecs/linux-g++-x11egl/qmake.conf
@@ -13,7 +13,10 @@ include(../common/linux.conf)
 load(qt_config)
 
 QMAKE_INCDIR_OPENGL   = $(HOME)/opengles2/SDKPackage/Builds/OGLES2/Include
+QMAKE_INCDIR_OPENGL_QT   = $(HOME)/opengles2/SDKPackage/Builds/OGLES2/Include
+
 QMAKE_LIBDIR_OPENGL   = $(HOME)/opengles2/SDKPackage/Builds/OGLES2/LinuxPC/Lib
+QMAKE_LIBDIR_OPENGL_QT   = $(HOME)/opengles2/SDKPackage/Builds/OGLES2/LinuxPC/Lib
 
 QMAKE_LIBS_OPENGL     = -lGLESv2 -lEGL 
 QMAKE_LIBS += -Wl,-rpath=$(HOME)/opengles2/SDKPackage/Builds/OGLES2/LinuxPC/Lib
-- 
cgit v0.12


From 2024a49b576bd39e17f995b980c1f66c5cb08175 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Mon, 25 May 2009 15:43:44 +0200
Subject: Disable QmlDom debug output by default

Only print AST if QML_COMPILER_DUMP is set
---
 src/declarative/qml/qmldom.cpp | 14 ++++++++++----
 1 file 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();
     }
-- 
cgit v0.12