From 8c37b00fbdc563ee06068390429f4527ab1407ed Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 25 May 2012 16:13:44 +0200 Subject: Updated WebKit to a newer snapshot that builds Also removed the --no-netscape-plugin part, because the WebKit build system now detects whether it supports plugins or not (on X11 it sort of does). Change-Id: I4aa4517d175de24efdf67593d9c6212ccb893086 Reviewed-by: Simon Hausmann --- .gitignore | 1 + qtwebkit | 2 +- qtwebkit.pri | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7bd3d3d6..9dfd6094 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ Makefile +Makefile.qtwebkit .qmake.cache diff --git a/qtwebkit b/qtwebkit index 1b914638..a89b2ebb 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 1b914638db989aaa98631a1c1e02c7b2d44805d8 +Subproject commit a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd diff --git a/qtwebkit.pri b/qtwebkit.pri index 515a5f7f..3d514290 100644 --- a/qtwebkit.pri +++ b/qtwebkit.pri @@ -41,10 +41,6 @@ else:qtwebkit_tools_dir = Tools QTWEBKIT_BUILD_CONFIG = contains(CONFIG, release):!contains(CONFIG, debug_and_release): {QTWEBKIT_BUILD_CONFIG = --release} -# npapi does not work for qpa, as of qtwebkit 81b8dac16049715b94dc36256bd9f433f7dfacc5 . -# This should be reverted once npapi either works, or gracefully disables itself, for qpa. -qpa:QTWEBKIT_BUILD_CONFIG += --no-netscape-plugin - # WebKit2 is not yet supported on Windows, so avoid trying to build it win32:QTWEBKIT_BUILD_CONFIG += --no-webkit2 -- cgit v1.2.3