qtwebkit_configuration.patch

From: Christian Prochaska <christian.prochaska@genode-labs.com>


---
 .../Tools/qmake/mkspecs/features/configure.prf     |    1 -
 qtwebkit/Tools/qmake/mkspecs/features/features.prf |   22 ++++++++++----------
 qtwebkit/Tools/qmake/mkspecs/features/features.pri |    2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/qtwebkit/Tools/qmake/mkspecs/features/configure.prf b/qtwebkit/Tools/qmake/mkspecs/features/configure.prf
index 9eeac75..8e8259c 100644
--- a/qtwebkit/Tools/qmake/mkspecs/features/configure.prf
+++ b/qtwebkit/Tools/qmake/mkspecs/features/configure.prf
@@ -49,7 +49,6 @@ defineTest(runConfigure) {
 
     WEBKIT_CONFIG += \
         build_webkit1 \
-        build_webkit2 \
         build_tests \
         $$WEBKIT_TOOLS_CONFIG
 
diff --git a/qtwebkit/Tools/qmake/mkspecs/features/features.prf b/qtwebkit/Tools/qmake/mkspecs/features/features.prf
index 328a8be..096d8ef 100644
--- a/qtwebkit/Tools/qmake/mkspecs/features/features.prf
+++ b/qtwebkit/Tools/qmake/mkspecs/features/features.prf
@@ -37,14 +37,14 @@ defineTest(detectFeatures) {
     qtHaveModule(printsupport): WEBKIT_CONFIG += have_qtprintsupport
     qtHaveModule(widgets): WEBKIT_CONFIG += have_qstyle
     qtHaveModule(testlib): WEBKIT_CONFIG += have_qttestlib
-    qtHaveModule(positioning): WEBKIT_CONFIG += have_qtpositioning
-    qtHaveModule(sensors): WEBKIT_CONFIG += have_qtsensors
+    #qtHaveModule(positioning): WEBKIT_CONFIG += have_qtpositioning
+    #qtHaveModule(sensors): WEBKIT_CONFIG += have_qtsensors
 
-    config_libxml2: WEBKIT_CONFIG += use_libxml2
-    config_libxslt: WEBKIT_CONFIG += xslt
-    config_libzlib: WEBKIT_CONFIG += use_zlib
-    config_libwebp: WEBKIT_CONFIG += use_webp
-    config_leveldb: WEBKIT_CONFIG += use_system_leveldb
+    #config_libxml2: WEBKIT_CONFIG += use_libxml2
+    #config_libxslt: WEBKIT_CONFIG += xslt
+    #config_libzlib: WEBKIT_CONFIG += use_zlib
+    #config_libwebp: WEBKIT_CONFIG += use_webp
+    #config_leveldb: WEBKIT_CONFIG += use_system_leveldb
 
     # We can't use Qt's 3rdparty sources for libjpeg and libpng outside of qtbase, but if Qt
     # is using the system libraries, use them to take advantage of the WebCore image decoders as well.
@@ -109,9 +109,9 @@ defineTest(detectFeatures) {
         use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
     }
 
-    !enable?(video):qtHaveModule(multimediawidgets) {
-        WEBKIT_CONFIG += video use_qt_multimedia
-    }
+    #!enable?(video):qtHaveModule(multimediawidgets) {
+    #    WEBKIT_CONFIG += video use_qt_multimedia
+    #}
 
     !enable?(video) {
         CONFIGURE_WARNINGS += "Missing GStreamer or QtMultimedia, disabling HTML5 media element support"
@@ -126,7 +126,7 @@ defineTest(detectFeatures) {
     }
 
     # Gamepad API Support (depends on udev and linux/joystick.h)
-    linux:!android: WEBKIT_CONFIG += gamepad
+    #linux:!android: WEBKIT_CONFIG += gamepad
 
     # Support for Graphics Surface
     # GraphicsSurface requires GraphicsContext3D and hence use_3d_graphics
diff --git a/qtwebkit/Tools/qmake/mkspecs/features/features.pri b/qtwebkit/Tools/qmake/mkspecs/features/features.pri
index ba18b35..dd27a42 100644
--- a/qtwebkit/Tools/qmake/mkspecs/features/features.pri
+++ b/qtwebkit/Tools/qmake/mkspecs/features/features.pri
@@ -59,7 +59,7 @@ FEATURE_DEFAULTS = \
     ENABLE_HIGH_DPI_CANVAS=0 \
     ENABLE_ICONDATABASE=1 \
     ENABLE_IFRAME_SEAMLESS=1 \
-    ENABLE_INDEXED_DATABASE=1 \
+    ENABLE_INDEXED_DATABASE=0 \
     ENABLE_INPUT_SPEECH=0 \
     ENABLE_INPUT_TYPE_COLOR=1 \
     ENABLE_INPUT_TYPE_DATE=0 \
