summaryrefslogtreecommitdiff
path: root/Tools/qmake
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 68b093f76fd3ee458de9d1bbf54e1d5a648a71bdKonstantin Tokarev2019-09-111-0/+5
| | | | | Change-Id: I62abae1d1e60d2cb65514d01fa89ad44308a6ba4 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 58390740ab21cbf3ad8d7b51972c9b24fdf58a9cKonstantin Tokarev2019-08-131-1/+1
| | | | | Change-Id: Ia730b2ca3e5c8c1556fed3301cdf2da7cfbd802f 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 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-071-4/+0
| | | | | 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 85c24b4e854b971f0705bb3411cfd4c0b821f491Konstantin Tokarev2017-10-131-3/+0
| | | | | 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-041-3/+24
|\ | | | | | | Change-Id: I006cd9023fadc5407bbaa2ddfda45cb8e88b548b
| * Import WebKit commit 3c9fc2fb47474909f5c30b518d372c854a3ec433Konstantin Tokarev2017-06-301-3/+24
| | | | | | | | | | Change-Id: Iccd335ea312d91e826885857fee6d0da3e913b8c 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-021-0/+44
| | | | | Change-Id: I480668a0cb8114dccf7a1195190a993282875759 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Import WebKit commit b25ce6eca994718717218f56d045e75a4a22f989wip/nextKonstantin Tokarev2017-05-081-9/+11
| | | | | Change-Id: Ied338d9a16b44b5da35d484e80a21acc284eb625 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 584c4a7a6a8bffb60f03b9eb10a65dbcf41dc0b7Konstantin Tokarev2017-04-221-6/+7
| | | | | 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-071-3/+16
| | | | | Change-Id: I8886595114569f61168aed76b23ad7288c5cb34c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 13ac532967b6ac2d18d6fc4ea72c4ca35eccff20Konstantin Tokarev2017-03-312-4/+2
| | | | | Change-Id: I12a5c8f98aeaac1b542ce20c0ff297c57b5d84d1 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 17e8bfb1ff30314a838b9bf641c112f63a11dba4Konstantin Tokarev2017-03-262-1/+3
| | | | | Change-Id: Ib6549e44a04300c7b7b07ddc9094b823b37f3183 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3da312bb5ff3deccba0a495b6ad6d5cafba56597Konstantin Tokarev2017-03-042-8/+18
| | | | | Change-Id: Ifc702a2f8477e8a07e51cb0cd44161c1d9a84357 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit bdab88b903fe1a254c80af20161183976670cd3bKonstantin Tokarev2017-02-022-0/+17
| | | | | 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-025-26/+31
| | | | | Change-Id: Iccbb1e8bd8b7f72322614224c203fc509a8dbb79 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit a16099e901e36e6d298dd30c0694a2130052d70eKonstantin Tokarev2017-02-021-8/+21
| | | | | Change-Id: I484731400983d1d964bdcf4afc4007f41ca1bb8a Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 26dda242e41e9b4d348fc3573d86f58b9e8b51b9Konstantin Tokarev2017-02-025-0/+314
| | | | | Change-Id: I00833927c575184923449ab99c85c46fec94dc19 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)Konstantin Tokarev2017-02-0259-2499/+0
| | | | | Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-011-0/+4
|\ | | | | | | 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>
* | fix logical mismerge from 5.6Oswald Buddenhagen2016-06-171-1/+1
| | | | | | | | | | | | | | iphonesimulator_and_iphoneos was renamed to simulator_and_device in 5.7. Change-Id: If24f96a7404048129db91b42d519e85ce418db07 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-154-4/+10
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic399cf8fef1f26f22338a67393066d69cd969579
| * fix ios device&simulator builds againOswald Buddenhagen2016-05-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | the assumption stated in c48fd0cb is actually invalid - configure sets build_all without debug_and_release there. debug_and_release does actually imply build_all, though. to make things less confusing, don't let configure inject iphonesimulator_and_iphoneos into all projects, but handle it like debug_and_release instead. Change-Id: I05258d4a88549608c26d8b3dd9618f5736ff7ce3 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| * Disable touch_slider if touch_events is disabled.Konstantin Tokarev2016-05-202-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | touch_events is a prerequisite for touch_slider, however, touch_slider is added to WEBKIT_CONFIG before user options processing, so it's possible to produce meaningless configuration with disabled touch_events and enabled touch_slider. It's harmless because all ENABLE(TOUCH_SLIDER) code is also guarded with ENABLE(TOUCH_EVENTS), however it still may be confusing. Change-Id: I149c798f488ec9977ea5b168c0f5d7b7c53d1aec Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Moved use_leveldb configuration from detectFeatures to sanitizeFeatures.Konstantin Tokarev2016-05-201-0/+3
| | | | | | | | | | | | | | | | Otherwise compilation breaks when indexed_database is disabled, because USE(LEVELDB) is always true. Change-Id: I680475baeb6796cdba859ff8daaba0c39a3e8338 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * QT_CONFIG simplification re debug_and_release and build_allOswald Buddenhagen2016-05-171-2/+1
| | | | | | | | | | | | | | | | don't pretend that these two flags can be set separately - the configures set them in tandem. Change-Id: I90691b78723b79df0fdfa81a6ee81191595582c6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Fix the build with non-standard qtlibinfix buildsThiago Macieira2016-05-111-1/+2
| | | | | | | | | | | | | | | | | | When qtlibinfix contains non-identifier characters (like '.'), you can't pass BUILDING_$${TARGET} since TARGET has already been modified by qt_module.prf. Change-Id: I22045d72c63a4741b83fffff140f6b7509c1e2c5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6.1' into 5.7.05.7.0Liang Qi2016-05-274-4/+41
|\ \ | |/ | | | | Change-Id: Id8fd457ab1eb501f8f5622cb5f7d88c352e3758f
| * Allow building QtWebKit on Windows with non-ICU Qt build.Konstantin Tokarev2016-04-052-3/+1
| | | | | | | | | | | | | | | | | | Also, from now use_wchar_unicode is never silently enabled when ICU config test fails, and requires qmake argument WEBKIT_CONFIG+=use_wchar_unicode. Change-Id: I434f5245c796b723a3bb116f62f8d53d05c3b4f7 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Allow using system SQLite without pkg-configKonstantin Tokarev2016-04-013-1/+40
| | | | | | | | | | Change-Id: Ifff0f8877a2d2d77a04468c205c3353f043e7738 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Fix linking with libpthreadAllan Sandfeld Jensen2016-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | WebKit use libpthread directly but is depending on other qt modules causing it to be linked against, which might break unless -lpthread is last. Instead just add it explicitly after the static libraries. Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> (cherry picked from commit 5dd4bb67cfce812fd7686e43616e2069f354a7df) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Crude hack to disable build on Ubuntu TouchSimon Hausmann2016-02-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | This is an awful hack to disable the build. We are short of a reliable way of detecting the platform and we are facing the issue that cross-compilation against Ubuntu Touch with a sysroot produces linking errors due to the linker in the cross-compilation toolchain not respecting --sysroot when reading /etc/ld.so.conf in order to find the directory that provides libEGL.so.1. Change-Id: I19583ce31d62b0165877dedd3d6ce62bfdb71db4 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Simon Hausmann2016-02-222-2/+6
|\ \ | |/
| * Skip building on androidAllan Sandfeld Jensen2016-02-031-1/+4
| | | | | | | | | | | | | | | | While it was building at some point, Android was never fully working or supported. Change-Id: I6ce77904e4db7830969664910eea143fa184f848 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Fix link error in MSVCKai Koehne2015-11-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Since qtbase/e88334e0 we must not put MSVC linker flags into LIBS or LIBS_PRIVATE. QMAKE_LFLAGS is the right place. This fixes a build error with MSVC: LINK : fatal error LNK1181: cannot open input file '\OPT:REF.obj' A similar fix was already applied to qtwebengine (295a915b5ae66). Change-Id: I7972651cd6e61ef3ecd413be290e49baec29a770 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix linking with libpthreadAllan Sandfeld Jensen2016-02-221-0/+1
|/ | | | | | | | | WebKit use libpthread directly but is depending on other qt modules causing it to be linked against, which might break unless -lpthread is last. Instead just add it explicitly after the static libraries. Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Added workaround for use_system_malloc to omit WTF_ prefix in macro name.Konstantin Tokarev2015-09-301-0/+4
| | | | | | | | | Unlike other USE_* features, USE_SYSTEM_MALLOC is not checked with USE() macro (which expects WTF_ prefix), so passing WTF_USE_SYSTEM_MALLOC into DEFINES just does not work. Change-Id: I8e1ec29124ee77d2d5ea2e8ad44bc113091edcd9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-08-191-3/+0
|\ | | | | | | Change-Id: If2a43ca5f31a426ef5413a3aacec4e75936d5f86
View Lorry Controller Status