diff options
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | package/qt/Config.in | 7 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2010.11, Not yet released: + + Fixes all over the tree. + + Updated/fixed packages: qt + 2010.11-rc2, Released November 25th, 2010: Fixes all over the tree. diff --git a/package/qt/Config.in b/package/qt/Config.in index 50c292991..af1db6ddf 100644 --- a/package/qt/Config.in +++ b/package/qt/Config.in @@ -335,12 +335,16 @@ config BR2_PACKAGE_QT_NETWORK config BR2_PACKAGE_QT_WEBKIT bool "WebKit Module" + depends on BR2_PACKAGE_QT_SHARED + depends on BR2_PACKAGE_QT_GUI_MODULE depends on BR2_PACKAGE_QT_NETWORK - select BR2_PACKAGE_QT_JAVASCRIPTCORE help Build the WebKit module. If unsure, say n. +comment "WebKit needs shared library/gui/network support" + depends on !(BR2_PACKAGE_QT_SHARED && BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK) + config BR2_PACKAGE_QT_JAVASCRIPTCORE bool "JavaScriptCore JIT compiler" help @@ -366,7 +370,6 @@ config BR2_PACKAGE_QT_OPENSSL config BR2_PACKAGE_QT_SCRIPT bool "Script Module" default y - select BR2_PACKAGE_QT_JAVASCRIPTCORE help Build the Qt Script module. if unsure, say y. |