summaryrefslogtreecommitdiffstats
path: root/Source/cmake/OptionsQt.cmake
Commit message (Collapse)AuthorAgeFilesLines
* Import QtWebKit commit 45c329ee23a9b898fe8e6f0b0ccef8680aab3098Konstantin Tokarev2019-10-011-1/+1
| | | | | 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 68b093f76fd3ee458de9d1bbf54e1d5a648a71bdKonstantin Tokarev2019-09-111-0/+31
| | | | | Change-Id: I62abae1d1e60d2cb65514d01fa89ad44308a6ba4 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-051-1/+4
| | | | | 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>
* [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>
* Import QtWebKit commit 423e60d5ea622069917a51229a090eae955072dcKonstantin Tokarev2019-08-151-0/+3
| | | | | Change-Id: I05f8e1d4bcd815cc1c3ccda241aa94e608a8221e 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 WebKit commit ef70f6610af2160e0de030b81819c4b62dce7d12Konstantin Tokarev2019-07-181-0/+1
| | | | | Change-Id: I1644a08d8d19841cb66762af42a766fc4d1518ef Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Stop using bundled libjpeg from qtbaseKonstantin Tokarev2019-06-071-16/+7
| | | | | | | | | | | | | | | | | | | | | [*] 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>
* Import WebKit commit 5ccca3a720f7c2251c4ac8b28f25bd73524081f0Konstantin Tokarev2019-06-041-0/+9
| | | | | | | | | | | | | Change-Id: Idfb37cd43929536d4c67d1fa5d8cb598e9c0ad7e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 025cd3fc8d29620535309aa3e2ab7075aad36044Konstantin Tokarev2018-01-201-1/+34
| | | | | Change-Id: I39d60de0f241abc52c0c4eb174eba7882d576f24 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit a8b574fb3cd509a2d3f2a1568ad0a66d1bf0f6e8Konstantin Tokarev2018-01-111-23/+32
| | | | | Change-Id: I66add69e6d08b74111ec8e7e4401e4d813501206 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 69d327017a8d700cbfc7e1120270db4d55416f41Konstantin Tokarev2018-01-071-4/+20
| | | | | Change-Id: I38406c67ba681f7693a45b0fa2d8c2e44a6d9a0e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3b024218447b7838f08ccd8cf2c8515387ae41c2Konstantin Tokarev2017-12-211-4/+30
| | | | | Change-Id: I0698c3862a53268111308c191c45167e36898dbb Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 83f9eff575568815a8e7cf0f0b28300b0171f67eKonstantin Tokarev2017-11-141-0/+2
| | | | | Change-Id: I3d4c1bf98fe1d1aaad868f4a6210f241aa43a2eb Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3d58c4e1c3d584799c4aa9a14d14e266695ee335Konstantin Tokarev2017-10-261-0/+4
| | | | | Change-Id: I1069f65fada85860f5c3da6c37a5ab5a8daecd51 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 85c24b4e854b971f0705bb3411cfd4c0b821f491Konstantin Tokarev2017-10-131-13/+28
| | | | | Change-Id: I3f9320f43d5d1fc5169a6c1b9dcea454974d6578 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3c9fc2fb47474909f5c30b518d372c854a3ec433Konstantin Tokarev2017-06-301-12/+22
| | | | | Change-Id: Iccd335ea312d91e826885857fee6d0da3e913b8c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 6d0ad27b6bc4209fb8d8cee2692dc0c6a5462051v5.212.0-alpha2Konstantin Tokarev2017-06-171-3/+42
| | | | | Change-Id: Ifdedb7bc3162434686201813dc1d994cf5ae7e70 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3ca7a25a550e473d60bbbe321475c6c0ef114b31Konstantin Tokarev2017-06-021-13/+11
| | | | | Change-Id: I480668a0cb8114dccf7a1195190a993282875759 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Import WebKit commit b25ce6eca994718717218f56d045e75a4a22f989Konstantin Tokarev2017-05-081-5/+19
| | | | | Change-Id: Ied338d9a16b44b5da35d484e80a21acc284eb625 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit a4582ff260c0683b310e8ebbd5c3e6d5ad9fccc2Konstantin Tokarev2017-05-021-7/+20
| | | | | Change-Id: Ic5519f3eaf22b68312d410b65d70445f05c631fa Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 7aa9943a36e7f3e72207dbf448d2d80fb368a300Konstantin Tokarev2017-04-281-1/+11
| | | | | Change-Id: I7e96b8e5ba5eef9b0c6c0835e200f770200573ed Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70dKonstantin Tokarev2017-04-251-2/+38
| | | | | Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 584c4a7a6a8bffb60f03b9eb10a65dbcf41dc0b7Konstantin Tokarev2017-04-221-3/+14
| | | | | Change-Id: Ife943bbbd8226afa05ef6320b10ba351d55fd797 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 1686903dfa4ab621a1b16a1a87529c88b07414a6Konstantin Tokarev2017-04-111-6/+2
| | | | | Change-Id: I07d705b9195c04d2d269586d67604150a5bda554 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 342c7c7c069db3ca1d09ae6c5f7d600f9b241778Konstantin Tokarev2017-04-071-1/+14
| | | | | Change-Id: I8886595114569f61168aed76b23ad7288c5cb34c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 13ac532967b6ac2d18d6fc4ea72c4ca35eccff20Konstantin Tokarev2017-03-311-0/+4
| | | | | Change-Id: I12a5c8f98aeaac1b542ce20c0ff297c57b5d84d1 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 17e8bfb1ff30314a838b9bf641c112f63a11dba4Konstantin Tokarev2017-03-261-0/+9
| | | | | Change-Id: Ib6549e44a04300c7b7b07ddc9094b823b37f3183 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3da312bb5ff3deccba0a495b6ad6d5cafba56597Konstantin Tokarev2017-03-041-4/+16
| | | | | Change-Id: Ifc702a2f8477e8a07e51cb0cd44161c1d9a84357 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit bdab88b903fe1a254c80af20161183976670cd3bKonstantin Tokarev2017-02-021-24/+43
| | | | | Change-Id: Idc1156f4a64df4e7d89e90d4e03451f004c8ae6d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 30997fb33975697a4af9cc6eef69967313d0ec9aKonstantin Tokarev2017-02-021-21/+31
| | | | | Change-Id: I8a2348dd9eb59df840dde6b66141d562aff29bf4 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 12fbea815480c3b3fad139cd8dfb82e8c954bc9aKonstantin Tokarev2017-02-021-17/+55
| | | | | Change-Id: Iccbb1e8bd8b7f72322614224c203fc509a8dbb79 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit a16099e901e36e6d298dd30c0694a2130052d70eKonstantin Tokarev2017-02-021-1/+1
| | | | | Change-Id: I484731400983d1d964bdcf4afc4007f41ca1bb8a Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 490f716dd2dd07fb0d6652795c62586e2e28ae27Konstantin Tokarev2017-02-021-45/+70
| | | | | Change-Id: I9f66467721cf923468af87915c260c1bb44e013e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit fbdeb5a5c78f666271a638ba10137127bcea61f4Konstantin Tokarev2017-02-021-1/+1
| | | | | Change-Id: Ie14bf4e3f1f1f7e3b9e5cf60e69a7572dd481006 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 2730223e8fe1776419fae168986b9e77f55d02d3Konstantin Tokarev2017-02-021-24/+51
| | | | | Change-Id: I46d453477a779a8db544ffc50d088fa13331da9b Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3Konstantin Tokarev2017-02-021-6/+25
| | | | | Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)Konstantin Tokarev2017-02-021-0/+545
Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 11:47:57 +0000