summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.212' into devHEADdevQt Forward Merge Bot3 days130-31/+313
|\
| * Import QtWebKit commit 5e53102492e5ce85bda2657468f1369a0173c2ce5.212Konstantin Tokarev6 days3-5/+31
| * Import QtWebKit commit 49b749171e786df3adcd7a755df428c1846acd69Konstantin Tokarev10 days122-22/+212
| * Import QtWebKit commit 45c329ee23a9b898fe8e6f0b0ccef8680aab3098Konstantin Tokarev12 days3-4/+4
| * Import QtWebKit commit b9c5fd65c91fb38ac81276e470093dd6683a4adeKonstantin Tokarev2019-09-181-0/+9
| * Import QtWebKit commit e17807a27e2edf0610f0b34eb42f15da2f6af77dKonstantin Tokarev2019-09-131-0/+2
| * Import QtWebKit commit 68b093f76fd3ee458de9d1bbf54e1d5a648a71bdKonstantin Tokarev2019-09-115-0/+55
* | 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
| |\ \ |/ / / | | _
| * Import QtWebKit commit f085f528406bf5656ce887e14c47b5e5fde4901dKonstantin Tokarev2019-09-103-4/+26
| * [cmake] Make sure that conan executable is availableKonstantin Tokarev2019-09-061-1/+5
| * Import QtWebKit commit 55ed4f703de7bfbb0f554cd05dccff4c6db1bba3Konstantin Tokarev2019-09-058-17/+98
| * [cmake] Fix suffix of MinGW import librariesKonstantin Tokarev2019-09-051-0/+3
| * Import QtWebKit commit 1c054b639030b02ff98964cc915beaa45b18e6ceKonstantin Tokarev2019-09-029-73/+73
| * [cmake] Fix finding static libraries of libjpeg-turbo with CMake < 3.10Konstantin Tokarev2019-08-281-0/+2
| * Use libjpeg from Conan on Windows when Qt uses bundled copyKonstantin Tokarev2019-08-281-1/+1
| * Import QtWebKit commit 423e60d5ea622069917a51229a090eae955072dcKonstantin Tokarev2019-08-159-19/+77
| * Don't use -fdebug-types-section on macOSKonstantin Tokarev2019-08-131-2/+6
| * Add workaround for broken libxslt include path in Conan packageKonstantin Tokarev2019-08-131-0/+6
| * Do not allow Conan to modify CMAKE_MODULE_PATHKonstantin Tokarev2019-08-131-0/+3
| * Import QtWebKit commit 58390740ab21cbf3ad8d7b51972c9b24fdf58a9cKonstantin Tokarev2019-08-1322-218/+166
| * Import WebKit commit ef70f6610af2160e0de030b81819c4b62dce7d12Konstantin Tokarev2019-07-1819-538/+740
| * Import WebKit commit d6bf9b7a5a72ec63236f3f2d0eabc20913309793v5.212.0-alpha3Konstantin Tokarev2019-06-2623-192/+297
| * Import WebKit commit eb64318ce61c3d6c6bd2c52ee1df69820a19802cKonstantin Tokarev2019-06-106-20/+50
| * Update XPCSPI.hAlexey Proskuryakov2019-06-071-3/+11
| * Stop using bundled libjpeg from qtbaseKonstantin Tokarev2019-06-076-42/+20
| * Temporarily skip MinGW buildKonstantin Tokarev2019-06-051-1/+1
| * Import WebKit commit 5ccca3a720f7c2251c4ac8b28f25bd73524081f0Konstantin Tokarev2019-06-0461-172/+335
| * Import WebKit commit 025cd3fc8d29620535309aa3e2ab7075aad36044Konstantin Tokarev2018-01-207-6/+54
* | Merge remote-tracking branch 'origin/5.212' into devLiang Qi2018-01-13201-11767/+10787
|\ \ | |/
| * Import WebKit commit a8b574fb3cd509a2d3f2a1568ad0a66d1bf0f6e8Konstantin Tokarev2018-01-1132-88/+595
| * Import WebKit commit 69d327017a8d700cbfc7e1120270db4d55416f41Konstantin Tokarev2018-01-0715-59/+123
| * Import WebKit commit 3b024218447b7838f08ccd8cf2c8515387ae41c2Konstantin Tokarev2017-12-2112-24/+189
| * Import WebKit commit 83f9eff575568815a8e7cf0f0b28300b0171f67eKonstantin Tokarev2017-11-1412-7/+15
| * Import WebKit commit 708de1520656bdf12023c04199ecab1b427d5e0cKonstantin Tokarev2017-11-0413-110/+92
| * Import WebKit commit 3d58c4e1c3d584799c4aa9a14d14e266695ee335Konstantin Tokarev2017-10-2612-19/+48
| * Import WebKit commit e89cea5f01479652674d3c24b2f387eb0987d0a1Konstantin Tokarev2017-10-2088-11280/+9310
| * Import WebKit commit 85c24b4e854b971f0705bb3411cfd4c0b821f491Konstantin Tokarev2017-10-1344-200/+430
| * Revert "Temporary disable VS2017"Konstantin Tokarev2017-09-201-1/+1
| * Fix build when Qt uses OpenGL ES 2Thiago Macieira2017-09-201-0/+3
| * Fix build with Qt 5.10 with moved zlibDmitry Shachnev2017-09-201-3/+5
* | Revert "Temporary disable VS2017"Konstantin Tokarev2017-07-101-1/+1
|/
* Merge remote-tracking branch 'origin/5.212' into devLiang Qi2017-07-04179-3820/+6082
|\
| * Import WebKit commit 3c9fc2fb47474909f5c30b518d372c854a3ec433Konstantin Tokarev2017-06-30106-3684/+5542
| * Import WebKit commit 6d0ad27b6bc4209fb8d8cee2692dc0c6a5462051v5.212.0-alpha2Konstantin Tokarev2017-06-1771-136/+535
| * std::function is in <functional>Thiago Macieira2017-06-065-0/+5
* | Temporary disable VS2017Konstantin Tokarev2017-07-031-1/+1
|/
* Import WebKit commit 3ca7a25a550e473d60bbbe321475c6c0ef114b31Konstantin Tokarev2017-06-02143-429/+1091
* Merge 'wip/next' into devOswald Buddenhagen2017-05-3021882-4832208/+1369003
|\
| * Import WebKit commit b25ce6eca994718717218f56d045e75a4a22f989Konstantin Tokarev2017-05-0811-41/+56