aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/configure.json
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2019-05-07 15:12:14 +0200
committerUlf Hermann <ulf.hermann@qt.io>2019-05-07 14:07:42 +0000
commit6376014ab61c45d6570ec226fc4eee6906dd32f9 (patch)
tree840084735d497c9fbc3b1fd942b90601b0015cb7 /src/qml/configure.json
parentcf4a7fa44403bb3bae9c98afb80222d5e03798c5 (diff)
Move the check for SSE2 into the configure system
The JIT requires SSE2. Without it we can still use the interpreter. If you compile with SSE2 enabled and then run on a machine without SSE2 you will get a more interesting crash now. However, in this day and age we don't have to expect random pre-Pentium4 CPUs out in the wild anymore. If you want to use such a thing, you will probably build a special version of Qt for it. Change-Id: I14a71cb83876d2ce7fdad012c385d0d4389e7ddf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/configure.json')
-rw-r--r--src/qml/configure.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/configure.json b/src/qml/configure.json
index 2f88aef1fb..9313e4594b 100644
--- a/src/qml/configure.json
+++ b/src/qml/configure.json
@@ -90,8 +90,8 @@
"purpose": "Provides a JIT for QML and JavaScript",
"section": "QML",
"condition": [
- " (arch.i386 && tests.pointer_32bit)
- || (arch.x86_64 && tests.pointer_64bit)
+ " (arch.i386 && tests.pointer_32bit && features.sse2)
+ || (arch.x86_64 && tests.pointer_64bit && features.sse2)
|| (arch.arm && tests.pointer_32bit && tests.arm_fp && tests.arm_thumb
&& (config.linux || config.ios || config.tvos || config.qnx))
|| (arch.arm64 && tests.pointer_64bit && tests.arm_fp