From 2de60ba30f86a9dd338359f7269b62ca5d0a2c46 Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Thu, 30 Dec 2010 17:16:16 +1000
Subject: Forward qmlviewer traces to system's default message handler on
 Symbian

Task-number: QTBUG-16353
Reviewed-by: Christopher Ham
---
 tools/qml/main.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index b9513b9..2df96c0 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -88,6 +88,9 @@ void myMessageOutput(QtMsgType type, const char *msg)
     ::write(fd, "\n", 1);
     ::fsync(fd);
 
+    if (systemMsgOutput)
+        systemMsgOutput(type, msg);
+
     switch (type) {
     case QtFatalMsg:
         abort();
@@ -529,11 +532,7 @@ QDeclarativeViewer *openFile(const QString &fileName)
 
 int main(int argc, char ** argv)
 {
-#if defined (Q_OS_SYMBIAN)
-    qInstallMsgHandler(myMessageOutput);
-#else
     systemMsgOutput = qInstallMsgHandler(myMessageOutput);
-#endif
 
 #if defined (Q_WS_X11) || defined (Q_WS_MAC)
     //### default to using raster graphics backend for now
-- 
cgit v0.12