summaryrefslogtreecommitdiffstats
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Use only 'pdbpagesize' linker option for webenginecore debugMichal Klocek2024-02-081-2/+4
| | | | | | | | | | | | | | | | | | | Using 'pdbpagesize' allows to create larger pdbfiles and it is needed for debug builds for qwebenginecore as it gets over 4Gb. However, these files are not yet well supported by older tooling therefore use the setting only for webengine debug build. This allows qtpdf debug builds and webenginecore/qtpdf release with debug info have functional pdb files with older tooling like cdb on windows. Pick-to: 6.6 Task-number: QTCREATORBUG-30308 Change-Id: Icd79a0d36b2f4b7f767d17ed79de3a4cbf96f1b4 Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 2af8c8c0b35bd37ba8df591d928720d2b894e816) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Pass PKG_CONFIG_LIBDIR as gn system_libdir argMichal Klocek2024-02-021-1/+6
| | | | | | | | | | PKG_CONFIG_LIBDIR can be set only during configure time by toolchian file. Therefore, pass it gn as system_libdir arg. Change-Id: I5b97ced2c4915b67d5c43e4718ba64c3df9c255b Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 674732fd8ac62be3fe04ae5333c809a1ebc74285) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Clean up and fix typos in cmake filesPeter Varga2024-01-121-47/+1
| | | | | | | | Pick-to: 6.6 Change-Id: I68e46ec382c4c63c106c545cf6815777954a6afc Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit e6e82804a009394fdccee4e5f37195c9383f2d5a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix mac build with x86_64hMichal Klocek2023-12-211-38/+50
| | | | | | | | | | | | | | | | | | | | | | | | We do not not really support x86_64h on mac with gn, so in case of "-DCMAKE_OSX_ARCHITECTURES=x86_64h" do x86_64 build anyway. Make arch test most strict as we did not really control the outcome. Add some architectures names as they were missing. Fix leaking cpu setting. Clean up toolchain setup which differs based on target os (win,linux,mac,ios,android). Note for some platforms we generate toolchain, for some we used gn provided ones. Fixes: QTBUG-118120 Pick-to: 6.6 Change-Id: Ia6fa8a59f55c1ebf37c10e469172520505214d38 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 3e4bc31ade660878a5040cc39e66687476524774) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add WebEngineDriverPeter Varga2023-12-202-1/+12
| | | | | | | | | | | | | WebEngineDriver is a modified ChromeDriver and provides the same functionality. [ChangeLog][WebEngineCore] Added WebEngineDriver Pick-to: dev Fixes: QTBUG-82046 Task-number: QTBUG-86869 Change-Id: Ib8a40e1f6ca883efa6776c647a5b57d2930593ae Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add crc32 settingMichal Klocek2023-12-091-0/+5
| | | | | | | | | | | | | | | | | | | | | Let's assume user sets march to be armv7, this means we should not compile crc32 simd part of zlib as will fail. Chromium overrides this with armv8-a-aes-crc, however we do not want to do it as it hides the issue. Note there is runtime check for cpu features with zlib but it assumes armv8 architecture. We could add the test as CRC32 intrinsics are only defined in arm_acle.h for armv8 target, however just extract the arm version from compiler flags for now. Change-Id: Ia2ed121873e3dca50f895fc6da517d513196520b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Chromium 116 adaptationsAllan Sandfeld Jensen2023-12-091-0/+1
| | | | | Change-Id: Ie297e6ddef21cda8d71ef3daeaa4bcb82e806911 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Pass clang_version to chromiumMartin Negyokru2023-12-071-0/+2
| | | | | | | It is required from chromium-116 Change-Id: I60f9b5872f2ff4141077da3a00a073ed5fad3f6f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Support pkg-config on macMichal Klocek2023-12-011-1/+1
| | | | | | | | | | | | | The user can compile qt with pkg-config support on mac, in this case and only in this case we should also use pkg-config in qtwebengine. Use pkg-config feature from core. Add missing ldir flags to linker. Fixes: QTBUG-115357 Pick-to: 6.6 Change-Id: I401949a50c8199a7d400455db5fbbb4e0de652b0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Minor. Cleanup cmake STREQUAL and add missing quotation marksMichal Klocek2023-11-271-4/+4
| | | | | | | | | | | | | Add quotation marks to STREQUAL, as cmake uses variable expansion in first place. Note bogus statements like: if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC) where already fixed in previous commits. Pick-to: 6.6 Change-Id: I00d30b2bdf493d4b92b0d45b2804f4132946cfdc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Pass clang_version on macOS sanitizer buildsMichael Brüning2023-11-151-0/+5
| | | | | | | | | | Chromium uses different clang_version numbers, which causes sanitizer builds to look for dependencies in the wrong place. Pick-to: 6.6 6.5 Task-number: QTBUG-114865 Change-Id: I8f6028c550336a9eea3c598d00e7e53e74bbff3a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add android on windows build supportMichal Klocek2023-11-142-9/+25
| | | | | | | | | | | | | | | | | | | | | Add builds for android on windows platform. These are required by qt release scripts to create armv7 targets on windows. Note new 'is_mingw' setting for toolchainis. This required as andorid on windows build use mingw toolchain as a host toolchian. Main gn_arg argument 'is_mingw' is used only for target/default toolchian, in this case gn drops toolchian_args. However toolchain_args are evaluated in case of secondary/host toolchain. Override v8 snapshot toolchain to avoid pulling windows (msvc or clang) toolchains and creating yet another set of toolchain targets. Task-number: QTBUG-83459 Change-Id: I927872d69e363277b9f90c3adda28518d6b6bb13 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Use ABSOLUTE path if QT_ALLOW_SYMLINK_IN_PATHS is enabledAmir Masoud Abdol2023-09-182-5/+16
| | | | | | | | | | | | | When building with symlink allowed, we shouldn't resolve the symlink, and instead use ABSOLUTE path. The `qt_internal_get_filename_path_mode` returns ABSOLUTE only if we are on macOS, and QT_ALLOW_SYMLINK_IN_PATHS is enabled. Otherwise, path_mode will be REALPATH. Pick-to: 6.5 6.6 Task-number: QTBUG-113463 Change-Id: I99b84004781ebf748cb1db2ba068d71a72d0daa4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Use 'ldir' coming from gnMichal Klocek2023-07-131-23/+3
| | | | | | | | | | | | | | | Use 'ldir' response files directly and drop cmake workaround. This also drops cmake FILE_PERMISSIONS which requires cmake 3.21 This change amends 75ae9b61967dc484e91f3dbee435045e63258c84 Task-number: QTBUG-105053 Task-number: QTBUG-111225 Fixes: QTBUG-115033 Pick-to: 6.6 Change-Id: I8d59dca3eaa842939d71727f419f66e3589d6e0a Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Fix path to licenses.pyAllan Sandfeld Jensen2023-07-111-2/+2
| | | | | | Pick-to: 6.6 Change-Id: I7afe79cceb11f8166990cac4470dfc8e44d52b0c Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Adaptations for Chromium 112Allan Sandfeld Jensen2023-07-061-1/+3
| | | | | | Pick-to: 6.6 Change-Id: I1bb84b20a080d7f615bf0795ac2d97739e99ac1d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Adaptations for Chromium 110Allan Sandfeld Jensen2023-07-061-2/+3
| | | | | | Pick-to: 6.6 Change-Id: I56e1695ee4fc2b0e12da6580a5673df80bba8b6d Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Add explicit dependency on thirdparty_sync_headers targetAlexey Edelev2023-06-091-0/+3
| | | | | | | | | | | | | Add the dependency on thirdparty_sync_headers target for gn targets. gn expects 3rdparty libraries like freetype or harfbuzz are in sync and replicate the initial structure from the bundled sources. We need to make sure that _sync_headers targets of 3rdparty libraries are executed before runing any gn tasks. Task-number: QTBUG-113416 Pick-to: 6.6 6.5 Change-Id: Ica77e2a0a04c63906515dddd76dfb8d0868602e6 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add mingw support for QtPdfMichal Klocek2023-06-021-4/+20
| | | | | | | | | | | Compile QPdf for mingw too. Support new is_mingw, is_msvc, is_gcc flags which together with is_clang pass compiler type to gn. Task-number: QTBUG-111362 Change-Id: Ib008f4002f7bb0a1b72f010c531c7e759b72a6bf Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Enable large pdbs by defaultAllan Sandfeld Jensen2023-05-161-0/+2
| | | | | | | | | The current limit is often hit by incremental builds when working on webengine, and it costs us nothing to enable it. Pick-to: 6.5 Change-Id: I3aa96b789e0949637b174be31b5f36315718e201 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Fix build race condition between data_dep and WebEngineCore.stampMichal Klocek2023-05-031-31/+55
| | | | | | | | | | | | | For v8 context generator data_dep race condition occurs on universal builds. As data_dep is runtime dependency, it will be not included into our linker WebEngineCore.stamp, changing the behavior in gn would look ugly as it would require introducing another flag to just to handle this case to force this dependency for build time. Therefore add extra v8_context_snapshot.stamp to cmake to cover that case. Change-Id: Ia8b2320fc8e615235bde483d282dfca73a38f215 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Do not provide v8 snapshot toolchain if not neededMichal Klocek2023-05-031-2/+4
| | | | | | | | | | | | | We should provide v8 snapshot toolchain only in case of cross compilation, otherwise gn can simply use current toolchain for creating v8 snapshot generator. This prevents triggering second pointless build of v8 and blink to generate snapshot of v8 context for desktop builds. Pick-to: 6.5 Change-Id: I214b8b802c6827fbece3b2158f206b65fb768288 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Stop disabling optimization of V8Allan Sandfeld Jensen2023-04-181-1/+1
| | | | | | | | | It is no longer necessary to build successfully, and improves loading times in debug mode. Pick-to: 6.5 Task-number: QTBUG-110504 Change-Id: If2a49fc96aaa113a90d5573371069754da354f7a Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add update-chromium target and unify 'Update Chromium' commitsMichal Klocek2023-04-181-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | To save some typing when doing 3rdparty udpate introduce 'update-chromium' target, which creates commit with nicely formated commit message with shas, it can be used for example with following steps: * qtwebengine repo is at the origin HEAD with nothing stagged * there are some new commits in 3rdparty * code compiles and there are no issues * make update commit by typing in <build_dir> * ninja update-chromium or * cmake --build . --target update-chromium * push the commit You can also create the commit from <source_dir> with: cmake -P cmake/SubmoduleUpdate.cmake Pick-to: 6.5 Change-Id: Ia6b051cd2df0646707c2cc88175245841728794f Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Yigit Akcay <yigit.akcay@qt.io>
* Add check for Nodejs binary versionMartin Negyokru2023-04-171-0/+5
| | | | | | | | | | Webengine fails to build with 32bit Nodejs. It crashes on devtools-frontend/src/scripts/build/compress_files.js. Add configure time check for node binary. Task-number: QTBUG-111852 Change-Id: I80844e36d5ae4621e2dae6fe61de883580b56a57 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Require gn for generating docsMichal Klocek2023-03-302-10/+56
| | | | | | | | | | | | | Make sure gn is build before doc target, otherwise parallel top level build might not succeed. As configure runs the gn binary is not compiled so use scripting mode to execute gn call during build time. Pick-to: 6.5 Task-number: QTBUG-108751 Change-Id: I7e851de90e2a3ec52f5259d51f677b23d8245bcb Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add gn target to code attributions generatorMichal Klocek2023-03-281-0/+25
| | | | | | | | | Use gn_target for code attributions generation. Task-number: QTBUG-88482 Pick-to: 6.5 Change-Id: I4e5d063dec2347c10eb715a467bdd376e39e60af Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Pass system library paths to cmakeMartin Negyokru2023-03-011-2/+24
| | | | | | | | | | | | Generate a new rsp file for each cmake target containing '-L' flags and pass them to cmake. Task-number: QTBUG-105053 Task-number: QTBUG-111225 Change-Id: Ib25c009795b776bc5f0f6e07fb89b932ef30b484 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit a21742ef6064c1e84ebc43468d253dd14d86bf02) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add QtPdf android supportMichal Klocek2023-02-231-1/+12
| | | | | | Task-number: QTBUG-83459 Change-Id: I39915206859f031dd78798eeb7b2b49f4f148452 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Retire the qt_parse_all_argumentsAmir Masoud Abdol2023-02-081-11/+24
| | | | | | | | | | | To do so, we need to deal with the macros a bit differently, so here, I replaced the macros with available utility functions, and added one for the QTWEBENGINEPROCESS_NAME. Fixes: QTBUG-110873 Task-number: QTBUG-99238 Change-Id: I29b41ffb8059511d2d93bfc01d40308aedaa8ad4 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Adaptations for 108-basedAllan Sandfeld Jensen2023-01-061-2/+2
| | | | | | | Pick-to: 6.5 Fixes: QTBUG-105147 Change-Id: I0022964903f3443cc97843c62468ab9be8ae2ed8 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* CMake: accept known valid 32 bit host architecturesRolf Eike Beer2022-09-151-1/+3
| | | | | | | | | | | | | | When trying to cross-build from one 32 bit host architecture to another the "Unsupported architecture:" case was hit, in which case the result of get_v8_arch() was empty. This would lead to configure_gn_toolchain() being called with a missing argument, which gave a totally unhelpful error message. Fix this by just accepting valid 32 bit architectures from the internal list, and raise the debug message to a FATAL_ERROR to get immediate feedback. Pick-to: 6.4 6.3 Change-Id: I8e0c757ad13e2acff67827bd9063c493e9d84444 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Use delay load for media foundationMichal Klocek2022-09-121-0/+1
| | | | | | | | | | | | | | | | | | | We should delay some dll loads as MediaFoundation is not available on Windows N. Chromium already uses that option when compiling components, however we use only response file to track dependencies, and those libs were never linked with DELAYLAD flags by (qt)cmake. There is currently no nice way to set those base on gn dependencies as those are generated on bulid time and we need linker flags on configure time. As workaround simply hardcode those 3 required libs, as side effect when linking QtPdf module there will be warning that there are no references to mentioned media foundation libs. Pick-to: 6.4 6.4.0 6.3 Fixes: QTBUG-100391 Change-Id: I06e4bffdf8bc6803a4f2b1437679628b9a733299 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Increase timeout for gn callShawn Rutledge2022-09-061-1/+1
| | | | | | | | | | It could be that 300 seconds is not enough on some machines. Amends dfa58067e31e77e20f0cd25f408e248c8ff82cf4 Pick-to: 6.4 Fixes: QTBUG-105168 Change-Id: Ice3fe6a68fe1969c21e001169bfba2d9dbdec770 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-08-268-8/+8
| | | | | | Task-number: QTBUG-105718 Change-Id: I2ad190e5536cdbdc8d2656e61892545d66911a02 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Fix debug build on armMichal Klocek2022-08-241-1/+4
| | | | | | | | We need --long-plt for arm debug builds. Pick-to: 6.4 6.3 Change-Id: I99fa6a2f8ec803cc399509d02a5cc9ad22fd0f87 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* add riscv64 support in cmake/Functions.cmakeMoody Liu2022-08-081-0/+4
| | | | | | | | do note that chromium itself still needs additional patches to compile on RISC-V 64, but on the Qt side, this is enough. Change-Id: I3b214fc5f4a286a665c85556892e553258b52cf5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Adaptations for Chromium 102Allan Sandfeld Jensen2022-08-041-1/+3
| | | | | | Pick-to: 6.4 Change-Id: I7ef0ad616f2ea0fae482253335e95998aa2d360e Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Adaptations for Chromium 100Allan Sandfeld Jensen2022-08-041-1/+0
| | | | | | Pick-to: 6.4 Change-Id: I217c87657f544a2e868de7291353ff1143e20902 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix typoAllan Sandfeld Jensen2022-07-141-1/+1
| | | | | | Pick-to: 6.4 6.3 Change-Id: If92ff1afdaee5096bc3ce8e53332542b8c4375b6 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Add license headers to cmake filesLucie Gérard2022-07-078-0/+24
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I118bd63694cfe2c9a413af4a38828a31727f8e86 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Fix unsupported @file notation on macos archiverMichal Klocek2022-06-071-7/+26
| | | | | | | | | | | Create intermediate object file and use it as imported object library. Fixes: QTBUG-103579 Change-Id: I2ff7d57509ab1f071876de3b6fdc5ed9874c4697 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 88a91f8b30df1b95cf9adebacb13a8c0fc3f06c9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add workaround for unstable gn on macOS in ciMichal Klocek2022-05-032-0/+5
| | | | | | | | | | | | | | | | | | | | | | | In ci 'gn' can crash making it hard to integrate, if there is high load crashes occur more frequently sometimes even blocking integrations for few days. Limit number of worker threads for gn as this improves situation however increases time for generating ninja files from 2s to 7s. Note this will not prevent crashes however significantly reduces the issue (when running in loop from 1 per ~10min to 1 per ~3days) Compilation with address or thread sanitizer does not lead to meaningful traces. Moreover running gn with sanitizer creates deadlocks for unknown reason every few runs. Current assumptions is that macos vms are unstable as crashes also occur for sscache calls (compiler) and python calls. Pick-to: 6.3 6.2 Change-Id: I1c488796eb0547eedd20101606f18ed55718e9c2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Check for stdlib_libcpp feature as it might not existMichal Klocek2022-05-011-3/+7
| | | | | | | | Fixes undefined feature when compiling against 6.2. Pick-to: 6.3 Change-Id: I186d0a0905bfb7d03cff07c2dd6316172efebc04 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Support cross-compilation on macOSMichal Klocek2022-04-301-15/+17
| | | | | | | | | | | | | | | | | | | | | | So far we only supported a cross-compiling with universal builds, however qmake also supports 'regular' cross compilation (by setting '-device-option'). This is semi-supported with qt-cmake as we need to provide additional configure defines like: * CMAKE_OSX_ARCHITECTURES=arm64 * CMAKE_SYSTEM_NAME=Darwin * CMAKE_OSX_DEPLOYMENT_TARGET=10.14 It might seem to be a far fetched issue, however in case of webengine doing the cross compilation for only one architecture allows to save compile times when testing only arm64 builds. Note we do not need to create gn toolchains for that case, however unlike universal builds it requires host qt build for tools. Pick-to: 6.3 6.2 Change-Id: Ica8470fdd4cad4866c1470e0403ffd019eaf39a6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Add a dependency on Gn.cmakeAlexandru Croitor2022-04-201-2/+5
| | | | | | | | Previously if Gn.cmake was touched, GN was not reran. Pick-to: 6.2 6.3 Change-Id: I39a070319c5af2a78a8f4e75f2f56ed87cdcb7da Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* CMake: Don't show gn output as it runs, show it after it finishedAlexandru Croitor2022-04-201-1/+0
| | | | | | | | | | | | | | | | | | Using USES_TERMINAL causes ninja to print the stdout of running GN as it comes in, rather than once GN has finished running. This causes extremely confusing logs in the CI when the GN run fails. The output becomes interleaved with execution of other parallel commands and the Ninja 'FAILED:' message is nowhere near the actual failure GN failure message. Remove USES_TERMINAL so that the GN failure message appears immediately after ninja's "FAILED:" message. Recursive ninja output is not affected. Pick-to: 6.2 6.3 Change-Id: Ibbfe5527cf291d9295ae19d988ee1fa83224b38b Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix build with libc++Qt Submodule Update Bot2022-04-071-0/+3
| | | | | | | | | | | | Fix build with libc++ on linux by adding missing use_libcxx parameter. Check if re2 and poppler can be used as they use std::string in their api. Add compiler test to check that. Pick-to: 6.3 6.2 Change-Id: I74bf79b8443ad470621c1a2e0c9dc768d4cca1f1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Pass the python executable to gnDimitrios Apostolou2022-03-232-1/+1
| | | | | | | | | | | | | This way the python scripts configured by gn_configure will use the same python version detected by the initial configure_submodule. This is useful when configuring separately and under different environment than the build itself, and the different python executables possibly used in the two phases cause issues, like modules not found. Pick-to: 6.3 6.2 Change-Id: Iab7cc48c2bb4f8c7fb4af7965c1183388a53527b Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add static builds for qtpdfMichal Klocek2022-03-092-20/+44
| | | | | | | | | | | | | | | | | | Add 3rdparty installed headers so static builds can use bundled qt libs. Fix static gn and archiver/librarian setup. Updates 3rdparty: * 5d88de975 Fix static build with qt3rdparty libs Task-number: QTBUG-87154 Task-number: QTBUG-88614 Pick-to: 6.3 6.2 Change-Id: Iad7682da92b558b500140f415acc0bc9c9a1c22e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 18:30:58 +0000