summaryrefslogtreecommitdiffstats
path: root/qtwebkit.pri
Commit message (Collapse)AuthorAgeFilesLines
* Update WebKitSimon Hausmann2012-06-191-0/+1
| | | | | | | | This removes the QtScript dependency and prepares for a future build flag to ensure -Werror remains disabled. Change-Id: I95cf773c1e21d08d3afe881458c352398e3c9e84 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Updated WebKit to a newer snapshot that buildsSimon Hausmann2012-05-251-4/+0
| | | | | | | | 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>
* WebKit2 is not yet supported on Windows, so avoid trying to build itMarius Storm-Olsen2012-03-091-0/+3
| | | | | Change-Id: If514bae79364def9fd3138c088e2cac98cac4a91 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* qtwebkit: work around compile failure in npapi when using qpaRohan McGovern2011-07-081-0/+4
| | | | | | | | | | | | 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 <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* qtwebkit: force separate_debug_info offRohan McGovern2011-07-011-0/+5
| | | | | This feature does not currently work with webkit's custom build script, so disable it.
* Long live the qt5 Qt repositoryQt by Nokia2011-04-271-0/+90