aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Config.in.legacy18
-rw-r--r--package/qt/Config.in6
-rw-r--r--package/qt/qt.mk6
3 files changed, 18 insertions, 12 deletions
diff --git a/Config.in.legacy b/Config.in.legacy
index 588cd8bf72..d02f0a6386 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -101,6 +101,24 @@ endif
###############################################################################
comment "Legacy options removed in 2013.11"
+config BR2_PACKAGE_QT_JAVASCRIPTCORE
+ bool "qt javascriptcore option removed"
+ select BR2_LEGACY
+ help
+ The BR2_PACKAGE_QT_JAVASCRIPTCORE option was available to
+ force the activation or disabling of the JIT compiler in the
+ Qt Javascript interpreter. However, the JIT compiler is not
+ available for all architectures, so forcing its activation
+ does not always work. Moreover, Qt knows by itself for which
+ architectures JIT support is possible, and will
+ automatically enable it if possible.
+
+ Therefore, this option was in fact useless, and causing
+ build problems when enabled on architectures for which the
+ JIT support was not available. It has been removed, and
+ there is no replacement: Qt will enable JIT at compile time
+ when possible.
+
config BR2_PACKAGE_MODULE_INIT_TOOLS
bool "module-init-tools replaced by kmod"
select BR2_PACKAGE_KMOD
diff --git a/package/qt/Config.in b/package/qt/Config.in
index ea9e787de4..b1a2207f23 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -365,12 +365,6 @@ comment "WebKit needs shared library/gui/network support"
depends on !(BR2_PACKAGE_QT_SHARED && BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK)
depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
-config BR2_PACKAGE_QT_JAVASCRIPTCORE
- bool "JavaScriptCore JIT compiler"
- help
- Build the JavaScriptCore JIT compiler
- If unsure, say y
-
config BR2_PACKAGE_QT_STL
bool "STL support"
help
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 48d39fc501..82ce51dbd0 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -415,12 +415,6 @@ else
QT_CONFIGURE_OPTS += -no-scripttools
endif
-ifeq ($(BR2_PACKAGE_QT_JAVASCRIPTCORE),y)
-QT_CONFIGURE_OPTS += -javascript-jit
-else
-QT_CONFIGURE_OPTS += -no-javascript-jit
-endif
-
ifeq ($(BR2_PACKAGE_QT_STL),y)
QT_CONFIGURE_OPTS += -stl
else