summaryrefslogtreecommitdiff
path: root/Source/WebKit/qt
Commit message (Collapse)AuthorAgeFilesLines
* Import QtWebKit commit 49b749171e786df3adcd7a755df428c1846acd69Konstantin Tokarev2019-10-0491-14149/+0
| | | | | Change-Id: I4c82d8030969d941bb78b1cc4e77c0a66db8da2c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 55ed4f703de7bfbb0f554cd05dccff4c6db1bba3Konstantin Tokarev2019-09-055-13/+71
| | | | | Change-Id: I5063dd830f1cedda84e1ae66b0e659ffe7efa22c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 1c054b639030b02ff98964cc915beaa45b18e6ceKonstantin Tokarev2019-09-022-10/+14
| | | | | Change-Id: Ieac288ef14217f25da44d69e1d191c47290182c3 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 58390740ab21cbf3ad8d7b51972c9b24fdf58a9cKonstantin Tokarev2019-08-1311-83/+47
| | | | | Change-Id: Ia730b2ca3e5c8c1556fed3301cdf2da7cfbd802f Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit ef70f6610af2160e0de030b81819c4b62dce7d12Konstantin Tokarev2019-07-186-11/+12
| | | | | Change-Id: I1644a08d8d19841cb66762af42a766fc4d1518ef Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit d6bf9b7a5a72ec63236f3f2d0eabc20913309793v5.212.0-alpha3Konstantin Tokarev2019-06-264-5/+59
| | | | | Change-Id: I15a655045d43ea5f2cfe1158016db6426ded0224 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit eb64318ce61c3d6c6bd2c52ee1df69820a19802cKonstantin Tokarev2019-06-101-0/+15
| | | | | Change-Id: I73331bc707a68785c44548f5d607c0e62f68e701 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 5ccca3a720f7c2251c4ac8b28f25bd73524081f0Konstantin Tokarev2019-06-044-8/+12
| | | | | | | | | | | | | Change-Id: Idfb37cd43929536d4c67d1fa5d8cb598e9c0ad7e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 69d327017a8d700cbfc7e1120270db4d55416f41Konstantin Tokarev2018-01-071-1/+4
| | | | | Change-Id: I38406c67ba681f7693a45b0fa2d8c2e44a6d9a0e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 708de1520656bdf12023c04199ecab1b427d5e0cKonstantin Tokarev2017-11-042-6/+4
| | | | | Change-Id: Id24f973470620b1c7a36576606b81f5df0fd75d0 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3d58c4e1c3d584799c4aa9a14d14e266695ee335Konstantin Tokarev2017-10-262-10/+4
| | | | | Change-Id: I1069f65fada85860f5c3da6c37a5ab5a8daecd51 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 85c24b4e854b971f0705bb3411cfd4c0b821f491Konstantin Tokarev2017-10-137-8/+61
| | | | | Change-Id: I3f9320f43d5d1fc5169a6c1b9dcea454974d6578 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 6d0ad27b6bc4209fb8d8cee2692dc0c6a5462051v5.212.0-alpha2Konstantin Tokarev2017-06-173-1/+5
| | | | | Change-Id: Ifdedb7bc3162434686201813dc1d994cf5ae7e70 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3ca7a25a550e473d60bbbe321475c6c0ef114b31Konstantin Tokarev2017-06-027-2/+54
| | | | | Change-Id: I480668a0cb8114dccf7a1195190a993282875759 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Import WebKit commit a4582ff260c0683b310e8ebbd5c3e6d5ad9fccc2Konstantin Tokarev2017-05-025-26/+23
| | | | | Change-Id: Ic5519f3eaf22b68312d410b65d70445f05c631fa Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 7aa9943a36e7f3e72207dbf448d2d80fb368a300Konstantin Tokarev2017-04-287-5/+23
| | | | | Change-Id: I7e96b8e5ba5eef9b0c6c0835e200f770200573ed Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70dKonstantin Tokarev2017-04-2515-207/+131
| | | | | Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 584c4a7a6a8bffb60f03b9eb10a65dbcf41dc0b7Konstantin Tokarev2017-04-224-18/+19
| | | | | Change-Id: Ife943bbbd8226afa05ef6320b10ba351d55fd797 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 1686903dfa4ab621a1b16a1a87529c88b07414a6Konstantin Tokarev2017-04-112-3/+6
| | | | | Change-Id: I07d705b9195c04d2d269586d67604150a5bda554 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 342c7c7c069db3ca1d09ae6c5f7d600f9b241778Konstantin Tokarev2017-04-071-2/+1
| | | | | Change-Id: I8886595114569f61168aed76b23ad7288c5cb34c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 13ac532967b6ac2d18d6fc4ea72c4ca35eccff20Konstantin Tokarev2017-03-3113-56/+121
| | | | | Change-Id: I12a5c8f98aeaac1b542ce20c0ff297c57b5d84d1 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 17e8bfb1ff30314a838b9bf641c112f63a11dba4Konstantin Tokarev2017-03-2613-22/+21
| | | | | Change-Id: Ib6549e44a04300c7b7b07ddc9094b823b37f3183 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3da312bb5ff3deccba0a495b6ad6d5cafba56597Konstantin Tokarev2017-03-042-1/+13
| | | | | Change-Id: Ifc702a2f8477e8a07e51cb0cd44161c1d9a84357 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 7952fc64448c2e3c95c814b81cb055211c400786Konstantin Tokarev2017-02-0311-21/+70
| | | | | Change-Id: I55b781a0908e86519ba08df274b16b8f169631dd Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit bdab88b903fe1a254c80af20161183976670cd3bKonstantin Tokarev2017-02-0212-31/+136
| | | | | Change-Id: Idc1156f4a64df4e7d89e90d4e03451f004c8ae6d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 30997fb33975697a4af9cc6eef69967313d0ec9aKonstantin Tokarev2017-02-025-6/+16
| | | | | Change-Id: I8a2348dd9eb59df840dde6b66141d562aff29bf4 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 12fbea815480c3b3fad139cd8dfb82e8c954bc9aKonstantin Tokarev2017-02-0216-48/+350
| | | | | Change-Id: Iccbb1e8bd8b7f72322614224c203fc509a8dbb79 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 490f716dd2dd07fb0d6652795c62586e2e28ae27Konstantin Tokarev2017-02-0237-362/+406
| | | | | Change-Id: I9f66467721cf923468af87915c260c1bb44e013e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 2730223e8fe1776419fae168986b9e77f55d02d3Konstantin Tokarev2017-02-022-0/+30
| | | | | Change-Id: I46d453477a779a8db544ffc50d088fa13331da9b Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3Konstantin Tokarev2017-02-0221-77/+103
| | | | | Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)Konstantin Tokarev2017-02-02135-32202/+4480
| | | | | Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Don't use deprecated version suffixes of QStyleOption* classes.Konstantin Tokarev2016-06-151-4/+4
| | | | | | | They are deprecated since Qt 5.0. Change-Id: Id6df1fa1eec1e1f6bee863d7c00f37a599dd49f3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Added missing break statement.Konstantin Tokarev2016-05-201-0/+1
| | | | | Change-Id: I90bc4a7c65dd70206fd250dcfa81dfac02f8ba74 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix tst_QObjectBridge::connectAndDisconnect() failArunprasad Rajkumar2016-05-191-4/+4
| | | | | | | | | | | | | | | | | <https://webkit.org/b/119933> Patch by Arunprasad Rajkumar <arurajku@cisco.com> on 2013-08-19 Reviewed by Allan Sandfeld Jensen. Latest version of JSC has unquoted undefined in exception messages. So replaced 'undefined' with undefined. * tests/qobjectbridge/tst_qobjectbridge.cpp: (tst_QObjectBridge::connectAndDisconnect): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154273 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: Ife6167e9f67f540fcef3f3468c37fcb85991216d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* decruft project fileOswald Buddenhagen2016-05-101-3/+0
| | | | | | | the "created by qt creator" header is not supposed to be checked in. Change-Id: I78294e52858387946b2bafd258f7be6b0b5d87d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* make use of COPIESOswald Buddenhagen2016-05-102-16/+6
| | | | | Change-Id: I050003e46c437a3fadce11d417861f40d60f6c20 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Make more ctors explicitMarc Mutz2016-03-042-2/+2
| | | | | | | | | | Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Change-Id: If2e979aa5772b8dc0b9a4a9360914740144d47a7 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-046-12/+12
| | | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I9e521f91abe7972843eeeb6406f8605778dabbaf Task-number: QTBUG-45291 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* isLinkVisited: Don't build complete URL unless we use QWebHistoryInterface.Konstantin Tokarev2016-02-261-4/+4
| | | | | | | | visitedURL() is non-trivial function with memory allocations, so we should not call it for nothing. Change-Id: I72e14fac75640cb6b22dd1444b9a061e8432dd7e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fixed unfinished phrase in documentation of evaluateJavaScript.Konstantin Tokarev2016-02-041-4/+3
| | | | | | Change-Id: I5b5f43c68feedbace330494e7eb051cfe8a54128 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Handle WebKitErrorDomain error like other errorsJoni Poikelin2016-01-291-1/+1
| | | | | | Change-Id: Ie4dd08b18706e44947a00b4d61a185b5fc43f478 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fixed another typo in QWebSecurityOrigin::addLocalScheme() documentation.Konstantin Tokarev2016-01-271-1/+1
| | | | | Change-Id: I7013829d4e30a85374a4f63ab6a45b97b44313d7 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fixed typo in QWebSecurityOrigin::addLocalScheme documentation.Konstantin Tokarev2016-01-271-1/+1
| | | | | Change-Id: Ife7db164671b84f28b03b6d86a038d1370486cae Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Improved documentation of evaluateJavaScript().Konstantin Tokarev2016-01-212-2/+24
| | | | | Change-Id: I47d8f4c0e392ffb70655db9725b035d22a7cad91 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Add missing docs for QWebSettings attributes.Florian Bruhin2015-08-101-0/+6
| | | | | | | | | WebAudioEnabled is left undocumented because it doesn't work, but WebGLEnabled/HyperlinkAuditingEnabled/CSSRegionsEnabled seem to work fine. Change-Id: I12c88424ae77cdb6f1e0279b39a538ee932b8b60 Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Remove QTWEBKIT_VERSION left-oversAllan Sandfeld Jensen2015-07-292-46/+1
| | | | | | | | We removed QTWEBKIT_VERSION in Qt 5.0, but still document it and still define the QTWEBKIT_VERSION_CHECK helper. Change-Id: Iadbe0004224f3cef20a5d55a5ec8b46f04b387d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Allan Sandfeld Jensen2015-05-181-2/+3
|\
| * Merge remote-tracking branch 'origin/5.4' into 5.5Allan Sandfeld Jensen2015-05-181-2/+3
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib823c8eeb271b380811827aae1ac0bd50ea5a59b
| | * Enforce no remote access from local URLs for XHRAllan Sandfeld Jensen2015-04-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a specific setting to disable remote access for local URLs and also enforce that on data-URLs loaded owned by local URLs. Change-Id: Ied8ec141eb1c28775644fce184a4759a79e1d177 Task-number: QTBUG-45556 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Fix potential crash on exitAllan Sandfeld Jensen2015-05-181-1/+2
|/ / | | | | | | | | | | | | | | | | If we close a browser with a combobox open it may crash on exit due to double deferred deletion. This patch avoids that by using a smarter pointer. Change-Id: I3f1c561b0eb70cf1a51054de51b1027b52cd41b6 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>