summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Enable QML tests5.212Konstantin Tokarev2020-09-247-17/+25
| | | | | Change-Id: I10968ff39311aac6af328e5f13e316dbfc3c7a1e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 5d89eef9bc689abb59ef799b445c35b1e322b3f1Konstantin Tokarev2020-09-221-0/+2
| | | | | Change-Id: Id311c92fbaecbc70b134214a7280423400e50c2a Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 143b469188bde226d5e70cff5f01699b8a29d865Konstantin Tokarev2020-09-214-193/+302
| | | | | Change-Id: I31b194474a8bb5668f1305dda5d9f79d81d1e0d5 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 6faf5d547055321f0d518fe83766499cac5d8664Konstantin Tokarev2020-09-205-10/+42
| | | | | Change-Id: Ic4699dbd1292dda99d8058853dadf69f5a81cd0e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit cf37bc44f798d3c5a26d17086ada92688b9bfe6dKonstantin Tokarev2020-09-151-0/+4
| | | | | Change-Id: I4d0c7ab5ea4e63983d0bb62111c23f9604f0ee61 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Workaround for Windows Store python3.exeKonstantin Tokarev2020-09-121-1/+5
| | | | | | | | CMake detects it as a preferred Python interpreter, however it doesn't work without manual interaction from user. Change-Id: I37ce1015076360ce92121c522734c04401d2fbd6 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit f966d667c14ddcfe983f4a31fc80a1edbb6ada10Konstantin Tokarev2020-09-1222-102/+959
| | | | | Change-Id: I4c6773b5dc78399f46ab9fee5c0ff876bd90ba0d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 5da2323bd009bfd234e86c2552b7d9d4138652feKonstantin Tokarev2020-04-147-33/+468
| | | | | Change-Id: Ib6d3119a4cb7900becb66bd40160b1d8e442e792 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 98f3c1fc89c86fe9ca6db003eaaad739961e52e8Konstantin Tokarev2020-03-23105-48/+154
| | | | | Change-Id: Iac9a0bdcda4e45bca85c31832b2c1710c194a44c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit c8cf15255d01d75b888df48372af0ad57d3db799Konstantin Tokarev2020-03-201-0/+1
| | | | | Change-Id: I1e36429a805ce46c145b846440466d8112d012d7 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 7cbe5431c38860f20419db9df9b673e822f297c0Konstantin Tokarev2020-03-183-10/+16
| | | | | Change-Id: I1045ef79f6a6afd08cd85abc668be56a5f20cb69 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* [cmake] Make MACOS_BUILD_FRAMEWORKS option actually workKonstantin Tokarev2020-03-181-1/+2
| | | | | Change-Id: Ieb32a52512556336ba3539612872dcc04202c35f Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 980d6f0dc91dd18951d7bd53cea86c898fab5830Konstantin Tokarev2020-03-182-1/+9
| | | | | Change-Id: I48a0a0286cb73f9f418bdf061930fce7549aa0df Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 8a07b1ecac57cc12d6e0ef0ab56340742c213554v5.212.0-alpha4Konstantin Tokarev2020-03-051-0/+48
| | | | | Change-Id: I890f88ee16cb1a5fd39323897d6561149dc9e828 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit c58d69686e6bdfb224c064a38333d6c6a981bf70Konstantin Tokarev2020-03-042-7/+3
| | | | | Change-Id: I87b5a5c95a2ed6b60842468c2a725f0522692121 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 0f8a0856b4e8db1bea298f74c02172a9aa5fc2f3Konstantin Tokarev2020-03-032-1/+69
| | | | | Change-Id: Ibbe58ea5d84cfb170f1e07980a61aac7b85649c5 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 3e299f5a501465c9d986c4daaf6fb82f52d4cd20Konstantin Tokarev2020-03-027-77/+32
| | | | | Change-Id: I824dea42f8cb17c1b587e55fc80a05fc917e39f2 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 6b3c75e839483be078fef7fbab341720668788e9Konstantin Tokarev2020-02-281-3/+0
| | | | | Change-Id: I6f4d64932536208373182001211c618c92c57f28 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit ae3f146611ea3f6277750978be4206cdbba76350Konstantin Tokarev2020-02-261-0/+2
| | | | | Change-Id: Id7b86a1607e7957a69b6c80f276ca14a881b2bfe Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit bf94215feb57ddf9ce364bc6953eec8cd1387c3dKonstantin Tokarev2020-02-266-13/+160
| | | | | Change-Id: Ifc9d2e79e39fbfdd21bd40ede609c7696d2efe62 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 887b98440a46eb30f8a1998e930ddd9218934e1eKonstantin Tokarev2020-02-2544-216/+355
| | | | | Change-Id: I87077d70c358887aa76233566c2e864d1eeb8f73 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* [qmake] Enable API tests for WebKitWidgets in CoinKonstantin Tokarev2020-02-253-12/+6
| | | | | | | | | [*] Add CONFIG += testcase to tests.pri [*] Remove obsolete code from tests.pri [*] Temporary disable assertion which fails in debug build Change-Id: Ibe5acb7a0f2402eafde0034ca893b70f4c5a6bf9 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 148b29f49161dd4ebba296cf675bf0afa4b73bc4Konstantin Tokarev2020-02-248-34/+121
| | | | | Change-Id: I1ce086a99e5f254e40ac174de1120c5545ab04e3 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* [tests] Restore CMakeLists.txt needed by cmake testKonstantin Tokarev2019-12-121-0/+17
| | | | | Change-Id: I0981e1d7c6786dfb6da82c523d1645c72c6ac013 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Temporary skip build with MSVC 2019Konstantin Tokarev2019-12-111-0/+3
| | | | | | | Conan dependencies have not been added to provisioning yet. Change-Id: Ie99e6eb04cc7461f19fd031734ce171216b32796 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit b1c36478b46c1dad693e2f1cfc235b02542c98cdKonstantin Tokarev2019-10-243-168/+12
| | | | | Change-Id: Ifd933dfe331760ec415c9936b9ef191534311cae Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 5e53102492e5ce85bda2657468f1369a0173c2ceKonstantin Tokarev2019-10-083-5/+31
| | | | | Change-Id: Id71d7c7f5eafe58f7bd8c46a2a07fd0bad015628 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 49b749171e786df3adcd7a755df428c1846acd69Konstantin Tokarev2019-10-04122-22/+212
| | | | | Change-Id: I4c82d8030969d941bb78b1cc4e77c0a66db8da2c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 45c329ee23a9b898fe8e6f0b0ccef8680aab3098Konstantin Tokarev2019-10-013-4/+4
| | | | | Change-Id: Iebca31394d29eed00a48980825fdd70d93f04d86 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit b9c5fd65c91fb38ac81276e470093dd6683a4adeKonstantin Tokarev2019-09-181-0/+9
| | | | | Change-Id: I4d323f3577d6e897cee5f08b4811bbe1f7553e8d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit e17807a27e2edf0610f0b34eb42f15da2f6af77dKonstantin Tokarev2019-09-131-0/+2
| | | | | Change-Id: I0b1943e9f1b2e46509825348d1acd64e13d96e5b Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 68b093f76fd3ee458de9d1bbf54e1d5a648a71bdKonstantin Tokarev2019-09-115-0/+55
| | | | | Change-Id: I62abae1d1e60d2cb65514d01fa89ad44308a6ba4 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit f085f528406bf5656ce887e14c47b5e5fde4901dKonstantin Tokarev2019-09-103-4/+26
| | | | | Change-Id: I9bd682d60cdf85d3cca75faf84fbfd151213d98e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* [cmake] Make sure that conan executable is availableKonstantin Tokarev2019-09-061-1/+5
| | | | | | | | If conan is missing in PATH, try using PIP3_PATH as a fallback, otherwise abort build. Change-Id: I12b8a44da677ccef1abf6e68f3b0a3f1dd99b28c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 55ed4f703de7bfbb0f554cd05dccff4c6db1bba3Konstantin Tokarev2019-09-058-17/+98
| | | | | Change-Id: I5063dd830f1cedda84e1ae66b0e659ffe7efa22c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* [cmake] Fix suffix of MinGW import librariesKonstantin Tokarev2019-09-051-0/+3
| | | | | | | | QMake doesn't treat import libraries as a separate product kind, while CMake by default uses different ".dll.a" suffix for them. Change-Id: Icc77b6b1fa050d29781211ed961ba005e0b689e9 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 1c054b639030b02ff98964cc915beaa45b18e6ceKonstantin Tokarev2019-09-029-73/+73
| | | | | Change-Id: Ieac288ef14217f25da44d69e1d191c47290182c3 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* [cmake] Fix finding static libraries of libjpeg-turbo with CMake < 3.10Konstantin Tokarev2019-08-281-0/+2
| | | | | Change-Id: I83f02ab897f2bbc922664387dc58835d53737f6e 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-159-19/+77
| | | | | Change-Id: I05f8e1d4bcd815cc1c3ccda241aa94e608a8221e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Don't use -fdebug-types-section on macOSKonstantin Tokarev2019-08-131-2/+6
| | | | | | | It causes error with macOS 10.14 and is probably useless on older versions. Change-Id: Ibea62e531ed23015f6a20ecd119bac7e1f1e8067 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Add workaround for broken libxslt include path in Conan packageKonstantin Tokarev2019-08-131-0/+6
| | | | | | | | Addition of include/libxslt to include path causes conflict of header file names. Change-Id: Ia08553511cfb017bc32933fa7c296760a410d080 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Do not allow Conan to modify CMAKE_MODULE_PATHKonstantin Tokarev2019-08-131-0/+3
| | | | | Change-Id: I750002d7e5f26e424f425e3de318ee3231dc654f Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import QtWebKit commit 58390740ab21cbf3ad8d7b51972c9b24fdf58a9cKonstantin Tokarev2019-08-1322-218/+166
| | | | | Change-Id: Ia730b2ca3e5c8c1556fed3301cdf2da7cfbd802f Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit ef70f6610af2160e0de030b81819c4b62dce7d12Konstantin Tokarev2019-07-1819-538/+740
| | | | | Change-Id: I1644a08d8d19841cb66762af42a766fc4d1518ef Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit d6bf9b7a5a72ec63236f3f2d0eabc20913309793v5.212.0-alpha3Konstantin Tokarev2019-06-2623-192/+297
| | | | | Change-Id: I15a655045d43ea5f2cfe1158016db6426ded0224 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit eb64318ce61c3d6c6bd2c52ee1df69820a19802cKonstantin Tokarev2019-06-106-20/+50
| | | | | Change-Id: I73331bc707a68785c44548f5d607c0e62f68e701 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Update XPCSPI.hAlexey Proskuryakov2019-06-071-3/+11
| | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=181827 rdar://problem/36393031 Reviewed by Daniel Bates. * wtf/spi/darwin/XPCSPI.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@227212 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I808f2a26d9d7f108675617553439fbba2cd504e2 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Stop using bundled libjpeg from qtbaseKonstantin Tokarev2019-06-076-42/+20
| | | | | | | | | | | | | | | | | | | | | [*] 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 08:04:20 +0000