whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable JavaScriptCore JIT for Android when building on Windows 

On Linux, we will do a configure test to determine whether JIT should
be turned off when compiling JavaScriptCore in the QtScript module,
but this test is never run on Windows. The result was that JIT was
disabled on Linux and enabled on Windows, and compilation broke on
Windows.

Task-number: QTBUG-33780
Change-Id: I37991c6da98b35330c07c54f2a0b143d20780c91
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
bb10
Eskil Abrahamsen Blomfeldt 2013-10-02 14:50:18 +02:00 committed by The Qt Project
parent 72d60ea08c
commit ab90eefcc0
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/configure/configureapp.cpp
View File

@ -1663,6 +1663,7 @@ void Configure::applySpecSpecifics()
dictionary[ "REDUCE_RELOCATIONS" ] = "yes";
dictionary[ "QT_GETIFADDRS" ] = "no";
dictionary[ "QT_XKBCOMMON" ] = "no";
dictionary[ "JAVASCRIPTCORE_JIT" ] = "no";
}
}
@ -2648,6 +2649,12 @@ void Configure::generateOutputVars()
if (!dictionary["QT_LFLAGS_SQLITE"].isEmpty())
qmakeVars += "QT_LFLAGS_SQLITE += " + formatPath(dictionary["QT_LFLAGS_SQLITE"]);
if (dictionary["JAVASCRIPTCORE_JIT"] == "no")
qmakeVars += "JAVASCRIPTCORE_JIT = no";
else if (dictionary["JAVASCRIPTCORE_JIT"] == "yes")
qmakeVars += "JAVASCRIPTCORE_JIT = yes";
// else let JavaScriptCore decide
if (dictionary[ "OPENGL" ] == "yes")
qtConfig += "opengl";