summaryrefslogtreecommitdiffstats
path: root/src/buildtools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devMichael Brüning2020-07-281-2/+1
|\ | | | | | | Change-Id: Ie9970a657f7693c190405039c9b713e24dbd4041
| * Do not evaluate NINJA_TARGETDEPSMichal Klocek2020-07-271-2/+1
| | | | | | | | | | | | | | It is just a file path. Fixes qmake linking when chromium changes. Change-Id: Ib2f0976a6dc3c90c415b69e1876706bc2397d134 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Merge remote-tracking branch 'origin/5.15' into devMichael Brüning2020-07-244-12/+95
|\| | | | | | | | | | | | | | | | | Conflicts: src/core/compositor/delegated_frame_node.cpp src/core/core_chromium.pri src/core/render_widget_host_view_qt.cpp Change-Id: I9387151e9647c87fc387095e7b6d8d66560cdf71
| * Cleanup linking param order and prl generationMichal Klocek2020-07-231-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When doing builds we use rsp files also for archives. For static builds this would require to install rsp file. Since static builds are possible only for qtpdf with small amount of archives simply do not use rsp files for archives. Cleanup linker parameters so prl files do not point object rsp files (do not use LIBS_PRIVATE in that case). Task-number: QTBUG-85616 Change-Id: I165610e418f162c16fcfa7056af3344b80f60c05 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Share linking config between webenginecore and pdfMichal Klocek2020-07-231-0/+53
| | | | | | | | | | Change-Id: Ib06a0a1ec3372d483008cc0ac0ec211ec8316e0e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Move webengine-noexecstack to buildtoolsMichal Klocek2020-07-231-0/+10
| | | | | | | | | | Change-Id: I854034fd63c8847867fd7ec01d5c25781e7de5ef Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix platform support for qtpdf on iosMichal Klocek2020-07-212-12/+9
| | | | | | | | | | | | | | | | Add missing check for ios. Change-Id: I7fce6addb154ea83b8308094d5a6c4275d050d9b Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix building with xcode 10Allan Sandfeld Jensen2020-07-071-0/+1
| | | | | | | | | | | | | | Doesn't support -ftrivial-auto-var-init=pattern Change-Id: Id998b775cd51f13395c69fafd46c6ec5e997ef5b Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-06-298-287/+226
|\| | | | | | | | | | | | | Conflicts: src/src.pro Change-Id: I03c260ba676296f93d8137e79b46f3978f5f41ef
| * Do not build on qnxMichal Klocek2020-06-122-5/+13
| | | | | | | | | | | | | | It seems that coin on qt5 merge tries to build qtpdf on qnx Change-Id: Ife42dbf0484b1f0151e9c487467898c5c2567c4a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Split errorChecks for webengine and pdfMichal Klocek2020-06-032-69/+170
| | | | | | | | | | | | | | Separate error checks, so qtpdf can have own dependencies. Change-Id: I9e538b875fe67448497f10dcd45c83782d98da2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Minor. Update error checks in windows.priMichal Klocek2020-05-291-2/+2
| | | | | | | | | | | | | | These are also used by QtPdf. Change-Id: Ia8527c9c6bd6fe682cd79d3e980838388d0dcdc9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Add static linking for qpdf for all platformsMichal Klocek2020-05-291-1/+0
| | | | | | | | | | Change-Id: Ie222d56c52f5ca474809b2bc864618e5b3e9a1f2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Move sanitizer to buildtoolsMichal Klocek2020-05-281-0/+16
| | | | | | | | | | Change-Id: I1531199bb15b9d05e5c017d14fce07d39625cafe Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Move arm-thumb feature to buildtoolsMichal Klocek2020-05-282-5/+10
| | | | | | | | | | | | | | | | | | 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-1/+0
| | | | | | | | | | | | | | This feature is already in buildtools. Change-Id: Iff5d5cc4b72b29b850e8e4cb11b90251916ed9c7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Move pdfium zlib and png configs to buildtoolsMichal Klocek2020-05-281-0/+9
| | | | | | | | | | | | | | | | Adjust config so we use pdfium in webengine not only with printing. Change-Id: I1c4b263e89a993bde84b92872a5ad1d6d48cedbb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Split gn args for pdf and webengineMichal Klocek2020-05-286-206/+0
| | | | | | | | | | | | | | | | | | Currently we run gn with same sets of arguments for pdf and webengine. Split those so we can make fine grain configuration and drop some requirements. Change-Id: I40890b5475dddadd0798ea091ca5e7143fd952b3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Add missing checks to configureMichal Klocek2020-05-282-8/+16
| | | | | | | | | | | | | | | | | | | | During tossing wip-qtpdf across 5.14 and 5.15 some checks got skipped. Fix configuration. We share error messages between configure and make steps. Change-Id: I15e4a66adc62f06c403487c8a4eb8925ce260447 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-05-152-25/+2
|\| | | | | | | | | | | | | Conflicts: src/pdf/quick/qquickpdfselection_p.h Change-Id: I6eec37a01347c2d47cbfc1114326dfc6b58719ff
| * Remove xkbcommon hackAllan Sandfeld Jensen2020-05-132-19/+2
| | | | | | | | | | | | | | | | | | We fixed Chromium to compile with the right include paths, and the system package is already required by QtGui. Fixes: QTBUG-83693 Change-Id: I8256e67cf0fca3aa71df6d6bad1b13436c689b8a Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Fixup xkbcommon testAllan Sandfeld Jensen2020-04-231-9/+3
| | | | | | | | | | | | | | | | It needs to be includable without using special include path. Task-number: QTBUG-83693 Change-Id: Ibdee6ff00fde66a9de970bbaba9282c42e420c6b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-04-275-62/+45
|\| | | | | | | | | | | | | | | Conflicts: configure.pri src/pdf/api/qpdfpagerenderer.h Change-Id: I7e68277080e29238bbfe8511539ea75b2db89489
| * Fix macOS build after 10.15.4Peter Varga2020-04-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMAKE_MAC_SDK_VERSION is set by /usr/bin/xcrun --sdk macosx --show-sdk-version in qtbase/mkpecs/features/mac/sdk.prf From 10.15.4, xcrun outputs the SDK version in Major.Minor.Patch format instead of Major.Minor. mac_sdk_min gn arg is expected to be in Major.Minor format, therefor pass only the first 2 revision numbers to gn. Fixes: QTBUG-83318 Change-Id: I3af523dd5df8149fb5cd57b259c2bed889db88b5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Adaptations for Chromium 80Allan Sandfeld Jensen2020-04-074-60/+34
| | | | | | | | | | Change-Id: Icaf68648cbc2c13a61fc3b208ff1e64ca36c90b6 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| * Detect newer msvc 2017 and 2019 cross compiler for full debug infoKirill Burtsev2020-03-261-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Latest build tools installed with prefixes like: VC\Tools\MSVC\14.16.27023\bin\HostX64\x86\cl.exe VC\Tools\MSVC\14.24.28314\bin\Hostx86\x64\cl.exe where last part (x86 or x64) corresponds to target architecture and its parent directory (HostX86 or HostX64) to actual version of the compiler binary. Detect 64bit binary compiling for 32bit to allow activation of full set of debug symbols with force_debug_info. Change-Id: I1044203764ee0bec9dbc983448dcbf595217498d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-03-178-45/+192
|\| | | | | | | | | | | | | | | | | | | | | 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
| * Adaptations for Chromium 79Allan Sandfeld Jensen2020-02-281-6/+1
| | | | | | | | | | | | | | | | Fixes: QTBUG-80737 Fixes: QTBUG-81556 Fixes: QTBUG-81614 Change-Id: Ie6a69cdbf46d0508bff226f1b8fed28a618e1949 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Adaptations for Chromium 78Allan Sandfeld Jensen2020-02-283-9/+9
| | | | | | | | | | | | | | | | | | | | Including removal of renderer service. [ChangeLog][QWebEngineSetting] XSS Auditing has been removed, and XSSAuditingEnabled no longer has any effect. Change-Id: I0835e2a76551057f3eea30a343e0373b642192f0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Do not build webengine on iosMichal Klocek2020-02-211-1/+2
| | | | | | | | | | Change-Id: I21391ef9f5ea9c93227c1a8a64bcd1e5a5e20ad4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix typo in error reporting for winMichal Klocek2020-02-121-1/+1
| | | | | | | | | | Change-Id: I5097aa17617738b4db8c0fe7717b32be2a0efd8f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Merge remote-tracking branch 'origin/wip/qtpdf' into 5.15Michael Brüning2020-01-278-28/+176
| |\ | | | | | | | | | | | | | | | | | | Initial merge of QtPdf into QtWebEngine. Fixes: QTBUG-69519 Change-Id: I48dc25a59f2c161bb231bd0fa60392eb70fe4e7d
| | * Add missing check when doing qpdf buildMichal Klocek2020-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | We need this, since 5.15 branch adds webrtc check. Change-Id: I40b63bf38ed57562562305d34f9f5ce96dec31dd Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * Do not share pdf features with webengine-coreMichal Klocek2020-01-273-42/+38
| | | | | | | | | | | | | | | | | | | | | | | | The pdfium build for qtwebengine should not use features set for qtpdf. Change-Id: Ibee97b774dda7e9157cadf28aa4a7a862bcba8ed Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * Add fat lib build support on iosMichal Klocek2020-01-172-19/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fat builds disable NEON for arm, therefore when doing release setting CONFIG-=simulator is preferable. Task-number: QTBUG-77931 Change-Id: I59c99f2a38dbc83d15940a691c17277175b5b935 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * Add support for qtpdf ios buildsMichal Klocek2020-01-171-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Factor out qtpdf-support out of core-supportMichal Klocek2020-01-172-9/+40
| | | | | | | | | | | | | | | | | | | | | | | | Make static builds available for ios. Task-number: QTBUG-77931 Change-Id: Id122190f51f03f782fd0ee1c897e5b4ff891f703 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * FIXUP: fix broken rebase of configure.jsonMichal Klocek2020-01-171-23/+0
| | | | | | | | | | | | | | | | | | | | | Remove duplicated features. Change-Id: I0dafd6ae0a5d545d2fed12044499d891c84f80bd Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * Fix compilation on windowsMichal Klocek2020-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since 5f9e2f01e we check for spellchecker on windows. Add missing build support check. Change-Id: Id53276f6e4e4260832c57181f05822fff274dd04 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * Add configurable v8/xfa support to qtpdfMichal Klocek2019-11-251-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without v8/xfa support, compilation drops to ~650 files. Disable v8/xfa by default. Enabling v8 enables all xfa support. For example to enable full xfa support without xfa-tiff: qmake <src> -- --feature-pdf-v8 --no-feature-pdf-xfa-tiff Change-Id: I0525c22ed6ed84d5837ab9a238ef2c4219339895 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * Add platform and architecture checks to configure for qtpdfMichal Klocek2019-11-251-1/+8
| | | | | | | | | | | | | | | | | | | | | For now follow webengniecore requirements. Change-Id: I7260b593e6489f51970b1a4c9dc6cd92067a085c Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * Add QtPdf and QtPdfWidgets modulesMichal Klocek2019-11-254-18/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-74602 Change-Id: I8ba358e03472e58c40363fede56e87dfd665ae83 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Enable Windows sandboxAllan Sandfeld Jensen2019-12-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable sandboxing on Windows. Enable heterogeneous sandbox symbol resolution and statically link the sandboxing code into the helper process. This means we have two copies of the sandboxing code, one statically linked in the executable and one in the shared library. Since they are not exported they don't conflict, but we need to take to initialize the right version in the helper process binary, and pass its sandbox interface to shared library using it. For sandbox debug output, we also need to initialize the second copy of the commandlineparser and logging system. Fixes: QTBUG-51170 Change-Id: I8f503c8d6b40674465f32772ef906817dad2b449 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
| * | Fix typo of gn parameter for clang-clYuhang Zhao2019-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | When I try to compile Qt WebEngine through clang-cl + lld-link, gn complaints about the unknown parameter "use_ldd" and suggest to use "use_lld" instead. Change-Id: Id996699616db4eb0c67feaa29749a070465fc44c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Re-enable X11 WebRTC support for desktop sharingAllan Sandfeld Jensen2019-11-221-0/+1
| |/ | | | | | | | | | | | | | | | | With corresponding fixes in chromium, we should now again be able to support WebRTC desktop sharing with X11. Fixes: QTBUG-80055 Change-Id: If1ce50fe8e83d2c5086c6735d205bc4ca424746d Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* / Allow specifying ninja command to use with $NINJAMichael Forney2020-01-222-5/+7
|/ | | | | | | | | | | | | | 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-1/+1
|\ | | | | | | Change-Id: I6ab2e949cb2fa3b2db55a1654d42667db6257eab
* | Update minimum requirement for ICU version to 64Kirill Burtsev2019-10-231-2/+2
| | | | | | | | | | | | | | Set it according to V8_MINIMUM_ICU_VERSION define. Change-Id: If41bb7067570bfc825a214f92883bd0e0caca681 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Leave DCHECKs on when configured with -force-assertsJüri Valdmann2019-10-211-0/+2
| | | | | | | | | | Change-Id: I92d84285f7b5dcfe4178b2ed393f192c161c57c7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 12:15:01 +0000