129 lines
9.2 KiB
Diff
129 lines
9.2 KiB
Diff
qtwebkit_configuration.patch
|
|
|
|
diff --git a/.gitmodules b/.gitmodules
|
|
index 008555c..0cea9ba 100644
|
|
--- a/.gitmodules
|
|
+++ b/.gitmodules
|
|
@@ -385,4 +385,8 @@
|
|
path = qtcoap
|
|
url = ../qtcoap.git
|
|
branch = 5.13.0
|
|
- status = preview
|
|
\ No newline at end of file
|
|
+ status = preview
|
|
+[submodule "qtwebkit"]
|
|
+ depends = qtbase
|
|
+ path = qtwebkit
|
|
+ project = WebKit.pro
|
|
diff --git a/qtwebkit/Tools/qmake/mkspecs/features/configure.prf b/qtwebkit/Tools/qmake/mkspecs/features/configure.prf
|
|
index 23d9904..6ea194f 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..91e2c07 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.
|
|
@@ -56,10 +56,10 @@ defineTest(detectFeatures) {
|
|
else: CONFIGURE_WARNINGS += "Qt not configured to use system libpng, QImageDecoder will decode PNG images"
|
|
|
|
linux-* {
|
|
- config_libXcomposite: WEBKIT_CONFIG += have_xcomposite
|
|
- config_libXrender: WEBKIT_CONFIG += have_xrender
|
|
+ #config_libXcomposite: WEBKIT_CONFIG += have_xcomposite
|
|
+ #config_libXrender: WEBKIT_CONFIG += have_xrender
|
|
|
|
- config_glx:!qtConfig(opengles2): WEBKIT_CONFIG += have_glx
|
|
+ #config_glx:!qtConfig(opengles2): WEBKIT_CONFIG += have_glx
|
|
|
|
# We need fontconfig to set up the test fonts for DumpRenderTree and WebKitTestRunner.
|
|
config_fontconfig: WEBKIT_CONFIG += have_fontconfig
|
|
@@ -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 \
|
|
diff --git a/qtwebkit/include/QtWebKit/headers.pri b/qtwebkit/include/QtWebKit/headers.pri
|
|
index 6775f3a..8b4aff7 100644
|
|
--- a/qtwebkit/include/QtWebKit/headers.pri
|
|
+++ b/qtwebkit/include/QtWebKit/headers.pri
|
|
@@ -1,5 +1,5 @@
|
|
-SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit
|
|
-SYNCQT.HEADER_CLASSES = ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFactory ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion
|
|
+SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h qtwebkitversion.h QtWebKit
|
|
+SYNCQT.GENERATED_HEADER_FILES = QWebDatabase QWebElement QWebElementCollection QWebHistoryItem QWebHistory QWebHistoryInterface QWebSelectData QWebSelectMethod QWebNotificationData QWebNotificationPresenter QWebHapticFeedbackPlayer QWebTouchModifier QWebFullScreenVideoHandler QWebSpellChecker QWebKitPlatformPlugin QWebPluginFactory QWebSecurityOrigin QWebSettings QtWebKitVersion
|
|
SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/Api/qhttpheader_p.h WebKit/qt/Api/qwebdatabase_p.h WebKit/qt/Api/qwebelement_p.h WebKit/qt/Api/qwebhistory_p.h WebKit/qt/Api/qwebplugindatabase_p.h WebKit/qt/Api/qwebscriptworld.h WebKit/qt/Api/qwebscriptworld_p.h WebKit/qt/Api/qwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h WebKit2/UIProcess/API/qt/qquickwebview_p.h WebKit2/UIProcess/API/qt/qquickwebview_p_p.h WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p_p.h WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h WebKit2/UIProcess/API/qt/qwebkittest_p.h WebKit2/UIProcess/API/qt/qwebloadrequest_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h WebKit2/UIProcess/API/qt/tests/testwindow.h WebKit2/UIProcess/API/qt/tests/util.h
|
|
SYNCQT.INJECTED_PRIVATE_HEADER_FILES =
|
|
SYNCQT.QPA_HEADER_FILES =
|
|
diff --git a/qtwebkit/include/QtWebKitWidgets/headers.pri b/qtwebkit/include/QtWebKitWidgets/headers.pri
|
|
index 9d386e2..8d11b79 100644
|
|
--- a/qtwebkit/include/QtWebKitWidgets/headers.pri
|
|
+++ b/qtwebkit/include/QtWebKitWidgets/headers.pri
|
|
@@ -1,5 +1,5 @@
|
|
-SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets
|
|
-SYNCQT.HEADER_CLASSES = ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion
|
|
+SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h qtwebkitwidgetsversion.h QtWebKitWidgets
|
|
+SYNCQT.GENERATED_HEADER_FILES = QGraphicsWebView QWebHitTestResult QWebFrame QWebInspector QWebPage QWebView QtWebKitWidgetsVersion
|
|
SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/WidgetApi/qwebframe_p.h WebKit/qt/WidgetApi/qwebinspector_p.h WebKit/qt/WidgetApi/qwebpage_p.h WebKit/qt/WidgetApi/qwebviewaccessible_p.h
|
|
SYNCQT.INJECTED_PRIVATE_HEADER_FILES =
|
|
SYNCQT.QPA_HEADER_FILES =
|