summaryrefslogtreecommitdiffstats
path: root/Tools
Commit message (Collapse)AuthorAgeFilesLines
* Import QtWebKit commit 5e53102492e5ce85bda2657468f1369a0173c2ceKonstantin Tokarev2019-10-081-0/+2
| | | | | Change-Id: Id71d7c7f5eafe58f7bd8c46a2a07fd0bad015628 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 49b749171e786df3adcd7a755df428c1846acd69Konstantin Tokarev2019-10-041-0/+2
| | | | | Change-Id: I4c82d8030969d941bb78b1cc4e77c0a66db8da2c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 68b093f76fd3ee458de9d1bbf54e1d5a648a71bdKonstantin Tokarev2019-09-111-0/+5
| | | | | Change-Id: I62abae1d1e60d2cb65514d01fa89ad44308a6ba4 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit f085f528406bf5656ce887e14c47b5e5fde4901dKonstantin Tokarev2019-09-101-0/+4
| | | | | Change-Id: I9bd682d60cdf85d3cca75faf84fbfd151213d98e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 1c054b639030b02ff98964cc915beaa45b18e6ceKonstantin Tokarev2019-09-022-23/+0
| | | | | Change-Id: Ieac288ef14217f25da44d69e1d191c47290182c3 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Use libjpeg from Conan on Windows when Qt uses bundled copyKonstantin Tokarev2019-08-281-1/+1
| | | | | Change-Id: Ibf64e9b2c834ff613b60444676a0b70d47dde319 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 423e60d5ea622069917a51229a090eae955072dcKonstantin Tokarev2019-08-153-5/+12
| | | | | Change-Id: I05f8e1d4bcd815cc1c3ccda241aa94e608a8221e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 58390740ab21cbf3ad8d7b51972c9b24fdf58a9cKonstantin Tokarev2019-08-138-123/+110
| | | | | Change-Id: Ia730b2ca3e5c8c1556fed3301cdf2da7cfbd802f Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit ef70f6610af2160e0de030b81819c4b62dce7d12Konstantin Tokarev2019-07-181-0/+69
| | | | | Change-Id: I1644a08d8d19841cb66762af42a766fc4d1518ef Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit d6bf9b7a5a72ec63236f3f2d0eabc20913309793v5.212.0-alpha3Konstantin Tokarev2019-06-262-2/+3
| | | | | Change-Id: I15a655045d43ea5f2cfe1158016db6426ded0224 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit eb64318ce61c3d6c6bd2c52ee1df69820a19802cKonstantin Tokarev2019-06-101-1/+2
| | | | | Change-Id: I73331bc707a68785c44548f5d607c0e62f68e701 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Stop using bundled libjpeg from qtbaseKonstantin Tokarev2019-06-072-23/+3
| | | | | | | | | | | | | | | | | | | | | [*] Its usage is too fragile, updates on QtBase side often break compilation, also maintaining compatibility with different Qt versions becomes harder [*] Mismatch between vendor and version of libjpeg bundled with QtBase is the often sources of troubles for Windows and macOS users trying to build QtWebKit from sources against precompiled Qt SDK. This patch makes libjpeg optional dependency when CMake option USE_LIBJPEG is set to off. In qmake wrapper detection of bunled libjpeg in QtGui configuration disables use of libjpeg automatically. When WebKit JPEG decoder is disabled, JPEG images are handled by QImageReader, losing support for progressive rendering and possibly some other features. Note that libpng is still mandatory, because it doesn't expose issues described above. Change-Id: Ibf270f2f9e3230b27f4c63390918dd7e78ffee2b Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Temporarily skip MinGW buildKonstantin Tokarev2019-06-051-1/+1
| | | | | | | | | | | | Change-Id: I58095beac3783f5ea0a295b5a4ca77214288ba69 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 5ccca3a720f7c2251c4ac8b28f25bd73524081f0Konstantin Tokarev2019-06-044-2/+41
| | | | | | | | | | | | | Change-Id: Idfb37cd43929536d4c67d1fa5d8cb598e9c0ad7e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 025cd3fc8d29620535309aa3e2ab7075aad36044Konstantin Tokarev2018-01-201-0/+2
| | | | | Change-Id: I39d60de0f241abc52c0c4eb174eba7882d576f24 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit a8b574fb3cd509a2d3f2a1568ad0a66d1bf0f6e8Konstantin Tokarev2018-01-111-3/+2
| | | | | Change-Id: I66add69e6d08b74111ec8e7e4401e4d813501206 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 69d327017a8d700cbfc7e1120270db4d55416f41Konstantin Tokarev2018-01-072-5/+1
| | | | | Change-Id: I38406c67ba681f7693a45b0fa2d8c2e44a6d9a0e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3b024218447b7838f08ccd8cf2c8515387ae41c2Konstantin Tokarev2017-12-212-1/+7
| | | | | Change-Id: I0698c3862a53268111308c191c45167e36898dbb Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3d58c4e1c3d584799c4aa9a14d14e266695ee335Konstantin Tokarev2017-10-262-5/+6
| | | | | Change-Id: I1069f65fada85860f5c3da6c37a5ab5a8daecd51 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit e89cea5f01479652674d3c24b2f387eb0987d0a1Konstantin Tokarev2017-10-206-4/+241
| | | | | Change-Id: Ifc00865ceeb5b83b7990f91af7dbbd1a05df1c30 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 85c24b4e854b971f0705bb3411cfd4c0b821f491Konstantin Tokarev2017-10-135-6/+27
| | | | | Change-Id: I3f9320f43d5d1fc5169a6c1b9dcea454974d6578 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Revert "Temporary disable VS2017"Konstantin Tokarev2017-09-201-1/+1
| | | | | | | | | VS2017 configurations should work now. This reverts commit 8231f9776c2e4028937411bd2a0886aa72c97831. Change-Id: I508508860727f9d6787a0dfeeb368c5a996c9c4c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Fix build with Qt 5.10 with moved zlibDmitry Shachnev2017-09-201-3/+5
| | | | | | | See qtbase commit 5169d588a599036aa1962f518a7c321f5e3e7296. Change-Id: Idc491c3ccb94a309aa683b956cc3eeb0826ad041 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Merge remote-tracking branch 'origin/5.212' into devLiang Qi2017-07-0411-7/+46
|\ | | | | | | Change-Id: I006cd9023fadc5407bbaa2ddfda45cb8e88b548b
| * Import WebKit commit 3c9fc2fb47474909f5c30b518d372c854a3ec433Konstantin Tokarev2017-06-304-3/+24
| | | | | | | | | | Change-Id: Iccd335ea312d91e826885857fee6d0da3e913b8c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * Import WebKit commit 6d0ad27b6bc4209fb8d8cee2692dc0c6a5462051v5.212.0-alpha2Konstantin Tokarev2017-06-177-4/+22
| | | | | | | | | | Change-Id: Ifdedb7bc3162434686201813dc1d994cf5ae7e70 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* | Temporary disable VS2017Konstantin Tokarev2017-07-031-1/+1
|/ | | | | | Task-number: QTBUG-61728 Change-Id: I170c86f61b8ce7faa18a4135066ac8872b0dae1f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Import WebKit commit 3ca7a25a550e473d60bbbe321475c6c0ef114b31Konstantin Tokarev2017-06-029-4/+128
| | | | | Change-Id: I480668a0cb8114dccf7a1195190a993282875759 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Import WebKit commit b25ce6eca994718717218f56d045e75a4a22f989Konstantin Tokarev2017-05-081-9/+11
| | | | | Change-Id: Ied338d9a16b44b5da35d484e80a21acc284eb625 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 7aa9943a36e7f3e72207dbf448d2d80fb368a300Konstantin Tokarev2017-04-283-0/+15
| | | | | Change-Id: I7e96b8e5ba5eef9b0c6c0835e200f770200573ed Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70dKonstantin Tokarev2017-04-257-7/+86
| | | | | Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 584c4a7a6a8bffb60f03b9eb10a65dbcf41dc0b7Konstantin Tokarev2017-04-223-12/+11
| | | | | Change-Id: Ife943bbbd8226afa05ef6320b10ba351d55fd797 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 1686903dfa4ab621a1b16a1a87529c88b07414a6Konstantin Tokarev2017-04-111-2/+6
| | | | | Change-Id: I07d705b9195c04d2d269586d67604150a5bda554 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 342c7c7c069db3ca1d09ae6c5f7d600f9b241778Konstantin Tokarev2017-04-075-3/+224
| | | | | Change-Id: I8886595114569f61168aed76b23ad7288c5cb34c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 13ac532967b6ac2d18d6fc4ea72c4ca35eccff20Konstantin Tokarev2017-03-313-5/+5
| | | | | Change-Id: I12a5c8f98aeaac1b542ce20c0ff297c57b5d84d1 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 17e8bfb1ff30314a838b9bf641c112f63a11dba4Konstantin Tokarev2017-03-268-5/+12
| | | | | Change-Id: Ib6549e44a04300c7b7b07ddc9094b823b37f3183 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3da312bb5ff3deccba0a495b6ad6d5cafba56597Konstantin Tokarev2017-03-0410-16/+282
| | | | | Change-Id: Ifc702a2f8477e8a07e51cb0cd44161c1d9a84357 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit bdab88b903fe1a254c80af20161183976670cd3bKonstantin Tokarev2017-02-0213-62/+215
| | | | | Change-Id: Idc1156f4a64df4e7d89e90d4e03451f004c8ae6d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 30997fb33975697a4af9cc6eef69967313d0ec9aKonstantin Tokarev2017-02-021-1/+0
| | | | | Change-Id: I8a2348dd9eb59df840dde6b66141d562aff29bf4 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 12fbea815480c3b3fad139cd8dfb82e8c954bc9aKonstantin Tokarev2017-02-0226-89/+186
| | | | | Change-Id: Iccbb1e8bd8b7f72322614224c203fc509a8dbb79 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit a16099e901e36e6d298dd30c0694a2130052d70eKonstantin Tokarev2017-02-022-12/+29
| | | | | Change-Id: I484731400983d1d964bdcf4afc4007f41ca1bb8a Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 26dda242e41e9b4d348fc3573d86f58b9e8b51b9Konstantin Tokarev2017-02-026-1/+317
| | | | | Change-Id: I00833927c575184923449ab99c85c46fec94dc19 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 490f716dd2dd07fb0d6652795c62586e2e28ae27Konstantin Tokarev2017-02-023-0/+108
| | | | | Change-Id: I9f66467721cf923468af87915c260c1bb44e013e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit fbdeb5a5c78f666271a638ba10137127bcea61f4Konstantin Tokarev2017-02-021-2/+0
| | | | | Change-Id: Ie14bf4e3f1f1f7e3b9e5cf60e69a7572dd481006 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 2730223e8fe1776419fae168986b9e77f55d02d3Konstantin Tokarev2017-02-023-0/+4
| | | | | Change-Id: I46d453477a779a8db544ffc50d088fa13331da9b Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3Konstantin Tokarev2017-02-0215-44/+99
| | | | | Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)Konstantin Tokarev2017-02-022186-525824/+41243
| | | | | Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-013-2/+6
|\ | | | | | | Change-Id: I7ef71d5a3af2acb9e41fffd9a215980dbace9d90
| * Define NOMINMAX on Windows buildsThiago Macieira2016-07-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | windows.h has a #define macro for min and max, which causes breakage when we write things like std::max or std::numeric_limits::max(). I don't know why I suddenly started getting this, but it's a good idea to do this change. Change-Id: Ib57b52598e2f452985e9fffd1459f01996c7fb7e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Allow making production builds with build-webkit.Konstantin Tokarev2016-06-271-1/+1
| | | | | | | | | | | | | | | | Don't add CONFIG-=production_build if CONFIG+=production_build was passed in arguments. Change-Id: If401b3a8c1391c71273401257e85274e8db8e2b2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 11:20:02 +0000