From 2df493e9f0660be7d9b5ba691883e13fa12cde72 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Thu, 6 May 2010 09:18:36 +1000
Subject: Fix compile in namespace.

---
 tools/qml/loggerwidget.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qml/loggerwidget.h b/tools/qml/loggerwidget.h
index b68ecc5..fd20c41 100644
--- a/tools/qml/loggerwidget.h
+++ b/tools/qml/loggerwidget.h
@@ -86,8 +86,8 @@ private:
     Visibility m_visibility;
 };
 
-Q_DECLARE_METATYPE(LoggerWidget::Visibility);
-
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(LoggerWidget::Visibility)
+
 #endif // LOGGERWIDGET_H
-- 
cgit v0.12


From 8e023477777982d3aeb53d26ed61f7e8c1eb753c Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Thu, 6 May 2010 09:34:51 +1000
Subject: Another initialization fix. Unleak.

---
 tools/qml/main.cpp       | 2 +-
 tools/qml/qmlruntime.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 78f0c87..fb687ac 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -54,7 +54,7 @@
 
 QT_USE_NAMESPACE
 
-QtMsgHandler systemMsgOutput;
+QtMsgHandler systemMsgOutput = 0;
 
 #if defined (Q_OS_SYMBIAN)
 #include <unistd.h>
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index fe0f67c..d49b0f1 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -543,6 +543,7 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
 
 QDeclarativeViewer::~QDeclarativeViewer()
 {
+    delete loggerWindow;
     canvas->engine()->setNetworkAccessManagerFactory(0);
     delete namFactory;
 }
-- 
cgit v0.12