summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-05-25 16:13:44 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-25 19:00:30 +0200
commit8c37b00fbdc563ee06068390429f4527ab1407ed (patch)
tree1bbcf75b4444da774a4fcff37ef2c77fefdb7612
parent9985003ac4a42adfa35db286eda1b2ae9656d85b (diff)
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 <simon.hausmann@nokia.com>
-rw-r--r--.gitignore1
m---------qtwebkit0
-rw-r--r--qtwebkit.pri4
3 files changed, 1 insertions, 4 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
-Subproject 1b914638db989aaa98631a1c1e02c7b2d44805d
+Subproject a89b2ebb8e192c5e8cea21079bda2ee2c0c7ddd
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