summaryrefslogtreecommitdiffstats
path: root/configure.json
Commit message (Collapse)AuthorAgeFilesLines
* Add QtPdf and QtPdfWidgets modulesMichal Klocek2019-11-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Move main configure and move some tests from core to buildtoolsMichal Klocek2019-09-071-346/+1
| | | | | | | | | | | | | | | | | | 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 jumbo builds to configure systemMichal Klocek2019-09-071-2/+20
| | | | | | | | | | Adds new feature webenigne-jumbo-build which indicates merge limit for jumbo build, usage: qmake <src> -- --webengine-jumbo-build=8 Change-Id: I7607a83772b53f6db57eb12559989a91f991ce93 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add webengine-core featureMichal Klocek2019-09-071-0/+328
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Add webenginewidgets to configure systemMichal Klocek2019-08-121-1/+2
| | | | | | | | Make webeninge-qml webengine-widgets features indpendent of webenginecore. Change-Id: I11c1bfaf4a15e4cb3acf2751b367f2c92a7ac833 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add configure for webengine and webenginewidgetsMichal Klocek2019-01-211-1/+2
| | | | | | | | | | | | | 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>
* Fine tune configure and clean up header includesMichal Klocek2018-06-121-719/+2
| | | | | | | | | | | | | | | | | | | | | | Previously configure was generating two config headers qtwebengine-config.h and qtwebengine-config_p.h, however those headers were never installed or included as dependency in Makefiles. Moreover, due to the name clash all features were included into qt_lib_webengine_*.pri which is QtWebEngine QML module. Move configure to core so all features belong now to qt_lib_webenginecore*.pri. Fix global includes to include qtwebenginecore-config*.h. Drop all DEFINES and use QT_CONFIG instead. Cleanup all evil looking includes in headers for webengine and webenginewidgets. Change-Id: Iddbc8bf4487d9a5f0c19a71a9569535083507756 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix typo in configure.jsonKai Koehne2018-05-281-1/+1
| | | | | | Change-Id: I7f08f89bbd875a835a55c1378833c92ce246c564 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix hostcompiler test for qt 'root' buildMichal Klocek2018-05-011-0/+1
| | | | | | | | | | | For qt root builds configure system injects qmake flags to compile config tests. To make hostcompiler test working correctly add missing "host" flag to configure.json file. Task-number: QTBUG-67983 Change-Id: Ia021ab8da8ec622f15d369357738dd8d778f2481 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Simplify libxml2 system compatibility detectionMichal Klocek2018-04-121-8/+3
| | | | | | | Test for icu also in xml2 compile test. Change-Id: I435f609761cb299f58a9b5f68e31698bb238ab1c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Add check for catalog support in libxml2Michal Klocek2018-04-121-3/+11
| | | | | | | | | | | | Since https://codereview.chromium.org/2788063002 libxml2 is expected to have disabled catalog support. Prevent crashes of render process and do not link against system libxml2 if it is compiled with catalog support. Task-number: QTBUG-66488 Change-Id: I2d922929878262c555802336841536eba1294db2 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Basic adaptations for 65-basedAllan Sandfeld Jensen2018-03-151-2/+30
| | | | | Change-Id: I121b14d6a44e80f5eea4b159c58f7010d472926e Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Fix webengine-v8-snapshot-support configureAllan Sandfeld Jensen2018-02-211-1/+7
| | | | | | | | | It needs to be checked for all cross builds not just embedded builds, it doesn't need to be checked for 64-bit archictures, and it is helpful to list it in the overview even if we only act on it later. Change-Id: I68c571480186bb9564cb564ca561dfd284f6e231 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix configure overview of v8 snapshotAllan Sandfeld Jensen2018-01-261-1/+1
| | | | | Change-Id: Iad4dd57f5a86019290bc59187e60c9c1c3db917d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add 32bit host compiler testMichal Klocek2018-01-241-2/+18
| | | | | | | | | The 32bit compiler is required for creating v8 snapshots. Task-number: QTBUG-65004 Task-number: QTBUG-64869 Change-Id: I0a7a351208768f0b12900fac14d3abd5c8d99fa2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add pkg-host wrapper scriptMichal Klocek2018-01-231-0/+18
| | | | | | | | | | | | | | | Currently we need pkg-config host for cross-builds to build build tools. Unfortunately if build environment exports PKG_CONFIG_* variables pkg-config will pick them up also for host builds, which can lead to compile errors. Create pkg-config-host_wrapper which explicitly unsets PKG_CONFIG_* variables. This is a temporary workaround till proper solution is implemented in qtbase. Task-number: QTBUG-65079 Change-Id: I9aff4a27ba62e096ed4c023cf022a41833260178 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix sanitizer buildAlexandru Croitor2018-01-101-1/+11
| | | | | | Task-number: QTBUG-64726 Change-Id: Ic88eed62e85ad1d95afcbd154c6556509e42bd47 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add missing 'webengine' prefix in configure.jsonMichal Klocek2017-11-221-2/+2
| | | | | | | Fix condition mixup in webengine-system-lcms2 configuration Change-Id: Iff8513b1e1102c3ca6402b2ec346dfdded2c110a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add 'webengine' prefix to configure features, tests, libraries, etcAlexandru Croitor2017-11-121-183/+194
| | | | | | | | This is done to make sure there are no conflicts with features in other modules, because they all share a global namespace. Change-Id: I95b3b7fadd8ffc2979ee3aad2234ee543d57c7d8 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Unbundle pdfium librariesAllan Sandfeld Jensen2017-11-071-0/+13
| | | | | | | | | We now have gn flags to request unbundling of zlib and lcms2 in pdfium and can add those to our configure system. Task-number: QTBUG-61746 Change-Id: Iccc4c2a09b7b99121d79348f9e0636785b29f503 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove double declaration of webengine-libxml2 featureAllan Sandfeld Jensen2017-11-071-5/+0
| | | | | | | It is declared twice for some reason Change-Id: I85b03c43909bec2f4f539f9716e188987d869f64 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix configure "native-spellchecker" feature descriptionAlexandru Croitor2017-11-021-1/+1
| | | | | Change-Id: I4d11005b23554ef9e6a860b31d8b3a9741348090 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Fix libxml2 configure feature conditionAlexandru Croitor2017-11-021-1/+1
| | | | | | Change-Id: I874540e9d2f5033fae599e543fb398e7b1ad60c4 Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Change spellchecker-related private features into public onesAlexandru Croitor2017-11-021-2/+2
| | | | | | | | | | This is done because qtConfig(spellchecker) is present in an example .pro file, and thus "spellchecker" should be a public feature. Change-Id: Idff977b8d0835b049c4c19dc42c1475d2c55c323 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix enabling testsupport API when private_tests config is setPeter Varga2017-09-291-1/+1
| | | | | Change-Id: Ia58fa1bcb1151c0db061df8cbc8f1bf6dc379805 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix system-zlib configure name collision with coreMichal Klocek2017-09-221-3/+4
| | | | | | | | | | | When -zlib is provided on windows for main configure line the system-zlib feature is forced on webengine. This is not expected since we assume zlib only for unix builds. Prepend 'webengine' for webengine system-zlib feature. Task-number: QTBUG-63367 Change-Id: I983d2e0df0badbaf7a076662ce178009be151406 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix system-harfbuzz and system-png detectionMichal Klocek2017-09-201-2/+3
| | | | | | | Import gui-private to check for system-png and system-harfbuzz. Change-Id: I26fe98ce3de1f6af8015228260e8ef74952e816e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Remove WEBENGINE_CONFIG from configureMichal Klocek2017-09-201-5/+6
| | | | | | | | | | | | | | Do not store flags in qmake.cache with WEBENGINE_CONFIG. Use directly qtConfig values insted. This makes configuration more consistent, simplifies handling and avoids passing values from qtConfig to WEBENIGNE_CONFIG, which then were passed to gn. [ChangeLog] Removing WEBENGINE_CONFIG from qtwebengine configure Change-Id: I1a773fb4bff6d67ad75c237d044998051d92ab51 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Add testsupport to new configure systemMichal Klocek2017-09-191-0/+5
| | | | | Change-Id: I123ce22ea3a3d8b7b80c67fa322cb817d924f2e0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add UI delegates configure optionMichal Klocek2017-09-191-0/+4
| | | | | Change-Id: Ib9d6c8842609c4c410ca65a35fefeab481f71cb2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Move webengine sanitizer option to new configure systemMichal Klocek2017-09-181-0/+10
| | | | | | | Use new configure system to enable sanitizer. Change-Id: I633bc96973b9b9bcd56c4ef03a589e147215dc86 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Migrate configuration lefovers to new configure systemMichal Klocek2017-09-121-17/+316
| | | | | | | | | | | | | Use new configure system for all package detection. Move config test execution to new configure system. However, keep old configure.prf for error hanlding. Split configuration summary into: * optional system libraries used * required system libraries * required system libraries for qpa-xcb (on linux) Change-Id: I5108456caa024a1ada9bb54750693064a2d36f78 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Adaptations for Chromium 60Alexandru Croitor2017-09-111-3/+3
| | | | | | Change-Id: I536258e22c2ec143f2fd3f1cbda229e0611b6af4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Merge branch '5.9' into 5.10Allan Sandfeld Jensen2017-09-061-0/+12
|\ | | | | | | Change-Id: I9fe9946ba47f9ef509a861963c83e275a25fffd0
| * Add detection for system re2Allan Sandfeld Jensen2017-09-031-0/+12
| | | | | | | | | | | | Change-Id: Ifa305045f3594f06b0ee106cd43f9d35853f8958 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Require NSS for linux buildsMichal Klocek2017-09-051-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | OpenSSL certificate validation was dropped in https://codereview.chromium.org/2862543003 Bundled NSS was deopped in https://codereview.chromium.org/1882433002 Task-number: QTBUG-52193 Task-number: QTBUG-62891 Change-Id: I300c13c30a2625bbe56beb0659107d2a395b0a4d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add check for glibc > 2.16Michal Klocek2017-09-051-0/+9
| | | | | | | | | | | | | | | | | | | | Fix broken compilation due to "Unable to create small static TLS block in shared library" https://sourceware.org/bugzilla/show_bug.cgi?id=14898 Change-Id: I53840dbff22f4b10bdb32401f79889f6c313f470 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move NSS certificate handling configuration to configure.jsonAllan Sandfeld Jensen2017-08-041-0/+20
| | | | | | | | | | | | Change-Id: Ibae2b8ebb90e79ff8337d994b2234eed5e230dcc Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Add python check for module buildMichal Klocek2017-07-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Python version check skipped the build only for qt5 root builds, however for module build it only printed the warning and the build continued. Skip the build if python version is incorrect. Change-Id: I72d5f638eb79de93faaaa07b39272bdcb8615c3f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Add Configure-Time Tests for gperf, flex and bisonViktor Engelmann2017-07-051-0/+42
|/ | | | | | | | | | | | Configure-Time tests for presence of (required) gperf, bison and flex are added to configure.pri and configure.json, so that we can decide early on to skip the build, instead of starting a build that will fail much later, yield incomprehensible error messages and make the build of the complete Qt framework fail. Task-number: QTBUG-52805 Change-Id: I7dab49e6e8672b72901519ad7d88de97197fe587 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.9.0' into 5.9Allan Sandfeld Jensen2017-05-291-0/+14
|\ | | | | | | Change-Id: Iba6114263488d6bf84b255b38182904dc5880386
| * Move ICU configuration to new configure systemAllan Sandfeld Jensen2017-05-081-0/+14
| | | | | | | | | | | | | | | | | | The command-line switches is called webengine-icu to avoid conflicting with icu switches in other modules. Change-Id: Ic923a199efbc4081b3c30f0cafa4b7ea786bdb00 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Add "WebEngine" section entries to Qt WebEngine featuresStephan Binner2017-05-081-6/+12
|/ | | | | Change-Id: If305e1f3becbb600e0338a6d1c1a4a9b2c0caf3e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Use qtbase optimize_size configure optionAllan Sandfeld Jensen2017-05-041-7/+0
| | | | | | | | | The optimize-size configure option got landed generally in qtbase, so respond to that instead of doing our own. Change-Id: I8bfcf494a6f0d599bf375ae4ea73ce86ee02216b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Move qmake files to standard locationsAllan Sandfeld Jensen2017-05-021-2/+0
| | | | | | | | | | The tools/qmake directory is a left over from webkit where qmake was but one of many buildsystems. This is not necessary for qtwebengine, so we can instead use the standard locations. Change-Id: I3d126d6627295b113b091f3eabeee25f1c1f6183 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Make python2 usage more robustJoerg Bornemann2017-04-271-0/+20
| | | | | | | | | | | | | | | | | | | | After configuring Qt there will be an error message if a suitable python version could not be found. Add python2 configure test that - first looks for python2 in PATH - then looks for python in PATH - checks the Python version - stores the result in QMAKE_PYTHON2 Use $$QMAKE_PYTHON2 everywhere where we call python. Pass $$QMAKE_PYTHON2 to gn for its exec_script feature. Task-number: QTBUG-60164 Change-Id: I33de1273cbd20a787b3c8889d35280784dbcd5ae Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Make optimize for size a visible configurable optionAllan Sandfeld Jensen2017-04-051-0/+7
| | | | | | | | Can be enabled with --optimize-for-size and is enabled by default for embedded builds. Change-Id: I955fa57804c8b7e80bb82deb83deb94a9e2a7621 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Move opus, webp and ffmpeg to new configure systemAllan Sandfeld Jensen2017-03-081-0/+48
| | | | | | | | Use the new configure system to control if we are using system opus, webp and ffmpeg libraries. Change-Id: I53db66ca1668fc939a51bf7811f967468456b924 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Make WebRTC support configurableAllan Sandfeld Jensen2017-01-311-1/+9
| | | | | | | | | | WebRTC is a big feature that Chromium has left configurable for a long time, we can forward that configurability to our users to allow them control it directly instead of just enabling it on desktop and disabling it on embedded. Change-Id: I4445e2189112205ddf1368bd5e197bab2df92092 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Fix build with 5.8 and make embedded configurableAllan Sandfeld Jensen2017-01-311-2/+15
| | | | | | | | | | Avoid checking features only available in 5.9 directly. This also changes the embedded-build configuration to being a feature that can be set at configure time. Change-Id: I9b42dcf696734a83e5c8d6e1cc07562cbeb3f993 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 22:10:03 +0000