summaryrefslogtreecommitdiffstats
path: root/src/core/configure.json
Commit message (Collapse)AuthorAgeFilesLines
* Minor. Small clean up of qmake leftoversMichal Klocek2023-03-281-288/+0
| | | | | | Pick-to: 6.5 Change-Id: I0ef7f97b3d76c43e815daeb7d6782215c08e4f7d Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Remove webengine-v8-snapshot-support featurePeter Varga2022-12-081-15/+0
| | | | | | | | The correspdonding v8_use_snapshot gn argument has been already removed in the Chromium 79 adaptations. It is useless since then. Change-Id: Ied1df9e8ed3149a0309d90fc026f4158627c0bcc Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Adaptations for Chromium 87Allan Sandfeld Jensen2021-01-131-15/+0
| | | | | Change-Id: Ic4ffd98e02f986dbaf986405360e727c813e696e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Move webengine-noexecstack to buildtoolsMichal Klocek2020-07-231-10/+0
| | | | | Change-Id: I854034fd63c8847867fd7ec01d5c25781e7de5ef Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add pipewire detection and supportAllan Sandfeld Jensen2020-07-081-0/+15
| | | | | | | | Used for screensharing on wayland Fixes: QTBUG-85309 Change-Id: I7ec61611bb9e3f318a6a5bd3a43212f391766628 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* Detect the presence of host node.jsAllan Sandfeld Jensen2020-06-231-0/+15
| | | | | | | | Allows building with or without it. Fixes: QTBUG-83729 Change-Id: I88d784e3230208e1268491c6ae0a4ebf1543aac8 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Move sanitizer to buildtoolsMichal Klocek2020-05-281-20/+0
| | | | | Change-Id: I1531199bb15b9d05e5c017d14fce07d39625cafe Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Move arm-thumb feature to buildtoolsMichal Klocek2020-05-281-9/+0
| | | | | | | | | Share arm-thumb setting between pdf and webengine. Move webengine-embedded to webengine since it is not used by pdf. Change-Id: Id23888423af7a37a3b3aa06e40dc0359fb90724b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Remove duplicated feature webengine-ozone-x11Michal Klocek2020-05-281-9/+3
| | | | | | | This feature is already in buildtools. Change-Id: Iff5d5cc4b72b29b850e8e4cb11b90251916ed9c7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Adaptations for Chromium 79Allan Sandfeld Jensen2020-02-281-10/+2
| | | | | | | | Fixes: QTBUG-80737 Fixes: QTBUG-81556 Fixes: QTBUG-81614 Change-Id: Ie6a69cdbf46d0508bff226f1b8fed28a618e1949 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/wip/qtpdf' into 5.15Michael Brüning2020-01-271-7/+0
|\ | | | | | | | | | | | | Initial merge of QtPdf into QtWebEngine. Fixes: QTBUG-69519 Change-Id: I48dc25a59f2c161bb231bd0fa60392eb70fe4e7d
| * Add QtPdf and QtPdfWidgets modulesMichal Klocek2019-11-251-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds two new modules to qtwebengine repository. New modules do not depend on webengine module, however webengine chromium source code and Chromium "gn" configuration is required to build QtPdf. Adding two unrelated modules to webengine might look crazy: however sharing gn build configuration and Chromium code base with necessary qt adaptations simplifies code maintenance and minimises required code checkouts. Back porting of security patches for Chromium also affects Pdfium. Moreover, Pdfium is no longer a separate project, but integrated into Chromium: therefore moving it out of Chromium source tree would require extra effort. Rename webengine-core feature to build-qtwebengine-core, this makes consistent feature naming with build-qtpdf At the moment two new modules have integrated build, with possible shortcuts: qmake -- --no-build-qtwebengine-core qmake -- --no-build-qtpdf Webengine build is disabled by default now. Change-Id: Iac3d9927d51f3ac316db0148d275eda843dcc19b Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Fix the build with -no-guiLiang Qi2020-01-031-1/+1
|/ | | | | | Task-number: QTBUG-74602 Change-Id: I8ba358e03472e58c40363fede56e87dfd665ae83 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Merge branch '5.13' into 5.14Allan Sandfeld Jensen2019-10-301-5/+1
|\ | | | | | | Change-Id: I6ab2e949cb2fa3b2db55a1654d42667db6257eab
| * Activate extensions on Linux for GCC version 5.3.1 as wellMichael Bruning2019-10-181-5/+1
| | | | | | | | | | | | | | | | | | | | This removes the special handling for the lower GCC versions that we support on linux. This will make the extensions and the PDF viewer available on the pre-built linux packages. Change-Id: I7b79c82f8e2596e2401e05f81041d736486d1c7d Fixes: QTBUG-76329 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Lower requirement for glibc to 2.17Michal Klocek2019-07-291-1/+1
| | | | | | | | | | | | Fixes: QTBUG-77171 Change-Id: I9eb5a34adbc62c8738ba5ffdf315ccf056da7b98 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Unify error reporting for configureMichal Klocek2019-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move last two tests (submodule and nowhitespace) to configure system and unify error reporting. Now all error messages come from one single place qtwebengine_checkErrors(). This function is used by configure system reporting and by make call. Remove duplicated strings. Add extra messages when module is not going to be built. Change-Id: Ib373facd58135325495aad52b6e600ec9a61f31f Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Rename option webengine-core to build-qtwebengine-coreMichal Klocek2019-09-191-2/+2
| | | | | | | | | | | | | | | | This change is extracted from qtpdf branch to keep following commits unchanged. Change-Id: I255976d45213d4cfe84243cae0b4eddb8eb1747a Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* | Move developer build option to toolsMichal Klocek2019-09-191-7/+0
| | | | | | | | | | Change-Id: Iffac4541f5675b0f048080f012b7b81b18885308 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* | Move main configure and move some tests from core to buildtoolsMichal Klocek2019-09-071-379/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Processing configuration for gn when building qpdfcore module will require optional libraries resolved. Some libs are not needed, but this requires extra patching of gn build configs; so to keep things simple, just detect all the libs beforehand. Unfortunately using this for main configure goes bonkers. The issue here is that main configure resets features in global scope, which can break features coming from qtbase and results in bogus configurations in certain cases. Therefore move current configuration to buildtools and make everything else depend on this. Task-number: QTBUG-75840 Task-number: QTBUG-76606 Change-Id: Id87f5ba017541a2d5a2836510c6cabc5a19f92c6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add webengine-core featureMichal Klocek2019-09-071-232/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create/split main configure for submodules. Now configure system knows when webenginecore module is not going to be built and the user gets the feedback after the configure step with the message: The following modules are not being compiled in this configuration: webenginecore webengine webenginewidgets If a module is not built also features are not populated, therefore some tests have to be moved to main configuration. This improves error reporting and prepares landing for QtPdf modules. Remove configure.prf and fix issues after config split. Add makefile call to report errors. Now calling make also reports issues. Task-number: QTBUG-75840 Task-number: QTBUG-76606 Change-Id: I76944df4c5db6f4954c464e3741a8054cb10b40e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move winversion test to configureMichal Klocek2019-08-151-2/+8
| | | | | | | | | | Change-Id: I5e0544415298b0e6b10e55f91d93d05eef81ccc4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move re2 test to configureMichal Klocek2019-08-151-8/+16
| | | | | | | | | | Change-Id: I76aa5c544a5930982e1d1b0ed28a75e88ec65e48 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move khr test to configureMichal Klocek2019-08-151-2/+8
| | | | | | | | | | Change-Id: Ic213555705f12a46283c62410bf9a477f03c05c0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move libvpx test to configureMichal Klocek2019-08-151-6/+16
| | | | | | | | | | Change-Id: I669b9d4cc28765b134386752d1fc14d14fa5b1dc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move snappy test to configureMichal Klocek2019-08-151-6/+14
| | | | | | | | | | Change-Id: I585e7f9aa19d03ca164e9419e55997526aeaca86 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* | Move xml2,glibc test to configureMichal Klocek2019-08-151-15/+24
| | | | | | | | | | Change-Id: I047f04a48d489730922093a9929e3609524dd06f Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* | Move alsa test to configureMichal Klocek2019-08-121-6/+14
| | | | | | | | | | Change-Id: Ifdd476c0b58763be009d208a5f9d4c23305b6baa Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* | Add webenginewidgets to configure systemMichal Klocek2019-08-121-17/+0
|/ | | | | | | | Make webeninge-qml webengine-widgets features indpendent of webenginecore. Change-Id: I11c1bfaf4a15e4cb3acf2751b367f2c92a7ac833 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-07-231-2/+30
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/config/common.pri src/core/configure.json src/core/net/url_request_qrc_job_qt.cpp src/core/ozone/surface_factory_qt.cpp src/core/web_contents_adapter.cpp Change-Id: If679aa179123f793639da3d8ee4ab5d116707754
| * Make enabling full debug information easierAllan Sandfeld Jensen2019-07-121-0/+12
| | | | | | | | | | | | | | | | Avoids asking customers to edit source files or add CONFIG to qmake on the command line to enable full debug information. Change-Id: Id58388565df88442e74e02687eb3189136e998f3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Fix detection of ozone x11 supportMichal Klocek2019-07-121-2/+18
| | | | | | | | | | | | Fixes: QTBUG-77011 Change-Id: I0136b360c74970b912124f6f308f598c80eceba3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Pump up required icu versionMichal Klocek2019-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update according to: "static assertion failed: v8 is required to build with ICU 63 and up". Change-Id: I55864e0fd7c98ee89c641926402115e85c65b1df Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add more robust glibc testMichal Klocek2019-05-271-1/+2
| | | | | | | | | | | | | | | | This test also works now when cross compiling. Change-Id: If73e16084cfbaf68ba515c2706d3ec2ec8eab8c9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Pump up glibc required versionMichal Klocek2019-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We need glibc wrappers for PTRACE_GET_THREAD_AREA system calls, which were added in b05cb613e7a of glibc. Change-Id: Ifee2b0eb9f4e0f85e990f3d78354804ec859795c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-06-111-0/+10
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/3rdparty src/core/configure.json src/core/profile_io_data_qt.cpp tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp Change-Id: Ie8ae4aa03881a0733ff497fff46e3f7040735650
| * Don't allow QtWebEngineCore to request executable stackThiago Macieira2019-05-311-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Chromium sources contain assembly code that causes the library to default to executable stack (the linker requires that *all* .o files have a .note.GNU-stack section in order to default to non-executable). So add the -z noexecstack linker flag to change the setting. The other libraries are not affected. Change-Id: I0bf9ebeb5aa34d19be30fffd15a3d3063dea2005 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-05-101-0/+1
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/profile_adapter.cpp src/core/profile_adapter.h src/webengine/api/qquickwebengineprofile.cpp src/webenginewidgets/api/qwebengineprofile.cpp tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp Change-Id: Ic561f22b361e32a0a63668c73bf6c0fc9c1ce16f
| * Skip qtwebengine for -no-gui build (also in the configure system)Kai Koehne2019-05-061-0/+1
| | | | | | | | | | | | | | | | This amends 26ac59af2306 Fixes: QTBUG-75465 Change-Id: I22df5dc851f80724a44c028310269289548dacc5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Fix incorrect harfbuzz versionMichal Klocek2019-03-291-2/+2
| | | | | | | | | | | | | | | | We do require at least harfbuz 2.2 We need hb-aat.h for opentype. Change-Id: Ia2814de6045884b4574ee6c55e74f04005321ac2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add extension system and PDF viewer to Qt WebEngineMichael Brüning2019-02-011-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the Chromium extensiuon system to Qt WebEngine. Currently, it only exposes internal APIs to the internal PDF viewer extension. To load a PDF, simply navigate to it. This feature can be configured via the webengine-extensions flag and is turned on by default. Needs patch in Chromium 71-based to build. Adaptations to 71-based from 69-based include: * Flag out update installation, add crx file dependency * Move PostTask over to 71-based implementation * Move extensions API providers to 71-based implementaion * Don't use custom guest view and mime handler view delegates * Adapt the URLRequestResourceBundleJob to match new interface * Move extension system initialization to end of profile constructor Change-Id: I4fa5149057291bb5847f048534c11820cd7ff58c Fixes: QTBUG-50556 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Adaptations for Chromium 71Allan Sandfeld Jensen2019-01-281-2/+2
| | | | | | | | | | | | | | Change-Id: Ib650113b05dfd4771240804f94e33c07aa317bf2 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Add configure for webengine and webenginewidgetsMichal Klocek2019-01-211-10/+18
|/ | | | | | | | | | | | | Add possibility to build without widgets or qml support. Move module related options to webengine's subconfigure. Make proper dependencies between qml_module and qml_plugins. Cleanup headers. Fixes: QTBUG-68956 Task-number: QTBUG-70784 Change-Id: I4605d98b0d2c83c99af37e2186b5fbf10f8a6049 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix build when we don't have all the X11 dependenciesAllan Sandfeld Jensen2019-01-171-12/+0
| | | | | | | | | | We only enable the GLX backends when we have all the X11 dependencies, but try to build the corresponding sources files even when we don't. And additional xrandr is no longer a dependency. Change-Id: I35c97c34c6d121bd6544344a73653900bf406be3 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add check for thumb instruction setMichal Klocek2018-11-211-0/+14
| | | | | | | | | We currently require thumb instruction set on arm to build internal ffmpeg. Task-number: QTBUG-71772 Change-Id: I43ed152a51f0dea97b800c868eb13a4e5e8e077e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Remove bogus line from configure.jsonMichal Klocek2018-11-211-1/+0
| | | | | Change-Id: I83a7a38d574b353e7748a71d83183b75f6dc7c1a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Allan Sandfeld Jensen2018-10-221-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.json src/3rdparty src/core/content_browser_client_qt.cpp src/core/content_browser_client_qt.h src/core/login_delegate_qt.cpp src/core/login_delegate_qt.h src/core/net/url_request_context_getter_qt.cpp src/core/net/url_request_context_getter_qt.h src/core/qtwebengine.gni 3rdparty changes: 616a7f558c7e This is expected for us, so don't report it as an error. c30febceaa1b Do not write <protocol>.json to source directory 9e68e4f2d92c Remove incomplete logic to detect AMD K2 CPU's e0ed41c8e90a FIXUP: This is expected for us, so don't report it as an error. f9fd9109b4b7 Fix --single-process --disable-gpu combination not to hit asserts f305d65cc27e Reduce severity level of messages when kDisableGpu switch is used 5e3e5074bb78 Work around MSVC2017 optimizer bug when printing a page usind Pdfium 34f52ec3bae8 Bump maximum number of custom isolated world ids f7a2f8153c82 Fix hunspell::NodeReader::affix_id_for_leaf bounds check 1e80090f7044 Fix resolve_proxy service permissions 2e498629651d Add proxy_resolver_manifest Change-Id: I2b176c80aa315a0ae0a22b5707694fdcd407407b
* Add kerberos feature to configure systemMichal Klocek2018-10-171-0/+9
| | | | | | Task-number: QTBUG-51082 Change-Id: I2c3ed5b42b054a9385f358eb9311646bc2a6cde0 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-09-271-0/+15
| | | | | | | | | Conflicts: configure.json configure.pri src/3rdparty Change-Id: I2e0614b33596fe66999508556c464ed84acc8e2f
* Remove more dead code from the libsrtp testThiago Macieira2018-09-051-11/+0
| | | | | | | | | Commit 83e790dae14725347180bb79e463c5f242616b8d removed the test, but not the configure.json files, so the test always failed because the test failed to compile. Change-Id: I8b4ab98c34b94afd94b6fffd15516f06ec21c791 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>