summaryrefslogtreecommitdiffstats
path: root/tools/qml
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-05-05 23:34:51 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-05-05 23:34:51 (GMT)
commit8e023477777982d3aeb53d26ed61f7e8c1eb753c (patch)
treedf1aff03c37b1590e34e9780fedba2c4ca620e53 /tools/qml
parent2df493e9f0660be7d9b5ba691883e13fa12cde72 (diff)
downloadQt-8e023477777982d3aeb53d26ed61f7e8c1eb753c.zip
Qt-8e023477777982d3aeb53d26ed61f7e8c1eb753c.tar.gz
Qt-8e023477777982d3aeb53d26ed61f7e8c1eb753c.tar.bz2
Another initialization fix. Unleak.
Diffstat (limited to 'tools/qml')
-rw-r--r--tools/qml/main.cpp2
-rw-r--r--tools/qml/qmlruntime.cpp1
2 files changed, 2 insertions, 1 deletions
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;
}