summaryrefslogtreecommitdiff
path: root/Source/WebKit/qt/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Import WebKit commit 6d0ad27b6bc4209fb8d8cee2692dc0c6a5462051v5.212.0-alpha2Konstantin Tokarev2017-06-172-0/+4
| | | | | Change-Id: Ifdedb7bc3162434686201813dc1d994cf5ae7e70 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3ca7a25a550e473d60bbbe321475c6c0ef114b31Konstantin Tokarev2017-06-021-0/+4
| | | | | Change-Id: I480668a0cb8114dccf7a1195190a993282875759 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Import WebKit commit 7aa9943a36e7f3e72207dbf448d2d80fb368a300Konstantin Tokarev2017-04-281-0/+1
| | | | | Change-Id: I7e96b8e5ba5eef9b0c6c0835e200f770200573ed Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70dKonstantin Tokarev2017-04-254-6/+89
| | | | | Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 7952fc64448c2e3c95c814b81cb055211c400786Konstantin Tokarev2017-02-032-2/+2
| | | | | Change-Id: I55b781a0908e86519ba08df274b16b8f169631dd Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 490f716dd2dd07fb0d6652795c62586e2e28ae27Konstantin Tokarev2017-02-022-3/+3
| | | | | Change-Id: I9f66467721cf923468af87915c260c1bb44e013e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)Konstantin Tokarev2017-02-024-117/+1
| | | | | Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* make use of COPIESOswald Buddenhagen2016-05-102-16/+6
| | | | | Change-Id: I050003e46c437a3fadce11d417861f40d60f6c20 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* avoid creation of empty qmltypes for qtquick1Fawzi Mohamed2014-10-311-7/+8
| | | | | | Change-Id: Ic28043a94151d3878219e5808075ce6ae663c316 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Deploy QML plugin type information to correct directory.Michael Brüning2014-05-162-1/+3
| | | | | | | | | | | | | This adds the plugins.qmltypes file to the list of files that are deployed to the qml/QtWebKit directory. This is needed e.g. for auto-completion in Creator. Patch co-authored with Fawzi Mohamed. Task-number: QTBUG-39013 Change-Id: Icce9a168a0558652b810ad16c89895e24a6fc6ef Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* 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>
* Add all plugins.qmltypes files and update qmldir filesLiang Qi2013-05-292-0/+200
| | | | | | | | | | Note: qmlplugindump need to be patched with https://codereview.qt-project.org/55247 Task-number: QTBUG-31388 Change-Id: I6bdcffc978b7a994e624541d949e8906dad08b21 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-172-2/+2
| | | | | | | | qt is already added by spec_pre.prf, warn_on and depend_includepath by default_pre.prf. Change-Id: I4f02ef09f19cf0e4c7093f3fe30d5ca34daa194f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Imported WebKit commit 6a4a1d32e1d779548c726c4826cba9d69eb87601 ↵Simon Hausmann2012-11-302-6/+16
| | | | | | | | | | | (http://svn.webkit.org/repository/webkit/trunk@136242) Final import for the Qt 5.x series that implements the QtWebKit / QtWebKitWidgets split Extra fixes will be cherry-picked. Change-Id: I844f1ebb99c6d6b75db31d6538c2acd628e79681 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 ↵Simon Hausmann2012-10-222-2/+2
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@132067) New snapshot that fixes build without QtWidgets
* Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 ↵Simon Hausmann2012-10-172-2/+2
| | | | | | | (http://svn.webkit.org/repository/webkit/trunk@131592) New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well as the previously cherry-picked changes
* Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 ↵Simon Hausmann2012-10-162-2/+2
| | | | | | | | (http://svn.webkit.org/repository/webkit/trunk@131300)" This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78. Caused OOM issues on some CI machines :(
* Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 ↵Simon Hausmann2012-10-152-2/+2
| | | | | | | | | (http://svn.webkit.org/repository/webkit/trunk@131300) WebKit update which introduces the QtWebKitWidgets module that contains the WK1 widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're working on completing the entire split as part of https://bugs.webkit.org/show_bug.cgi?id=99314
* Imported WebKit commit c596dd7f03007fa7ed896b928106497e8784b3b5 ↵Simon Hausmann2012-09-264-1503/+0
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@129610) New snapshot that removes QtQuick1 support (to be moved into QtQuick1 module)
* Imported WebKit commit c7503cef7ecb236730d1309676ab9fc723fd061d ↵Simon Hausmann2012-09-181-1/+3
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@128886) New snapshot with various build fixes
* Imported WebKit commit 37c5e5041d39a14ea0d429a77ebd352e4bd26516 ↵Simon Hausmann2012-09-142-0/+2
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@128608) New snapshot that enables WebKit2 build on Windows (still some bugs) and allows for WebKit to be built with qmake && make
* Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c ↵Simon Hausmann2012-09-112-3/+3
| | | | | | | (http://svn.webkit.org/repository/webkit/trunk@128206) This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection and allow for further simplifications in the future
* Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 ↵Simon Hausmann2012-08-123-17/+2
| | | | | | (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 8ff1f22783a32de82fee915abd55bd1b298f2644 ↵Simon Hausmann2012-07-113-6/+3
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@122325) New snapshot that should work with the latest Qt build system changes
* Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 ↵Simon Hausmann2012-06-204-2/+6
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@120813) New snapshot with Windows build fixes
* Imported WebKit commit 499c84c99aa98e9870fa7eaa57db476c6d160d46 ↵Simon Hausmann2012-06-012-1/+5
| | | | | | | (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-252-1/+5
| | | | (http://svn.webkit.org/repository/webkit/trunk@118516)
* Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 ↵Simon Hausmann2012-05-181-3/+3
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@117578) Weekly snapshot
* Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b ↵Simon Hausmann2012-05-075-22/+16
| | | | (http://svn.webkit.org/repository/webkit/trunk@116286)
* Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a ↵Simon Hausmann2012-03-125-35/+42
| | | | | | (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-242-0/+6
| | | | (http://svn.webkit.org/repository/webkit/trunk@108790)
* Imported WebKit commit e09a82039aa4273ab318b71122e92d8e5f233525 ↵Simon Hausmann2012-02-093-23/+12
| | | | (http://svn.webkit.org/repository/webkit/trunk@107223)
* Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 ↵Simon Hausmann2012-02-032-2/+2
| | | | (http://svn.webkit.org/repository/webkit/trunk@106560)
* Imported WebKit commit 2ea9d364d0f6efa8fa64acf19f451504c59be0e4 ↵Simon Hausmann2012-01-069-0/+1777
(http://svn.webkit.org/repository/webkit/trunk@104285)
View Lorry Controller Status