From 1ef87b6c073d76d33ced29dda9383eac9d85d9d3 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 8 Jul 2011 12:52:07 +1000 Subject: qtwebkit: work around compile failure in npapi when using qpa The current version of qtwebkit used in qt5 does not work with Qt/QPA. The problem is in the netscape plugin API's usage of QX11EmbedContainer. Disable the netscape plugin API until qtwebkit in qt5 can be updated to a fixed version. Change-Id: I833bfff2f1b1059810206b4160494eb59734b5ea Reviewed-on: http://codereview.qt.nokia.com/1337 Reviewed-by: Qt Sanity Bot Reviewed-by: Simon Hausmann --- qtwebkit.pri | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qtwebkit.pri b/qtwebkit.pri index 05665e0c..40ddf5bb 100644 --- a/qtwebkit.pri +++ b/qtwebkit.pri @@ -41,6 +41,10 @@ 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 + # The '+' is to make parallel "make" work across the script boundary. module_qtwebkit.commands = $${OPTI}$${SBC}cd qtwebkit && \ $$env_export \"WEBKITOUTPUTDIR=$$OUT_PWD/qtwebkit/WebKitBuild\" && $$GNUTOOLS \ -- cgit v1.2.3