summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-12-12 23:31:37 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-12-12 23:31:37 (GMT)
commit2249a44e57764e88ed2967aee7f845fdf4cf2358 (patch)
tree3f700b683b4366b38446270d6ffe5bb576746442 /tools
parent9e8234f7130ccbe6cb1893ab3d03de83e0891285 (diff)
downloadQt-2249a44e57764e88ed2967aee7f845fdf4cf2358.zip
Qt-2249a44e57764e88ed2967aee7f845fdf4cf2358.tar.gz
Qt-2249a44e57764e88ed2967aee7f845fdf4cf2358.tar.bz2
Build on Symbian
Reviewed-by: Michael Brasser
Diffstat (limited to 'tools')
-rw-r--r--tools/qml/main.cpp26
1 files 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)