aboutsummaryrefslogtreecommitdiffstats
path: root/qtwebkit.pri
Commit message (Collapse)AuthorAgeFilesLines
* Update WebKitSimon Hausmann2012-09-141-94/+0
| | | | | | | | | This updates WebKit to the latest snapshot that enables the build of WebKit2 on Windows and also drastically simplifies the build of WebKit within Qt to be built the same way as the other modules, i.e. using qmake && make Change-Id: I6e82e75ae0c3b62aff879f4339fcdce39e7f6954 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* Fix make install with WebKitv5.0.0-beta1Simon Hausmann2012-08-281-7/+1
| | | | | | | | | | | | | | Avoid running "make install" through build-webkit and therefore risk accidentally rebuilding the lot. We call build-webkit either with --release or without, but we never pass --debug. Therefore the build directory is always WebKitBuild/Release. This is a stop-gap for the Qt 5 beta. After the release we'll get rid of qtwebkit.pri altogether and WebKit will be built with just qmake and make. Change-Id: I21ff7ef8420b67cf466d5bca5efd7a1245bf4131 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Disable WebKit2 for the Qt 5 betaSimon Hausmann2012-08-271-1/+2
| | | | | | | Disable all of WebKit2 until https://bugs.webkit.org/show_bug.cgi?id=94914 is fixed. Change-Id: Iffc11efdba7c2c6ad4fe92437c28c77fd5d5a2bf Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 21:11:22 +0000