lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-18 02:06:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated WebKit to a newer snapshot that builds

Browse Source 
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>
This commit is contained in:
Simon Hausmann
2012-05-25 16:13:44 +02:00
committed by Qt by Nokia
parent 9985003ac4
commit 8c37b00fbd
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
Makefile
Makefile.qtwebkit
.qmake.cache

2
qtwebkit

Submodule qtwebkit updated: 1b914638db...a89b2ebb8e

4
qtwebkit.pri
View File

@@ -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