1 |
diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri |
diff -Nru a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri |
2 |
index 4bc877bd..f8acd407 100644 |
--- a/src/qml/jsruntime/jsruntime.pri 2018-11-19 15:39:18.000000000 +0100 |
3 |
--- a/src/qml/jsruntime/jsruntime.pri |
+++ b/src/qml/jsruntime/jsruntime.pri 2018-12-12 16:27:14.172972825 +0100 |
4 |
+++ b/src/qml/jsruntime/jsruntime.pri |
@@ -156,6 +156,11 @@ |
|
@@ -115,6 +115,11 @@ SOURCES += \ |
|
5 |
$$PWD/qv4value.cpp \ |
$$PWD/qv4value.cpp \ |
6 |
$$PWD/qv4executableallocator.cpp |
$$PWD/qv4executableallocator.cpp |
7 |
|
|
13 |
valgrind { |
valgrind { |
14 |
DEFINES += V4_USE_VALGRIND |
DEFINES += V4_USE_VALGRIND |
15 |
} |
} |
16 |
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h |
diff -Nru a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h |
17 |
index 9b13d4e3..7cbd6e96 100644 |
--- a/src/qml/jsruntime/qv4global_p.h 2018-11-19 15:39:18.000000000 +0100 |
18 |
--- a/src/qml/jsruntime/qv4global_p.h |
+++ b/src/qml/jsruntime/qv4global_p.h 2018-12-12 16:28:11.706289922 +0100 |
19 |
+++ b/src/qml/jsruntime/qv4global_p.h |
@@ -88,7 +88,7 @@ |
|
@@ -88,7 +88,7 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } |
|
20 |
// |
// |
21 |
// NOTE: This should match the logic in qv4targetplatform_p.h! |
// NOTE: This should match the logic in qv4targetplatform_p.h! |
22 |
|
|
25 |
&& (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD)) |
&& (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD)) |
26 |
# define V4_ENABLE_JIT |
# define V4_ENABLE_JIT |
27 |
#elif defined(Q_PROCESSOR_X86_64) && (QT_POINTER_SIZE == 8) \ |
#elif defined(Q_PROCESSOR_X86_64) && (QT_POINTER_SIZE == 8) \ |
28 |
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp |
diff -Nru a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp |
29 |
index 038a75d5..b4ab9ced 100644 |
--- a/src/qml/qml/v8/qv8engine.cpp 2018-11-19 15:39:18.000000000 +0100 |
30 |
--- a/src/qml/qml/v8/qv8engine.cpp |
+++ b/src/qml/qml/v8/qv8engine.cpp 2018-12-12 16:30:31.763065226 +0100 |
31 |
+++ b/src/qml/qml/v8/qv8engine.cpp |
@@ -141,7 +141,7 @@ |
32 |
@@ -131,7 +131,7 @@ QV8Engine::QV8Engine(QJSEngine *qq, QV4::ExecutionEngine *v4) |
#ifndef Q_OS_WASM // wasm does not have working simd QTBUG-63924 |
|
{ |
|
33 |
#ifdef Q_PROCESSOR_X86_32 |
#ifdef Q_PROCESSOR_X86_32 |
34 |
if (!qCpuHasFeature(SSE2)) { |
if (!qCpuHasFeature(SSE2)) { |
35 |
- qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer"); |
- qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer"); |
36 |
+ 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!"); |
+ 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!"); |
37 |
} |
} |
38 |
#endif |
#endif |
39 |
|
#endif |