Commit Graph

8 Commits

Author SHA1 Message Date
Simon Hausmann
877cec0228 Fix make install with WebKit
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>
2012-08-28 13:02:06 +02:00
Simon Hausmann
f00429b71a Disable WebKit2 for the Qt 5 beta
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>
2012-08-27 12:13:42 +02:00
Simon Hausmann
222a346249 Update WebKit
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>
2012-06-19 10:19:06 +02:00
Simon Hausmann
8c37b00fbd 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>
2012-05-25 19:00:30 +02:00
Marius Storm-Olsen
8703d56ab2 WebKit2 is not yet supported on Windows, so avoid trying to build it
Change-Id: If514bae79364def9fd3138c088e2cac98cac4a91
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
2012-03-09 12:31:24 +01:00
Rohan McGovern
1ef87b6c07 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 <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-08 09:24:12 +02:00
Rohan McGovern
b397b26b58 qtwebkit: force separate_debug_info off
This feature does not currently work with webkit's custom build script,
so disable it.
2011-07-01 15:21:02 +10:00
Qt by Nokia
92351a70e0 Long live the qt5 Qt repository 2011-04-27 12:34:00 +02:00