summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/qt/QtWebContext.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Integrate QWebChannel with QtWebKit.Milian Wolff2014-08-161-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | WebView.experimental gets a new webChannel property. By default, this is initialized to a QQmlWebChannel internal to the WebView. By setting it from the outside, it is possible to share the same WebChannel between different WebViews. The webChannel property can be set to null to disable this new feature. For IPC, a navigator.qtWebChannelTransport property is added, which is essentially a copy of navigator.qt. This is required to be able to use both independently. The transport is implicitly connected to the WebView's webChannel. On the JavaScript client side, some manual boiler plate code is still required. Potentially, this can be adapted in the future to preload the qwebchannel.js. Furthermore, we might be able to instantiate and initialize the QWebChannel before we emit window.onload. A basic test is added which verifies that this basic integration works. Change-Id: I5eb0389e6edd6d0c978917e441365e11a02b5c3f Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Import Qt5x2 branch of QtWebkit for Qt 5.2Allan Sandfeld Jensen2013-09-191-83/+66
| | | | | | | Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 ↵Simon Hausmann2012-11-071-65/+79
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@133733) New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
* Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 ↵Simon Hausmann2012-08-211-0/+3
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@126147) New snapshot including various build fixes for newer Qt 5
* Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 ↵Simon Hausmann2012-08-121-1/+1
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@125365) New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
* Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 ↵Simon Hausmann2012-05-181-0/+2
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@117578) Weekly snapshot
* Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b ↵Simon Hausmann2012-05-071-1/+44
| | | | (http://svn.webkit.org/repository/webkit/trunk@116286)
* Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a ↵Simon Hausmann2012-03-121-10/+6
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@110422) This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
* Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 ↵Simon Hausmann2012-02-031-1/+1
| | | | (http://svn.webkit.org/repository/webkit/trunk@106560)
* Imported WebKit commit 2ea9d364d0f6efa8fa64acf19f451504c59be0e4 ↵Simon Hausmann2012-01-061-0/+157
(http://svn.webkit.org/repository/webkit/trunk@104285)
View Lorry Controller Status