summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSérgio Martins <sergio.martins@kdab.com>2013-09-25 17:11:34 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-25 22:56:10 +0200
commit6752b6fef66f24e326a2a58138de73d24809bc4a (patch)
tree184d03737b01437174f8c07501c3f93b5822d5a5
parent36ab6e0160f3dfe1ac9d792e2bce8cc97e8b7489 (diff)
Fix WinCE build.v5.2.0-alpha1
Change-Id: Ie0536ad94f88efe1e54226ed7f1d9e1042ffcc19 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
-rw-r--r--src/qml/jsruntime/jsruntime.pri2
-rw-r--r--tools/qml/main.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri
index c504f750e9..1739765009 100644
--- a/src/qml/jsruntime/jsruntime.pri
+++ b/src/qml/jsruntime/jsruntime.pri
@@ -140,7 +140,7 @@ valgrind {
ios: DEFINES += ENABLE_ASSEMBLER_WX_EXCLUSIVE=1
-win32 {
+win32:!wince* {
LIBS_PRIVATE += -lDbgHelp
}
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index a1b3a6b856..804e907cc0 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -189,7 +189,7 @@ void quietMessageHandler(QtMsgType type, const QMessageLogContext &ctxt, const Q
//Doesn't print anything
switch (type) {
case QtFatalMsg:
- abort();
+ exit(-1);
case QtCriticalMsg:
case QtDebugMsg:
case QtWarningMsg: