Enable ARM unwind support on QNX/ARM as well.

The QNX/gcc behaves the same as Linux when it comes to ARM unwinding
tables. Use the same support as on ARM. It may not work flawlessly yet,
but at least it fixes one of the QNX compilation issues.

Change-Id: I1592a18d62fd8d8738c5254a75c73e3608b3d38b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/qml/qml/v4/qv4unwindhelper.cpp b/src/qml/qml/v4/qv4unwindhelper.cpp
index 82631e3..af7f352 100644 (file)
--- a/src/qml/qml/v4/qv4unwindhelper.cpp
+++ b/src/qml/qml/v4/qv4unwindhelper.cpp
@@ -47,7 +47,7 @@
 #  define USE_DW2_HELPER
 #elif CPU(X86) && OS(LINUX)
 #  define USE_DW2_HELPER
-#elif CPU(ARM) && OS(LINUX)
+#elif CPU(ARM) && (OS(LINUX) || OS(QNX))
 # define USE_ARM_HELPER
 #elif OS(WINDOWS)
     // SJLJ will unwind on Windows