summaryrefslogtreecommitdiffstats
path: root/configure.pri
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-02-171-0/+1
|\ | | | | | | Change-Id: Idee0142b0e33fdf8ca663f1ef1bcd8b932985043
| * Feat support mips64el platform CPU(loongson 3A4000)Ma Aiguo2021-02-101-0/+1
| | | | | | | | | | Change-Id: I794eed65730b8a054df8ebcf666401fd266c59c2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-01-251-12/+15
|\| | | | | | | | | | | Including update to 87-based Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6
| * Update minimum windows sdkMichal Klocek2021-01-181-2/+2
| | | | | | | | | | | | | | 87-based requires 10.0.19041 windows sdk. Change-Id: I9c6d09e85836367ebcf9fbb2b8b4d574180d7de5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Remove configure options that doesn't workAllan Sandfeld Jensen2021-01-151-10/+0
| | | | | | | | | | | | | | They are just confusing users. Change-Id: I107b4212e425e77b892c1ce77ee0fbfb89a97c7f Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Adaptations for Chromium 87Allan Sandfeld Jensen2021-01-131-0/+13
| | | | | | | | | | Change-Id: Ic4ffd98e02f986dbaf986405360e727c813e696e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-12-111-3/+10
|\| | | | | | | Change-Id: Id1a1f4ca84697ba18e2604090e3154295fe1858b
| * Fix building against 5.12 on most CIsAllan Sandfeld Jensen2020-12-081-3/+10
| | | | | | | | | | Change-Id: I4c4bbc75b9f6346a446f8094f669d142f76c164a Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-06-291-30/+44
|\| | | | | | | | | | | | | Conflicts: src/src.pro Change-Id: I03c260ba676296f93d8137e79b46f3978f5f41ef
| * Detect the presence of host node.jsAllan Sandfeld Jensen2020-06-231-0/+13
| | | | | | | | | | | | | | | | Allows building with or without it. Fixes: QTBUG-83729 Change-Id: I88d784e3230208e1268491c6ae0a4ebf1543aac8 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Split errorChecks for webengine and pdfMichal Klocek2020-06-031-30/+31
| | | | | | | | | | | | | | Separate error checks, so qtpdf can have own dependencies. Change-Id: I9e538b875fe67448497f10dcd45c83782d98da2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-04-271-9/+8
|\| | | | | | | | | | | | | | | Conflicts: configure.pri src/pdf/api/qpdfpagerenderer.h Change-Id: I7e68277080e29238bbfe8511539ea75b2db89489
| * Update build requirementsAllan Sandfeld Jensen2020-04-151-8/+7
| | | | | | | | | | | | | | Update to requiring macOS 10.13 and Xcode 10. Change-Id: I50aae730096da76e8917041211e7c143a69941eb Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| * Merge branch '5.14' into 5.15Allan Sandfeld Jensen2020-03-261-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp Change-Id: Idbc9d3b06c0052a721c974fbcbfa3164faaead14
| | * Support build with system ninja >= 1.10.0Kirill Burtsev2020-03-111-1/+1
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-82715 Change-Id: I9a269efa20d092f75a8a43cb20d1e0dc0f46b9f9 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-03-171-5/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blacklists tst_Accessibility::focusChild() for now. Conflicts: src/core/api/core_api.pro src/core/net/plugin_response_interceptor_url_loader_throttle.h src/process/process.pro Change-Id: I95821a3851120dc16673f4c760e802952eae5c41
| * | Add support for qtpdf ios buildsMichal Klocek2020-01-171-5/+8
| |/ | | | | | | | | | | | | | | | | | | Fix platform checks, add initial gn args, use shared library template for gn to get all the linker objects. This is just debug build. Task-number: QTBUG-77931 Change-Id: I9b3f7d3440aec66433ed19f4976e14506fba45dd Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* / Allow specifying ninja command to use with $NINJAMichael Forney2020-01-221-2/+8
|/ | | | | | | | | | | | | | This was previously supported with $NINJA_PATH until 15a38cb0, when the system-ninja test was added. However, since $NINJA seems to be the more common environment variable for this purpose, use that instead. This allows the builder to use a specific ninja version, or an alternative implementation like samurai[0]. [0] https://github.com/michaelforney/samurai Change-Id: Ib3206ce5032be1ccf2a98b45783e12afebb4949e Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge branch '5.13' into 5.14Allan Sandfeld Jensen2019-10-301-5/+0
|\ | | | | | | Change-Id: I6ab2e949cb2fa3b2db55a1654d42667db6257eab
| * Activate extensions on Linux for GCC version 5.3.1 as wellMichael Bruning2019-10-181-5/+0
| | | | | | | | | | | | | | | | | | | | 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>
* | Adaptations for Chromium 77Allan Sandfeld Jensen2019-10-111-2/+2
| | | | | | | | | | | | Fixes: QTBUG-77267 Change-Id: I181e24cf80ebee6991b95dde6c636f0d169b40a4 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Set default jumbo build merge limit to 8Michal Klocek2019-09-271-4/+8
| | | | | | | | | | | | | | | | If not specified otherwise use 8 as merge limit. Reuse cached value for report call. Change-Id: I78b3832b45c787f2ab0dcc9b41b6bb9e76c9c08c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Clean up platform testsMichal Klocek2019-09-191-4/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | Make it a private feature so test is not run twice. The better solution would be to split the platform test into separate tests in configure, but it looks like a lot of boring typing and would result in bunch on private features. Instead run test only on configure step and in case of fail just export the error, so it is reported during configure and make calls. Change-Id: Ice1188631a53fe739569de3e303533b18342941a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Clean up architecture support testMichal Klocek2019-09-191-6/+7
| | | | | | | | | | | | | | Make it a private feature so test is not run twice. Change-Id: I1dcea41edf5dbc6992e76991d92278a5a5c13e55 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | FIXUP: Fix top level build againMichal Klocek2019-09-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | When we are doing top level build QTWEBENGINE_ROOT/QTWEBENGINE_ROOT_OUT is not present at configure step, therefore add two ways of calling checkError, one for configure time and one for make call. Fix typo in submodule's condition. Add a poor man's workaround for this test. Change-Id: Ie95ab9ffe262a45c7e1ea49e4795d142b7df716a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Unify error reporting for configureMichal Klocek2019-09-191-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | FIXUP: Fix platforms check for topLevel buildMichal Klocek2019-09-191-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | In case of a top level build configure.pri is not able to load platform.prf. Move platform.prf to platfrom.pri and use include instead. Fix not loaded qconfig.pri with gcc versions. Make sure there is no function name collision. Change-Id: I2c9994197dc56371fd7ef215ab350aebb89ff701 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Add platform and architecture to configureMichal Klocek2019-09-171-0/+22
| | | | | | | | | | | | | | | | | | | | Make configure system aware of platform and architecture checks. Task-number: QTBUG-75840 Task-number: QTBUG-76606 Change-Id: I8d2c9dd863ee2c4a3015ad8147f43dc788cfd72d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move gn configs out of coreMichal Klocek2019-09-071-1/+1
| | | | | | | | | | Change-Id: Ib047e35191faa627211c759bff4e81bfaec3d685 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move main configure and move some tests from core to buildtoolsMichal Klocek2019-09-071-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+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-1/+15
|/ | | | | | | | | | | | | | | | | | | | | | | | | 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 more robust glibc testMichal Klocek2019-05-271-20/+0
| | | | | | | | 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-2/+2
| | | | | | | | | | | | 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-05-241-3/+5
|\ | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/net/network_delegate_qt.cpp tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp Change-Id: Ib715b3047213583e0441b915d3cabb801d9d4ba8
| * Fix detection of the webengine-arm-thumb featureJoerg Bornemann2019-05-211-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure tests must run in a clean environment. That's why functions that are defined below the mkspecs directory are discarded during the configure run. As a result, extractCFlag could not be found when running qtConftest_hasThumbFlag. This patch moves extractCFlag to src/core/config/functions.pri. Also, extractCFlag gets a qtwebengine_ prefix to avoid collisions with functions defined in other modules. The alias extractCFlag in functions.prf lets us use the old function within QtWebEngine itself. Fixes: QTBUG-75748 Change-Id: I6be613fbc569d5f7b3c145ef44b9a7be8e2ecb9d Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Use QMAKE_GCC_MAJOR_VERSION to check GCC version for extensionsFlorian Bruhin2019-02-151-1/+1
| | | | | | | | | | | | | | | | | | At least on my system (Archlinux with a qt5.git super-build), QT_GCC_MAJOR_VERSION seems to be unset when the test is run, causing it to fail and extensions to be disabled (despite using GCC 8). Change-Id: I384c6ebbbbe7245f41d014cd2f7aeca2fec73073 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Add extension system and PDF viewer to Qt WebEngineMichael Brüning2019-02-011-0/+5
|/ | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Add check for thumb instruction setMichal Klocek2018-11-211-0/+18
| | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-09-271-0/+8
|\ | | | | | | | | | | | | | | | | Conflicts: configure.json configure.pri src/3rdparty Change-Id: I2e0614b33596fe66999508556c464ed84acc8e2f
| * Check if windows has 64 bit compilerMichal Klocek2018-09-261-0/+9
| | | | | | | | | | | | | | Task-number: QTBUG-68462 Task-number: QTBUG-70728 Change-Id: I4314bce427555504cb49de93af45c910de554479 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Print macOS toolchain info when configuring WebEngineAlexandru Croitor2018-07-111-0/+26
|/ | | | | | | | | | | | | It's not always easy to determine what Xcode / clang version is used when building WebEngine in the CI. Same for the OS version and other toolchain details. Print out the values at QtWebEngine configure time. This will also help us when users provide build logs. Change-Id: I413a6c5b6efb42c4411268ca46d07c2fb9b85cc3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Simplify libxml2 system compatibility detectionMichal Klocek2018-04-121-10/+0
| | | | | | | 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-1/+1
| | | | | | | | | | | | 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>
* Add pkg-host wrapper scriptMichal Klocek2018-01-231-0/+14
| | | | | | | | | | | | | | | 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-14/+20
| | | | | | Task-number: QTBUG-64726 Change-Id: Ic88eed62e85ad1d95afcbd154c6556509e42bd47 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Adaptations to 61-basedAllan Sandfeld Jensen2017-10-251-1/+1
| | | | | Change-Id: I5cb198445f283c6cea8187a1a2883896df0ee918 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix pkg-config call in icu testMichal Klocek2017-09-201-1/+1
| | | | | | | | The call had the side effect of generating extra pkg-config-wrapper.sh in root of the build. Use different pkg-config call. Change-Id: I8335ae55547272924802f3903ce6bba903389b62 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add testsupport to new configure systemMichal Klocek2017-09-191-0/+5
| | | | | Change-Id: I123ce22ea3a3d8b7b80c67fa322cb817d924f2e0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Move webengine sanitizer option to new configure systemMichal Klocek2017-09-181-0/+89
| | | | | | | Use new configure system to enable sanitizer. Change-Id: I633bc96973b9b9bcd56c4ef03a589e147215dc86 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 08:40:14 +0000