summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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. Fixes: QTBUG-100391 Change-Id: I06e4bffdf8bc6803a4f2b1437679628b9a733299 Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 74163a6511278fa8273ca931ffdf9b9b3a8daae6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix busy waiting on streaming QIODevice'sAllan Sandfeld Jensen2022-09-101-5/+6
| | | | | | | | | | | The writable watcher will trigger all the time if we use automatic arming, instead we need to arm it manually when it is needed. Task-number: QTBUG-106461 Change-Id: Ia381db338adb1b1994d1da9b50c6d6ff542ea3e5 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit b30559565cb91501baddea495362101341a0aa22) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Add the git repo URL for the Qt PDF examplesVenugopal Shivashankar2022-09-071-0/+1
| | | | | | | | | | This should enable the readers to access the up-to-date example code. Change-Id: Ie62bdea39d1374b49f1b8f5bf576b27c8f37996f Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit a14c5924d26fa73624269e0d46f914a8ec3471da) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Clean up includes in profile_adapterMartin Negyokru2022-09-072-8/+5
| | | | | | | | Fixes: QTBUG-106241 Change-Id: If345d774651b801362da67ff9d3f80867662b29d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 67a59057b107ed8bea4db818538f4d30b793a90e) Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Update ChromiumMichal Klocek2022-09-061-0/+0
| | | | | | | | | | | | | | | | | | Pulls in following patches: * 43fa878de98 Disable accelerated_2d_canvas for Intel drivers on Windows * e9e9b18fa2b [Backport] CVE-2022-2857: Use after free in Blink * 1df1a4d9a77 [Backport] CVE-2022-2860: Insufficient policy enforcement in Cookies * 479cb46ed68 Fix endless loop on race condition on qemu startup * 5cca05c6637 Fix crashes of touchTapAndHold on qemu * 39a496fe653 Fix crashes of htmlSelectPopup test on qemu * cee5373e611 Fix crashes of tst_origin on qemu Change-Id: I7db6c6b4d08bb8ebdf859eded9770f6368b6a962 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Copy gn in case for crossbuildMichal Klocek2022-09-061-0/+17
| | | | | | | | | | | | In case of non prefix builds gn should be copied so it can be detected by cross-build from host qt. Change-Id: I02937fc7101c249b22cfa06275c508410f888248 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 84eaa29b881d25f1b7588187b5b74a9da133d430) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix moc's namespace for qquickwebenginesingletonMichal Klocek2022-09-021-1/+2
| | | | | | | | Fixes: QTBUG-106090 Change-Id: If0572c92e5b9fe6ae44c2d93d38dfa0f68289994 Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 945398a4a76245682cd03e45beabd38d766476c3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix debug build on armMichal Klocek2022-08-241-1/+4
| | | | | | | | | We need --long-plt for arm debug builds. Change-Id: I99fa6a2f8ec803cc399509d02a5cc9ad22fd0f87 Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 2454efe018af51c6fc83557fd6e42755de45b79b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebengineQt Submodule Update Bot2022-08-231-4/+4
| | | | | Change-Id: I5a78c6fa141754b255c51f11d9ce4321d573aaa0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebengineQt Submodule Update Bot2022-08-221-4/+4
| | | | | Change-Id: I1062c4e647a131c59ab3c46cccfc6273f1edbf6d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebengineQt Submodule Update Bot2022-08-191-4/+4
| | | | | Change-Id: Ide68ff0991b1ad592bef111836275b5ec34e1478 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.3.3Jani Heikkinen2022-08-191-1/+1
| | | | | Change-Id: I77094b60b95c5f7de03808857823a1cfe0e0a7e1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Conan: Implement 'package_env_info()' in the build recipeIikka Eklund2022-08-181-0/+17
| | | | | | | | | | | | | | | | The qtwebengine needs to pass information about where the QtWebEngineProcess is located for Conan as each Qt package is installed under separate install prefix inside the Conan cache. Locate the QtWebEngineProcess from the installation folder under the qtwebengine install prefix inside the Conan cache. Return a dictionary where 'QTWEBENGINEPROCESS_PATH' points to the located QtWebEngineProcess file. Change-Id: I54da22eae3b0e7cca0b1a19e683f661ccf21d219 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 99a792bdb963b9b425db0f15db3832c50cd937c7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add workaround for un-minimizing QWebEngineView under GnomePeter Varga2022-08-161-0/+4
| | | | | | | | | | | | | | | Gnome WM doesn't send expose event when minimizing then restoring a window. Presumably, due to the missing expose event the top-level QWebEngineView is not redrawn. As a workaround, force to update RenderWidgetHostViewQtDelegateWidget when shown. The workaround is not needed in 6.4 and later because the issue is fixed by 5d1ef38f9 Create a RWHV delegate in core Pick-to: 5.15 Fixes: QTBUG-104763 Change-Id: I4761d670d17f6dbbe3e0de82a00179eb7fd7913c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix build with Qt versions < 6.3.0Michael Brüning2022-08-111-0/+4
| | | | | | | Change-Id: I754bce59da6d735c3a3adb4086b4d08e75c50b3a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 772d86b92bba4c1e63fbb4c555e9a6789991b68c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebengineQt Submodule Update Bot2022-08-111-4/+4
| | | | | Change-Id: I233755c6e86f1655347c2f7a7f8b6d7cac411a24 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add constructor to WebKeyboardEventMartin Negyokru2022-08-091-9/+12
| | | | | | | | | | | WebKeyboardEvent type is needed for devtools protocol. Fixes: QTBUG-105082 Fixes: QTBUG-86871 Change-Id: I17e9b38cae73cac606862cf2361ee878c9ae97ba Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit f2f6e3a3b2e2d30140d9e3d2b21d1eed79f1879a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update ChromiumMichael Brüning2022-08-093-2/+2
| | | | | | | | | | | | | | | | | | | Submodule src/3rdparry 9353f70a..9a838524: > [Backport] Security bug 1333970 > [Backport] Security bug 1343889 > [Backport] CVE-2022-2614: Use after free in Sign-In Flow > [Backport] CVE-2022-2618: Insufficient validation of untrusted input in Internals > [Backport] CVE-2022-2612: Side-channel information leakage in Keyboard input > [Backport] CVE-2022-2613: Use after free in Input > [Backport] CVE-2022-2624: Heap buffer overflow in PDF > [Backport] CVE-2022-2610: Insufficient policy enforcement in Background Fetch > [Backport] CVE-2022-2615: Insufficient policy enforcement in Cookies > [Backport] Security bug 1336014 Fixes: QTBUG-104639 Task-number: QTBUG-105327 Change-Id: I0fa5f068ca49e945449f60a4709b6f94feab3178 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update dependencies on '6.3' in qt/qtwebengineQt Submodule Update Bot2022-08-091-4/+4
| | | | | Change-Id: I8ad6793212e932e3dd3a4678935001c6083535e2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix single process crash when proxy pac is usedMichal Klocek2022-08-064-9/+39
| | | | | | | | | | | | | | | | | | | Using proxy v8 resolver ends up in race condition when render thread tries to evaluate extension handle and v8 proxy resolver evaluates proxy pac script. Disable v8 proxy resolver for single process mode. Issue tracked upstream http://crbug.com/474654 Modify the unit test to catch the crash case, the test loads now network resource but it does not matter as we do not check for failure or success. Fixes: QTBUG-104436 Change-Id: Id3221d1b8b3896f0ced3d0cd7cb9d9eceeb929cc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 1b6633d1ce86eaf43b750a03a785793512e487ed) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add environment variables to specify resources and locales locationsPeter Varga2022-08-052-45/+122
| | | | | | | | | | | | | - QTWEBENGINE_RESOURCES_PATH for resources - QTWEBENGINE_LOCALES_PATH for locales (translations) Fixes: QTBUG-88595 Fixes: QTBUG-78646 Task-number: QTBUG-103760 Change-Id: I9208ab8cc154d89eae6053eb3c50f007be5ffbb1 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit f63f7903c9400b772f9566bc4b8c7d8e527314a9)
* Update ChromiumMichal Klocek2022-08-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty 5f975374..9353f70a: * Fixup for [Backport] CVE-2022-2156 * [Backport] CVE-2022-27406 * [Backport] CVE-2022-27405 (2/2) * [Backport] CVE-2022-27405 (1/2) * [Backport] CVE-2022-27404 * [Backport] Security bug 1287804 * [Backport] Security bug 1340654 * [Backport] Security bug 1334864 * [Backport] Security bug 1340335 * [Backport] CVE-2022-2480 : Use after free in Service Worker API * [Backport] CVE-2022-2477 : Use after free in Guest View * [Backport] CVE-2022-2011: Use after free in ANGLE. * [Backport] CVE-2022-2294: Heap buffer overflow in WebRTC (2/2) * [Backport] CVE-2022-2294: Heap buffer overflow in WebRTC (1/2) * [Backport] CVE-2022-2295: Type Confusion in V8 * [Backport] Security bug 1333333 * [Backport] Dependency for security bug 1333333 * [Backport] CVE-2022-2160: Insufficient policy enforcement in DevTools * [Backport] CVE-2022-2162: Insufficient policy enforcement in File System API * [Backport] CVE-2022-2158: Type Confusion in V8 * [Backport] CVE-2022-2156: Use after free in Base * [Backport] Make base::UnguessableToken::operator!= constant time. * Rewrite array for token/unguessable token Fixes: QTBUG-104636 Task-number: QTBUG-104639 Change-Id: I0612c23bea679a634e30c9f1ce28529e7990fc6d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update dependencies on '6.3' in qt/qtwebengineQt Submodule Update Bot2022-08-031-4/+4
| | | | | Change-Id: I3f90fbef2815e040cf4bfd6fee8a4fbed24f2e0c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebengineQt Submodule Update Bot2022-07-251-4/+4
| | | | | Change-Id: I1aae8557853927d79b61e95f897b577262d90cf8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebengineQt Submodule Update Bot2022-07-201-4/+4
| | | | | Change-Id: I48fc812ee1ebfeaed114db86daf8aebdbcc75b22 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebengineQt Submodule Update Bot2022-07-191-4/+4
| | | | | Change-Id: Iab3fc505112512368ff3b179e8f767978bc5601f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebengineQt Submodule Update Bot2022-07-151-4/+4
| | | | | Change-Id: I63cd49151a8ab7a0a9a9a0d386ef445743524f0d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix typoAllan Sandfeld Jensen2022-07-141-1/+1
| | | | | | | Change-Id: If92ff1afdaee5096bc3ce8e53332542b8c4375b6 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit 531b9043fd8fc16c607a623de1b9a2129437b192) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebengineQt Submodule Update Bot2022-07-071-4/+4
| | | | | Change-Id: I26c6a35269d8d14abf59777e8c4724754e43ec57 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update ChromiumMichael Brüning2022-07-063-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty 660d61d9..5f975374: > Fix broken bundled zlib for cross compilation > FIXUP: Fix url_utils for QtWebEngine > Bump V8_PATCH_LEVEL > [Backport] Security bug 1316578 > [Backport] CVE-2022-2008: Out of bounds memory access in WebGL > [Backport] CVE-2022-2010: Out of bounds read in compositing > [Backport] CVE-2022-1876: Heap buffer overflow in DevTools > [Backport] CVE-2022-1873: Insufficient policy enforcement in COOP. > [Backport] CVE-2022-1866: Use after free in Tablet Mode > [Backport] Security bug 1318610 > [Backport] CVE-2022-1867: Insufficient validation of untrusted input in Data Transfer > [Backport] Security bug 1306751 > [Backport] Security bug 1306968 > [Backport] Security bug 1303552 > [Backport] CVE-2022-1855: Use after free in Messaging > [Backport] CVE-2022-1857: Insufficient policy enforcement in File System API > [Backport] CVE-2022-1854: Use after free in ANGLE. > [Backport] CVE-2022-1853: Use after free in Indexed DB > [Backport] Dependency for CVE-2022-1853: Use after free in Indexed DB > Make sure we do not compile minizip from 3rdparty > Fix use_system_freetype Task-number: QTBUG-104636 Change-Id: Iddd74315f5efc429c9d910096c5e67d803696777 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Update dependencies on '6.3' in qt/qtwebengineQt Submodule Update Bot2022-07-061-4/+4
| | | | | Change-Id: Ia8bd69a77668d35849371e1290bec81b749bd8e0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Skip uidelegates test on macosAllan Sandfeld Jensen2022-07-051-1/+4
| | | | | | | | | | | | | We have two bugs here, one failing most tests, and one crashing. Skip the entire test on macos until fixed. Task-number: QTBUG-101744 Task-number: QTBUG-103354 Change-Id: Ib56921b8d075ab5874f68fe8c0815c6c0155b5de Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit b257ca2411745deaf8525f88f9bb0707f948763a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebengineQt Submodule Update Bot2022-06-281-4/+4
| | | | | Change-Id: I73ae934b4a8c48f376594c8b6cf588cf86b29bed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix method checkAllan Sandfeld Jensen2022-06-241-1/+1
| | | | | | | | | Detected by codechecker. Change-Id: I8814180ef6bd591ed3e95fc4b4abff3454f10bdf Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 51faba3af76f4a7c67c769a5ab0be17c9aa54f83) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Find modern Chrome, Chromium and Firefox CDM modulesAllan Sandfeld Jensen2022-06-221-5/+48
| | | | | | | | | | The default download location has moved again, but we can now also use firefox CDMs. Task-number: QTBUG-104238 Change-Id: I7ee581fa63e50df970acb31ea6d3f67d332aef59 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit b99042fb839021a0a3d2fe0cac7ac3899c4acbba)
* Minor. Remove superfluous checkMichal Klocek2022-06-221-4/+0
| | | | | | | | | Same check is two lines below. Change-Id: If9a76ec29f7667d940f2cff231bb30facd621908 Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit ddb5528bc3f93f1d09c0e4fc33026ced08edf147) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update docs and do not recommend to use msys2 or cygwinMichal Klocek2022-06-221-0/+2
| | | | | | | | Task-number: QTBUG-102633 Change-Id: I412c10cea98d87ffbbac40baa032261dca12dbf0 Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 89eb58b28e856663cdc1ad59d5fdd60115e801ea) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebengineQt Submodule Update Bot2022-06-211-4/+4
| | | | | Change-Id: Id0ec0ac101f900240796a753f157e8c67e45da75 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Do not use the native dialog to show the color picker on macOSMichael Brüning2022-06-201-0/+4
| | | | | | | | | | | | | With the native dialog, there were either problems with the modality when using it asynchronously or with the life cycle when using it synchronously. Not using the native dialog avoids these problems. Task-number: QTBUG-102099 Change-Id: Icb9a9afda48c47558b8e8ecb6d89adc0961d5063 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 51b024c53ceb43febbded3c14974e9d8f75c1c11) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Bump version to 6.3.2Jani Heikkinen2022-06-201-1/+1
| | | | | Change-Id: I019cc23dfb86754b98822d83ca13971449dc3c7e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.3' in qt/qtwebengineQt Submodule Update Bot2022-06-181-4/+4
| | | | | Change-Id: I964171dae15d3a1584a2317bbaa26bbc726f840c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix accessibility bounds with HighDPI scaling modesAllan Sandfeld Jensen2022-06-181-0/+2
| | | | | | | | | | Disable chromium's uses of zoom for device scale factors. Fixes: QTBUG-101769 Change-Id: I9f2ae7122b59f5fbf8ffcaf8a92940792f4860c9 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit c68fa97934db12486bb12e37d1c70963ded1fd38) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Do not compile v8 for pdf by defaultMichal Klocek2022-06-151-0/+1
| | | | | | | | | | | | We shipped qtpdf for 5.15 without v8. Now it disables all the extra xfa features by default. Fixes: QTBUG-102394 Fixes: QTBUG-102951 Change-Id: Icd4784037f6db9b489d691c15d95e72563c16356 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 165bc962e81735efd7b45a1125c3a0d0c5ab9c8b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Protect against default profile being deleted before its pagesAllan Sandfeld Jensen2022-06-144-3/+13
| | | | | | | | | | Can really only happen in QML on exit. Task-number: QTBUG-99445 Change-Id: I1a04d57b6c4c40ae264b5519d2e41c57bca79a61 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 45c217646e3742070af15267df8fdb40c2a6c81a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Enable static jpeg featureMichal Klocek2022-06-121-1/+0
| | | | | | | | | All required qtbase dependencies has been updated long time ago. Change-Id: Ibcf2b8d5397980d8b51a829b580e12a899ded1f8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit ba4314a4392ac0e86b7d7b47bf5ef01035628db2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix simplebrowser build with Qt 6.2Allan Sandfeld Jensen2022-06-112-0/+12
| | | | | | | | | This is a partial revert of 83e5b3c3e19deedfcad0dcb8116b3e6c931b8f6c Change-Id: I79e814075415585b4d4a3b04a92b3ad84d2dfa53 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 4ffc841ba7e9de4be8b2a2eed95cff5278a708ca) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix printing/no-printing buildsMichal Klocek2022-06-092-1/+6
| | | | | | | | | | If no 'printing' we should also disable 'cups' otherwise it asserts in gn. Moreover we use cups on macos and linux only. Change-Id: Id0c9b34746204e985032d7c42868aeb8567b8e8f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 3f5b5213d42376470274f0e3aaa51731f0d2552a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Pass archiver to gn buildMichal Klocek2022-06-091-0/+1
| | | | | | | | | | | User can override with env variable AR archiver for cross compilation, pass archiver from cmake for gn. Fixes: QTBUG-103578 Change-Id: I055d7403ecb829f4b1bbe57ec27c0bca7323484c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 09a4ad989c815a2aa0fb401011f1ccb50751be72) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix 'flaky' gn install stepMichal Klocek2022-06-091-0/+3
| | | | | | | | | | If gn is found in install path, still install it for qt host otherwise in case of reconfigure we never install. Change-Id: I154e2ead386d52006e2647297b6148170b8a85cb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 80878be4ed0003d996edc01827b5638459a818c8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix build without openglAllan Sandfeld Jensen2022-06-091-1/+1
| | | | | | | | Task-number: QTBUG-104057 Change-Id: I4d6335acf646e574c6f7df6747a0ed3198f206d1 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 64aea37067507c50178ee03eee9ad16a55bb7efe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 23:47:28 +0000