summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.212' into devHEADdevQt Forward Merge Bot2019-10-11130-31/+313
|\ | | | | | | Change-Id: I2b773e6958cf1d3699ff7887f2807572f1dafa8d
| * 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>
* | Merge "Merge remote-tracking branch 'origin/5.212' into dev"Qt Forward Merge Bot2019-09-11143-1243/+1908
|\ \
| * | Merge remote-tracking branch 'origin/5.212' into devQt Forward Merge Bot2019-09-10143-1243/+1908
|/| | | |/ | | | | Change-Id: I4e185b15690118515df80a79b786cbb8b30dd144
| * 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>
| * Import WebKit commit 5ccca3a720f7c2251c4ac8b28f25bd73524081f0Konstantin Tokarev2019-06-0461-172/+335
| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idfb37cd43929536d4c67d1fa5d8cb598e9c0ad7e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * Import WebKit commit 025cd3fc8d29620535309aa3e2ab7075aad36044Konstantin Tokarev2018-01-207-6/+54
| | | | | | | | | | Change-Id: I39d60de0f241abc52c0c4eb174eba7882d576f24 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* | Merge remote-tracking branch 'origin/5.212' into devLiang Qi2018-01-13201-11767/+10787
|\| | | | | | | Change-Id: I9e64176fe95183acf5e093aa081b0a498795bdb2
| * Import WebKit commit a8b574fb3cd509a2d3f2a1568ad0a66d1bf0f6e8Konstantin Tokarev2018-01-1132-88/+595
| | | | | | | | | | Change-Id: I66add69e6d08b74111ec8e7e4401e4d813501206 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * Import WebKit commit 69d327017a8d700cbfc7e1120270db4d55416f41Konstantin Tokarev2018-01-0715-59/+123
| | | | | | | | | | Change-Id: I38406c67ba681f7693a45b0fa2d8c2e44a6d9a0e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * Import WebKit commit 3b024218447b7838f08ccd8cf2c8515387ae41c2Konstantin Tokarev2017-12-2112-24/+189
| | | | | | | | | | Change-Id: I0698c3862a53268111308c191c45167e36898dbb Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * Import WebKit commit 83f9eff575568815a8e7cf0f0b28300b0171f67eKonstantin Tokarev2017-11-1412-7/+15
| | | | | | | | | | Change-Id: I3d4c1bf98fe1d1aaad868f4a6210f241aa43a2eb Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * Import WebKit commit 708de1520656bdf12023c04199ecab1b427d5e0cKonstantin Tokarev2017-11-0413-110/+92
| | | | | | | | | | Change-Id: Id24f973470620b1c7a36576606b81f5df0fd75d0 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * Import WebKit commit 3d58c4e1c3d584799c4aa9a14d14e266695ee335Konstantin Tokarev2017-10-2612-19/+48
| | | | | | | | | | Change-Id: I1069f65fada85860f5c3da6c37a5ab5a8daecd51 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * Import WebKit commit e89cea5f01479652674d3c24b2f387eb0987d0a1Konstantin Tokarev2017-10-2088-11280/+9310
| | | | | | | | | | Change-Id: Ifc00865ceeb5b83b7990f91af7dbbd1a05df1c30 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * Import WebKit commit 85c24b4e854b971f0705bb3411cfd4c0b821f491Konstantin Tokarev2017-10-1344-200/+430
| | | | | | | | | | 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 when Qt uses OpenGL ES 2Thiago Macieira2017-09-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | The QT_OPENGL_ES_2 macro is a QtGui feature, so it's not provided by qglobal.h, but instead qtguiglobal.h (a header new in 5.8.0). Using the QtGui/ prefix here to make sure it includes even if WTF/Platform.h is compiled without -I$QTDIR/include/QtGui. Change-Id: I8d96dea9955d4c749b99fffd14cde9c566436381 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * 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>
* | Revert "Temporary disable VS2017"Konstantin Tokarev2017-07-101-1/+1
|/ | | | | | | | | Coin provisioning was fixed in dd5096c6c. This reverts commit 8231f9776c2e4028937411bd2a0886aa72c97831. Change-Id: I7254374b73a6caee8ac877ad257b55ca5df185c8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.212' into devLiang Qi2017-07-04179-3820/+6082
|\ | | | | | | Change-Id: I006cd9023fadc5407bbaa2ddfda45cb8e88b548b
| * Import WebKit commit 3c9fc2fb47474909f5c30b518d372c854a3ec433Konstantin Tokarev2017-06-30106-3684/+5542
| | | | | | | | | | Change-Id: Iccd335ea312d91e826885857fee6d0da3e913b8c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * Import WebKit commit 6d0ad27b6bc4209fb8d8cee2692dc0c6a5462051v5.212.0-alpha2Konstantin Tokarev2017-06-1771-136/+535
| | | | | | | | | | Change-Id: Ifdedb7bc3162434686201813dc1d994cf5ae7e70 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * std::function is in <functional>Thiago Macieira2017-06-065-0/+5
| | | | | | | | | | | | | | You have to include it... Change-Id: Ia3e896da908f42939148fffd14c573086094939e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | 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-02143-429/+1091
| | | | | Change-Id: I480668a0cb8114dccf7a1195190a993282875759 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge 'wip/next' into devOswald Buddenhagen2017-05-3021882-4832208/+1369003
|\ | | | | | | Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9
| * Import WebKit commit b25ce6eca994718717218f56d045e75a4a22f989Konstantin Tokarev2017-05-0811-41/+56
| | | | | | | | | | Change-Id: Ied338d9a16b44b5da35d484e80a21acc284eb625 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 08:32:51 +0000