1 |
diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri |
2 |
index 4bc877bd..f8acd407 100644 |
3 |
--- a/src/qml/jsruntime/jsruntime.pri |
4 |
+++ b/src/qml/jsruntime/jsruntime.pri |
5 |
@@ -115,6 +115,11 @@ SOURCES += \ |
6 |
$$PWD/qv4value.cpp \ |
7 |
$$PWD/qv4executableallocator.cpp |
8 |
|
9 |
+linux-g++*:isEqual(QT_ARCH,i386):!no_sse2 { |
10 |
+ QMAKE_CFLAGS += -msse2 -mfpmath=sse |
11 |
+ QMAKE_CXXFLAGS += -msse2 -mfpmath=sse |
12 |
+} |
13 |
+ |
14 |
valgrind { |
15 |
DEFINES += V4_USE_VALGRIND |
16 |
} |
17 |
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h |
18 |
index 9b13d4e3..7cbd6e96 100644 |
19 |
--- a/src/qml/jsruntime/qv4global_p.h |
20 |
+++ b/src/qml/jsruntime/qv4global_p.h |
21 |
@@ -88,7 +88,7 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } |
22 |
// |
23 |
// NOTE: This should match the logic in qv4targetplatform_p.h! |
24 |
|
25 |
-#if defined(Q_PROCESSOR_X86) && (QT_POINTER_SIZE == 4) \ |
26 |
+#if defined(Q_PROCESSOR_X86) && (QT_POINTER_SIZE == 4) && defined(__SSE2__) \ |
27 |
&& (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD)) |
28 |
# define V4_ENABLE_JIT |
29 |
#elif defined(Q_PROCESSOR_X86_64) && (QT_POINTER_SIZE == 8) \ |
30 |
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp |
31 |
index 038a75d5..b4ab9ced 100644 |
32 |
--- a/src/qml/qml/v8/qv8engine.cpp |
33 |
+++ b/src/qml/qml/v8/qv8engine.cpp |
34 |
@@ -131,7 +131,7 @@ QV8Engine::QV8Engine(QJSEngine *qq, QV4::ExecutionEngine *v4) |
35 |
{ |
36 |
#ifdef Q_PROCESSOR_X86_32 |
37 |
if (!qCpuHasFeature(SSE2)) { |
38 |
- qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer"); |
39 |
+ qDebug("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer, processors missing the extension are NOT supported to run QML2 code!"); |
40 |
} |
41 |
#endif |
42 |
|