From 2249a44e57764e88ed2967aee7f845fdf4cf2358 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Mon, 13 Dec 2010 09:31:37 +1000
Subject: Build on Symbian

Reviewed-by: Michael Brasser
---
 tools/qml/main.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 104f7b7..b9513b9 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -59,6 +59,19 @@ QtMsgHandler systemMsgOutput = 0;
 static QDeclarativeViewer *openFile(const QString &fileName);
 static void showViewer(QDeclarativeViewer *viewer);
 
+QString warnings;
+void exitApp(int i)
+{
+#ifdef Q_OS_WIN
+    // Debugging output is not visible by default on Windows -
+    // therefore show modal dialog with errors instead.
+    if (!warnings.isEmpty()) {
+        QMessageBox::warning(0, QApplication::tr("Qt QML Viewer"), warnings);
+    }
+#endif
+    exit(i);
+}
+
 #if defined (Q_OS_SYMBIAN)
 #include <unistd.h>
 #include <sys/types.h>
@@ -85,19 +98,6 @@ void myMessageOutput(QtMsgType type, const char *msg)
 
 QWeakPointer<LoggerWidget> logger;
 
-QString warnings;
-void exitApp(int i)
-{
-#ifdef Q_OS_WIN
-    // Debugging output is not visible by default on Windows -
-    // therefore show modal dialog with errors instead.
-    if (!warnings.isEmpty()) {
-        QMessageBox::warning(0, QApplication::tr("Qt QML Viewer"), warnings);
-    }
-#endif
-    exit(i);
-}
-
 static QAtomicInt recursiveLock(0);
 
 void myMessageOutput(QtMsgType type, const char *msg)
-- 
cgit v0.12