summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJoona Petrell <joona.t.petrell@nokia.com>2010-12-30 07:16:16 (GMT)
committerJoona Petrell <joona.t.petrell@nokia.com>2010-12-30 07:18:15 (GMT)
commit2de60ba30f86a9dd338359f7269b62ca5d0a2c46 (patch)
treea9aa6940e65eb7780899b5435887a72f16d313c1 /tools
parent042e797a21a88ccafbaf54bbcfbf1e8d75b33740 (diff)
downloadQt-2de60ba30f86a9dd338359f7269b62ca5d0a2c46.zip
Qt-2de60ba30f86a9dd338359f7269b62ca5d0a2c46.tar.gz
Qt-2de60ba30f86a9dd338359f7269b62ca5d0a2c46.tar.bz2
Forward qmlviewer traces to system's default message handler on Symbian
Task-number: QTBUG-16353 Reviewed-by: Christopher Ham
Diffstat (limited to 'tools')
-rw-r--r--tools/qml/main.cpp7
1 files 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