summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT in .cmake.conf6.2.3Iikka Eklund2022-02-091-1/+1
| | | | | | | For final 6.2.3 is should be empty. Change-Id: Ibbab2bda05e7ba70f24e02fa53e56b5f5417b169 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update Chromiumv6.2.3Allan Sandfeld Jensen2022-01-241-0/+0
| | | | | | | | | | Submodule src/3rdparty adfb10ad0..30c22c6ed: > Speculative fix for build error > [Backport] Security bug 1256885 Pick-to: 6.2 Change-Id: I3024584d0aa60c62591489f59636d974fcecbae3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.2.3' in qt/qtwebengineQt Submodule Update Bot2022-01-191-4/+4
| | | | | Change-Id: I7c8636ff83beda260733e085cb4f486e94177771 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.3' in qt/qtwebengineQt Submodule Update Bot2022-01-171-4/+4
| | | | | Change-Id: Ibc7e6a56ec02a1553af1bd0b4cacc885c9bb2a35 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update ChromiumMichael Brüning2022-01-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty 39aa0ea9..adfb10ad: > [Backport] CVE-2022-0116: Inappropriate implementation in Compositing > [Backport] Dependency for CVE-2022-0116 > [Backport] CVE-2022-0108: Inappropriate implementation in Navigation > [Backport] Dependency for CVE-2022-0108 > [Backport] CVE-2022-0111 and CVE-2022-0117 (2/2) > [Backport] CVE-2022-0111 and CVE-2022-0117 (1/2) > [Backport] Dependency for CVE-2022-0111 and CVE-2022-0117 > [Backport] Security bug 1258603 > [Backport] CVE-2022-0114: Out of bounds memory access in Web Serial > [Backport] Security bug 1270014 > [Backport] Security bug 1259557 > [Backport] CVE-2022-0113: Inappropriate implementation in Blink > [Backport] CVE-2022-0109: Inappropriate implementation in Autofill (2/2) > [Backport] CVE-2022-0109: Inappropriate implementation in Autofill (1/2) > [Backport] CVE-2022-0104: Heap buffer overflow in ANGLE. > [Backport] CVE-2022-0103: Use after free in SwiftShader > [Backport] CVE-2022-0102: Type Confusion in V8 > [Backport] CVE-2022-0100: Heap buffer overflow in Media streams API > Do not overwrite signal handlers in the browser process. > [Backport] CVE-2021-4102: Use after free in V8 > [Backport] CVE-2021-4101: Heap buffer overflow in Swiftshader > [Backport] CVE-2021-4100: Object lifecycle issue in ANGLE > [Backport] CVE-2021-4099: Use after free in Swiftshader > [Backport] CVE-2021-4098: Insufficient data validation in Mojo > FIXUP: Fix disabling reporting > [Backport] CVE-2021-4079: Out of bounds write in WebRTC > [Backport] Security bug 1259899 > [Backport] CVE-2021-4078: Type confusion in V8 > [Backport] CVE-2021-4062: Heap buffer overflow in BFCache > [Backport] CVE-2021-4059: Insufficient data validation in loader > [Backport] CVE-2021-4058: Heap buffer overflow in ANGLE (2/2) > [Backport] CVE-2021-4058: Heap buffer overflow in ANGLE (1/2) > [Backport] CVE-2021-4057: Use after free in file API > Use wglSetPixelFormat directly only if in software mode > Compile with GCC 11 -std=c++20 > FIXUP: Adapt accessibility code for our needs after chromium 90 > FIXUP: Add user script data mojo interface and traits > FIXUP: Make GpuSwitchingManager::RemoveObserver() thread safe > Revert "Stop orphan child processes from staying alive on Windows" > Fix stack overflow on gpu channel recreate with an error > Fix python call for vulcanize > Add missing dependency for gpu_sources Task-number: QTBUG-98523 Task-number: QTBUG-99719 Change-Id: I1bfdfd506437215206dae46b5e00f809b76c78b1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix printing PDF filesSzabolcs David2022-01-143-10/+37
| | | | | | | | | | | | Delegate printing task down to the guest WebContents if any is present. Also update PrintWebViewHelperDelegateQt to find the plugin element properly for printing. Task-number: QTBUG-98941 Change-Id: I81004a2275e0870a17565af527b1450472afb24b Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 455efe7ef204c6cd8de72b9b1f922f1681f58589) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix not working web ui popup (html comboboxes) due to focus out eventsMichal Klocek2022-01-141-1/+6
| | | | | | | | | | | | | | | | | | | | | | | Recent change in qtdeclarative 42d411e2e8 causes a focus out event being delivered in case of popups to "root" item of quickwidget. This is not expected as events are forwarded to parent "view" and loosing a focus will hint Blink to trigger a pop up close request. As a communication with a render process is asynchronous this creates several race conditions in our tests and the Blink's popup close request can close unexpectedly windows creating dangling pointers. Moreover, the focus in never gained back leaving the Blink's logic in a limbo state. Simply ignore a focus out event in case of popups. Fixes: QTBUG-99215 Change-Id: I5ca6eda227101d4f19f15735e41f066cfd8ccea0 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> (cherry picked from commit ba2e26f3d94f0a4bb0077bed19f2b04a7b5104f0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Do not override signal handlersAllan Sandfeld Jensen2022-01-141-0/+1
| | | | | | | | | | We used to have this, but it got dropped at some point in an adaptions. Fixes: QTBUG-99263 Change-Id: I3bf86a1b42edca0cd792723c85d7dcb7877fea37 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit fbaab46becbf5ea063a8b4a01abf8cd1d4a1725d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix multi config generator and add checks for configs,archsMichal Klocek2022-01-141-1/+7
| | | | | | | | | | | | | | Fix typo config -> configs. Add checks for configs and archs, otherwise we silently do not set right dependencies and continue the build. This can end up in weird looking errors. Task-number: QTBUG-99511 Change-Id: Ief727033e7b3ac32ab9f42bd96babd9be97f63a6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 511d360d4f196d739975fbdfb80b99bfa4f4cc80) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix moc path in case of top level cross buildMichal Klocek2022-01-141-1/+5
| | | | | | | | Fixes: QTBUG-99511 Change-Id: I8b9550c8a7e331e319fc7784224571beef0410b1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 3cfc627a19005d818a24398e410162484ef3b5b5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix inspector overlayAllan Sandfeld Jensen2022-01-061-0/+2
| | | | | | | | | | Was missing resources that had moved Fixes: QTBUG-99526 Change-Id: I68b05b9de3dbd6c6460e5495a939e2599623a047 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 6617cb8edb51bce85861e44035948d8f634c985b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing BUILD.gn template dependencyMichal Klocek2022-01-061-0/+1
| | | | | | | Change-Id: Ic075eaff01c6536ce9d6a12bab7ee0cd8d5764bd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit b195d4851cd14dd6b61340f9b7cd91ec4a73ee13) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Always generate printing buildflagsAllan Sandfeld Jensen2022-01-051-3/+1
| | | | | | | | | | We include them unconditionally Fixes: QTBUG-99511 Change-Id: I4d9ebbf5777099ade38740ceb41532f0088df4c0 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 7720aa45fa8419da4c90ffed9954fbf7502d062e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2022-01-041-4/+4
| | | | | Change-Id: I3ac70a16a24031bcfa87eee4dbaa6b68bf9c27d2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Cleanup code and clang build warningsKirill Burtsev2022-01-0420-80/+32
| | | | | | | | | | Fix build noise as reported by clang for issues like api deprecation, unused variables, sign/unsigned mismatch and other non critical issues. Change-Id: I4fba25406eea8170e3283c42e908ae86bd512e3a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 02d58a067fb5f0db32c254e783170f9f283aeb9d) Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Update dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2022-01-031-4/+4
| | | | | Change-Id: I217c447024c2dd356653cdf5330e6fc613287ff9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Increase timeout to help slow CIAllan Sandfeld Jensen2021-12-231-3/+3
| | | | | | | Change-Id: I5f0dd43e0c1eb6bc43f263227b12ec0e1b9f7a20 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 4cc4f765a9cfc11668c6274dfe77153a68ff1ec5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix headers in GN sourcesAllan Sandfeld Jensen2021-12-221-4/+2
| | | | | | | Change-Id: Ib2faa3e0242799e1088d4ec7c610fa89a4d15bbb Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 540b1cadb1888a9adde8cf338fcdbd8630423c0b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2021-12-211-4/+4
| | | | | Change-Id: I60f8143c878a099ec56ae2d0ea26da385b3caac0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.2.3Jani Heikkinen2021-12-212-2/+2
| | | | | Change-Id: Iffadca9cb5eebdd55ea0786b866005aa727fe118 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Blacklist failing tests on macosAllan Sandfeld Jensen2021-12-201-0/+6
| | | | | | | | | Seems to have started failing while the team is on holiday Change-Id: Id47f5c328ae105305c883f9ce00fea36199830d6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 4b6d5daf527a565bd659668d63a1d14fad0acb27) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Switch examples to build as isolated sub-buildsAlexandru Croitor2021-12-164-22/+22
| | | | | | | | Task-number: QTBUG-90820 Change-Id: I8539fee3ea7311acf9ee4e736fb19e6ff595fcae Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 6f75de32c2a8b8ac81ef40489fa9f64ec0435087) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2021-12-131-4/+4
| | | | | Change-Id: I9f0dbb9050d161ab6f4ceba844a120a08fac478b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2021-12-111-4/+4
| | | | | Change-Id: Id84fa48e75c2da4942f389a316ab8b0c2c97214e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix race condition on layout (take2)Michal Klocek2021-12-093-28/+10
| | | | | | | | | | | | | | | | | | | | | Even if layout is 'meaningful' it can still require update before toPlainTextSync call can proceed. Simply wait for frame being loaded in stead of tracking layout update. Depending on DidLoadFinish will brake default toHtml call for empty not loaded page, therefore return expected value if there is no load. This fixes crashes/asserts on certificateError (stacktrace in bug report). Remove blacklist on certificateError as bad certificate is back on line and toPlainTextSync works without issues. Fixes: QTBUG-97414 Change-Id: Ib702bbe813f6061eef446e2d87d7e9e455d715c5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 1cf45eed088bd1ef1c89a9812c6f69d16bce56f7)
* Fix crash with disabled geolocation on macOSPeter Varga2021-12-094-2/+60
| | | | | | | | | | | | | | | | | QtWebEngine uses custom LocationProvider for geolocation. If geolocation is disabled, Chromium fallbacks to NetworkLocationProvider. NetworkLocationProvider uses GeolocationSystemPermissionManager and tThere is no nullptr check for the manager instance so QtWebEngine has to provide it. This fix implements a FakeSystemGeolocationPermissionManager what is meant to be used only on macOS if geolocation is disabled. LocationSystemPermissionStatus is always set to denied by the fake manager. Change-Id: I25d51c9ce8911b95ff69cc72bc6aae7023e7edbe Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit ca1074f7d0b91ccb9290acbfe51ecab54ad2efb9)
* Update documentationAllan Sandfeld Jensen2021-12-082-6/+0
| | | | | | | | | | The signal is updated much faster for paused media now. Fixes: QTBUG-98918 Change-Id: Ifa3b54e212436a7c93e101dc244d7edcbf473b63 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit b6099cd9d1efab2af4a38476b3f543796f26f065) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove OTHER_FILES from quicknanobrowserMichal Klocek2021-12-021-7/+0
| | | | | | | | | | Refereed resources are already referenced by qrc file. Fixes: QTBUG-71277 Change-Id: Ibaad55aba529c87b8c8dba46bd3b1a3d7a819960 Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 464ec9fbc4825e4fe1235cb461fdc980d3a48518) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix race condition on layoutMichal Klocek2021-12-012-5/+35
| | | | | | | | | | | | | Calling some methods without 'meaningful' layout when render frame is visible tiggers at the best some DCHECKS. Therefore if frame is visible wait for 'meaningful' layout. This fixes some flaky tests on toPlainTextSync call. Change-Id: I746a1c436798b440c59f9b8b4a1d297e3fa7e56d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 1b8aa58a618eee23c4fd23b4fb51667fd8a3f2b8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix build with the latest qtbasePeter Varga2021-12-011-0/+1
| | | | | | | Change-Id: I66a3536ecaa2d5dded5a645c46f05c559b90eda4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit da019632bfc0227e2d0d0cc676a80a352fc27a62) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update security patch version to 96.0.4664.45Michael Brüning2021-11-261-1/+1
| | | | | | | Change-Id: I651e97fac27563d91aef6d2a68f562f11c58cba2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 432158aa0024fce9318df16b55604a9bc357fece) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update ChromiumMichael Brüning2021-11-241-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty 6ae16282af..39aa0ea99a: > CVE-2021-38022: Inappropriate implementation in WebAuthentication > CVE-2021-38015: Inappropriate implementation in input > CVE-2021-38019: Insufficient policy enforcement in CORS > CVE-2021-38009: Inappropriate implementation in cache > Dependency for CVE-2021-38009 > CVE-2021-38010: Inappropriate implementation in service workers > CVE-2021-38005: Use after free in loader (3/3) > CVE-2021-38005: Use after free in loader (2/3) > CVE-2021-38005: Use after free in loader (1/3) > CVE-2021-38007: Type Confusion in V8 > CVE-2021-38017: Insufficient policy enforcement in iframe sandbox > CVE-2021-38012: Type Confusion in V8 > Fixup for CVE-2021-38018: Inappropriate implementation in navigation > CVE-2021-38018: Inappropriate implementation in navigation > CVE-2021-38021: Inappropriate implementation in referrer > CVE-2021-3541 libxml2: Exponential entity expansion attack bypasses all existing protection mechanisms > CVE-2021-3517: libxml2: Heap-based buffer overflow in xmlEncodeEntitiesInternal() in entities.c > CVE-2021-38001 : Type Confusion in V8 > Security bug 1252858 > CVE-2021-38003 : Inappropriate implementation in V8 > CVE-2021-37996 : Insufficient validation of untrusted input in Downloads > CVE-2021-37989 : Inappropriate implementation in Blink > CVE-2021-37987 : Use after free in Network APIs > Security bug 1245870 > CVE-2021-37992 : Out of bounds read in WebAudio > CVE-2021-37993 : Use after free in PDF Accessibility > Security bug 1241912 > CVE-2021-37984 : Heap buffer overflow in PDFium > Fix build with Win10 21H1 SDK and Win11 SDK Change-Id: Ie208cc60c8c65c37ddf0d727fe7e1e315e538255 Task-number: QTBUG-98400 Task-number: QTBUG-98401 Task-number: QTBUG-98523 Fixes: QTBUG-98522 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit ee3252238c200d84461d5da71bb413b798c117f3) Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Do not access accessibility from qt post routinesMichal Klocek2021-11-236-4/+26
| | | | | | | | | | | | | | | | | | | It seems accessing accessibility from qt post routines ends badly since caches are gone already. Add closingDown() function to web context, which is similar to QCoreApplication::closingDown(), however return true on post routine. Guard delete accessibility calls. Note the widget part is not necessary, but added for completeness, since only qml can release profiles due to garbage collection. Fixes: QTBUG-90904 Change-Id: Ic0e7115cd17eb58f3d58f70fefbc197dfb7a6493 Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 89bb3c97eee9cd4bf9fb536f024715e606e49ae0)
* QQuickPdfDocument: fix -Werror=deprecatedMarc Mutz2021-11-221-1/+1
| | | | | | | | | | C++20 deprecates [=]'s implicit capture of this, but [this] is sufficient, anyway. Change-Id: I0e962d62b672883495da05abce12d7ea2f2b1020 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit b8bc949b81939cfa073be0c36e3e1d15b4f1c2a5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add CF_HTML clipboard format handlingPeter Varga2021-11-193-0/+189
| | | | | | | | Fixes: QTBUG-92539 Change-Id: Iece974e7b045bd793ceb8870f370803bf2524c33 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 74021bfcb8f3937e960e76c39d06f5a2a6304673) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use new x11 native interface to query xdisplayMichal Klocek2021-11-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | The call to nativeResourceForScreen can return egl native display handle if called with "display", since it gets mapped to XLibDisplay but egl device intergration can return EGLDisplay. This is not the case for nativeResourceForIntegration. Use new native QX11Application interface to query for display, note there is not need to use nativeResourceForScreen for "display" anyway since qt does not support multiple x connections to different displays. This fixes places where code queries "display" and bails out if it is null. Fixes: QTBUG-97472 Change-Id: Ibc5f8f96e612389bfa24a81268202c9e47a7580b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 23cc5bb2588100c6053d9d11b20778724cdbd6e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix crash in Quick file system access dialogsSzabolcs David2021-11-171-1/+1
| | | | | | | | | | | | | In Quick examples, providing any answer to ui::SelectFileDialog::Listener results immediate destruction of FilePickerController and its m_isHandled flag remains false before the controller is destroyed. An "unhandled" controller calls reject() in destructor, so the controller will be answered twice. Change-Id: Iaff5b0f4f54b0b11a447ac624f5652e592a88e6e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit dfa69ea39fd524ef54b4a822d5a3163749d40ea5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add .qmproject file for examples containing .ui.qml filesThomas Hartmann2021-11-172-1/+46
| | | | | | | | | | | If an example contains ui.qml it should also have a .qmlproject file for Qt Design Studio. The id 'item' is not allowed in ui.qml files. Change-Id: Ib01d22b361c00f67062f97af52489e9704aaf927 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 05560ed24561535e264995dc3c09d4ae4873f95c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* FaviconImageResponseRunnable: fix -Werror=deprecatedMarc Mutz2021-11-161-2/+2
| | | | | | | | | | | C++20 deprecates [=]'s implicit capture of this, but the replacement [=, this] isn't available in C++17. So, need to bite the bullet and list every captured variable manually. Change-Id: I47c62f9bf93e5d7b6c64cdbdac73bdcc9ecab8b5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 30696bf3f7aca37493cd6fb79c4637425ad7d922) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix proprietary codes feature referring to qmakeMichal Klocek2021-11-161-3/+4
| | | | | | | | Fixes: QTBUG-97926 Change-Id: I2abba9044d64765fca48d987c70494792529f6ca Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 3a0f20bfc896008e825a51208bb978d4e192a180) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add qmake profile naming changes to docsMichal Klocek2021-11-161-0/+7
| | | | | | | | Task-number: QTBUG-97836 Change-Id: If32e78144695cefd5ff6092bfd3b845c04891dd7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 5747735b4958983cdf589a0b6a2ffb1d26f55b1b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add a support check for windows 10 sdk versionMichal Klocek2021-11-161-0/+12
| | | | | | | | | | Check for windows 10 sdk was missing, add it back. Fixes: QTBUG-97836 Change-Id: I5551a217aff3e6f730aaec014d96c0d6ce7e396f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 30a7d8d20dd79e88cdba791d78be6297fceaa875) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Check if xkb extension is presentMichal Klocek2021-11-161-0/+6
| | | | | | | | | | | | | | According to docs: "You must call XkbQueryExtension or XkbOpenDisplay before using any other Xkb library interfaces" Task-number: QTBUG-97472 Change-Id: I84c1bc49b077224a93d9f8d7a9ac29fe089de13e Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit e02563066fe270205139f8dbc0b08a941874fe69) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Re-enable network-service-in-processAllan Sandfeld Jensen2021-11-111-0/+1
| | | | | | | | | | | The network-service isn't sandboxed anyway, so there is no added security by the process separation. Fixes: QTBUG-84105 Change-Id: Ie3fbda26f0cf8f31166b37a8537b7e1b6d11b560 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> (cherry picked from commit bc175fb62a1d2aba9c98ba761d5e21d3d7426678) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove certificateerror qml unit test leftoverMichal Klocek2021-11-103-94/+0
| | | | | | | | | | Since 40a7fe0 we no longer have certifiacteerror qml test, however there were some leftovers. Change-Id: I1a5fd0756b3e6c0ff6766a6495509f6c174da095 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> (cherry picked from commit 1140a69b246a97f0a4216c40ccebfb02a808d79e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2021-11-091-4/+4
| | | | | Change-Id: I16de0b11bd487a1bc5df4aedfcdbf9d7131eea2a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Remove broken homepage link from markdowncss attributionLuca Di Sera2021-11-084-4/+2
| | | | | | | | | | | | | | | | | | | | | | | QtWebEngine uses Keving Burke's markdowncss for two of his examples. An attribution file is provided for both uses, pointing to the homepage of markdowncss "https://kevinburke.bitbucket.io/markdowncss/". Nonetheless, the project is currently unmaintained and the homepage doesn't exist anymore, meaning that the link to it is broken. As there is not a reachable homepage anymore, the "Homepage" key for markdowncss attributions was removed from the attribution files. A link to the same page was changed to the link to the bitbucket repository, which is still reachable, in the documentation for the affected examples. Task-number: QTBUG-96127 Change-Id: Idd6c163eebeb2a2292ae76a73289fda5faa12b0a Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 222b3b054cfda31b3bbf3059e3e53139d00bb76f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2021-11-051-4/+4
| | | | | Change-Id: I51ab5a47eab3ddd8e8fb9b48d90275747024ceb0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.2.2Jani Heikkinen2021-11-042-2/+2
| | | | | Change-Id: I66cd1f1f6a1c5848fb61c04f8c0f57d48826eb53 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Update dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2021-11-041-4/+4
| | | | | Change-Id: Ifba6520daf94fae5d7cf1fe8cd3fef1fb977c4f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>