summaryrefslogtreecommitdiff
path: root/Source/WebKit/qt/declarative/plugin.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove superfluous assert from WebKitQmlPlugin::initializeEngineMichael Brüning2013-12-021-1/+1
| | | | | | | | | The uri parameter is unused in this method and the ones called by it, so it should not be asserted on. Task-number: QTBUG-34066 Change-Id: I184fbad3e6e3d4786b4cc4e9f768f1c006309295 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Imported WebKit commit c596dd7f03007fa7ed896b928106497e8784b3b5 ↵Simon Hausmann2012-09-261-13/+0
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@129610) New snapshot that removes QtQuick1 support (to be moved into QtQuick1 module)
* Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 ↵Simon Hausmann2012-08-121-13/+0
| | | | | | (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 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 ↵Simon Hausmann2012-06-201-0/+3
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@120813) New snapshot with Windows build fixes
* Imported WebKit commit 499c84c99aa98e9870fa7eaa57db476c6d160d46 ↵Simon Hausmann2012-06-011-1/+3
| | | | | | | (http://svn.webkit.org/repository/webkit/trunk@119200) Weekly update :). Particularly relevant changes for Qt are the use of the WebCore image decoders and direct usage of libpng/libjpeg if available in the system.
* Imported WebKit commit eb5c1b8fe4d4b1b90b5137433fc58a91da0e6878 ↵Simon Hausmann2012-05-251-0/+4
| | | | (http://svn.webkit.org/repository/webkit/trunk@118516)
* Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b ↵Simon Hausmann2012-05-071-2/+9
| | | | (http://svn.webkit.org/repository/webkit/trunk@116286)
* Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a ↵Simon Hausmann2012-03-121-12/+10
| | | | | | (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 bb52bf3c0119e8a128cd93afe5572413a8617de9 ↵Simon Hausmann2012-02-241-0/+3
| | | | (http://svn.webkit.org/repository/webkit/trunk@108790)
* Imported WebKit commit 2ea9d364d0f6efa8fa64acf19f451504c59be0e4 ↵Simon Hausmann2012-01-061-0/+77
(http://svn.webkit.org/repository/webkit/trunk@104285)
View Lorry Controller Status