diff options
| -rw-r--r-- | tools/qml/loggerwidget.h | 4 | ||||
| -rw-r--r-- | tools/qml/main.cpp | 2 | ||||
| -rw-r--r-- | tools/qml/qmlruntime.cpp | 1 |
3 files changed, 4 insertions, 3 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 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; } |