From ab90eefcc0714dfba032e7e4aa4c94cb8c6cc40c Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Wed, 2 Oct 2013 14:50:18 +0200 Subject: 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 Reviewed-by: Oswald Buddenhagen Reviewed-by: Paul Olav Tvete --- tools/configure/configureapp.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 914e7c9bfd..416fd4cb04 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -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"; -- cgit v1.2.3