qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove the option to force no JIT in javascript core 

Change-Id: I81a9968b360cf889f92e690cdf4028692b904a0c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Jorgen Lind 2014-02-25 14:46:56 +01:00 committed by The Qt Project
parent aab29d546c
commit 24f1025663
2 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
configure vendored
View File

@ -627,7 +627,6 @@ CFG_COMPILE_EXAMPLES=yes
CFG_RELEASE_QMAKE=no
CFG_AUDIO_BACKEND=auto
CFG_QML_DEBUG=yes
CFG_JAVASCRIPTCORE_JIT=auto
CFG_PKGCONFIG=auto
CFG_STACK_PROTECTOR_STRONG=auto
CFG_SLOG2=auto
@ -1897,13 +1896,6 @@ while [ "$#" -gt 0 ]; do
fi
fi
;;
javascript-jit)
if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ] || [ "$VAL" = "no" ]; then
CFG_JAVASCRIPTCORE_JIT="$VAL"
else
UNKNOWN_OPT=yes
fi
;;
confirm-license)
if [ "$VAL" = "yes" ]; then
OPT_CONFIRM_LICENSE="$VAL"
@ -5737,27 +5729,6 @@ if [ "$CFG_ALSA" = "auto" ]; then
fi
fi
if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then
if [ "$CFG_ARCH" = "arm" ]; then
compileTest unix/javascriptcore-jit "javascriptcore-jit"
if [ $? != "0" ]; then
CFG_JAVASCRIPTCORE_JIT=no
fi
else
case "$XPLATFORM" in
linux-icc*)
CFG_JAVASCRIPTCORE_JIT=no
;;
esac
fi
fi
if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ]; then
QMakeVar set JAVASCRIPTCORE_JIT yes
elif [ "$CFG_JAVASCRIPTCORE_JIT" = "no" ]; then
QMakeVar set JAVASCRIPTCORE_JIT no
fi
if [ "$CFG_AUDIO_BACKEND" = "auto" ]; then
CFG_AUDIO_BACKEND=yes
fi
@ -6787,7 +6758,6 @@ report_support " Qt Concurrent .........." "$CFG_CONCURRENT"
report_support " Qt GUI ................." "$CFG_GUI"
report_support " Qt Widgets ............." "$CFG_WIDGETS"
report_support " Large File ............." "$CFG_LARGEFILE"
report_support " JavaScriptCore JIT ....." "$CFG_JAVASCRIPTCORE_JIT" auto "To be decided by JavaScriptCore"
report_support " QML debugging .........." "$CFG_QML_DEBUG"
report_support " Use system proxies ....." "$CFG_SYSTEM_PROXIES"

7
tools/configure/configureapp.cpp
View File

@ -1691,7 +1691,6 @@ void Configure::applySpecSpecifics()
dictionary[ "REDUCE_RELOCATIONS" ] = "yes";
dictionary[ "QT_GETIFADDRS" ] = "no";
dictionary[ "QT_XKBCOMMON" ] = "no";
dictionary[ "JAVASCRIPTCORE_JIT" ] = "no";
}
}
@ -2744,12 +2743,6 @@ void Configure::generateOutputVars()
if (!dictionary["QT_LFLAGS_SQLITE"].isEmpty())
qmakeVars += "QT_LFLAGS_SQLITE += " + 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";