summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix qrc sources for QWebEngineScriptAllan Sandfeld Jensen2022-03-173-5/+9
| | | | | | | | Fixes: QTBUG-96525 Change-Id: I39d6247c0dd0e55e4fb91b176f34e676eeabbcdd Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit ce2d6a94ce99f8d6f82fbcbf45603f8eb7a92957) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* doc: PdfDocument qmlproperty type correctionsShawn Rutledge2022-03-161-3/+3
| | | | | | Pick-to: 6.3 Change-Id: Id2c880a73f9524749fa256a15cc3e05a6b26ee39 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Remove PdfDocument::heightSumBeforePageShawn Rutledge2022-03-162-27/+0
| | | | | | | | | It was a workaround for missing features in Qt 5's TableView, but it's no longer needed now. Pick-to: 6.3 Change-Id: I7318c0be83a2189bd594066e36b66a5dc09a0f20 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* QtPdf: hide "debug" properties; qt.pdf.(single|multi]pageview log catsShawn Rutledge2022-03-162-32/+29
| | | | | | | | | | | | | The property "debug" was not nice API, but I have not gotten in the habit of using logging categories from QML. This is much nicer. The "debug" property is still useful to turn on some visual debugging features, but it's better to hide it rather than keeping it exposed and needing to document it. Pick-to: 6.3 Change-Id: I5ec4156e6d4e7ccd0f406fe62ee810f4401561ec Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* QWebEngineLoadingInfo: Fix include conventionFriedemann Kleint2022-03-151-1/+1
| | | | | | | | Amends da019632bfc0227e2d0d0cc676a80a352fc27a62. Pick-to: 6.3 6.2 Change-Id: I22dce54dca802d96aec2f4cca68df0330d10fede Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix building PdfWidgets examplesAllan Sandfeld Jensen2022-03-141-1/+1
| | | | | | | | | Was missing a find package call. Pick-to: 6.3 Fixes: QTBUG-101290 Change-Id: I9b566b3644ab0713427ff559684a3f1bcb3d2349 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Improve glType detectionMichal Klocek2022-03-131-51/+56
| | | | | | | | | | | | Clean up the glType detection and do not set extra gl related command parameters in case command line arguments have already '--disable-gpu'. Pick-to: 6.3 Task-number: QTBUG-100713 Change-Id: I5662a8c8fc64b38d483ed8349265f29f7ae0c5e4 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update ChromiumAllan Sandfeld Jensen2022-03-111-0/+0
| | | | | | | | | | | | Submodule src/3rdparty 96ef19263..7e3cb70a2: > Add crossbuild support for x64/x86 on macos-arm64 > Fix building with system ffmpeg > Fix static build with qt3rdparty libs Fixes: QTBUG-100672 Pick-to: 6.3 Change-Id: I4c56952cb8e2c56ba8b636b08f849128ace367f1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Add userScript docs for qml landMichal Klocek2022-03-105-3/+238
| | | | | | | | | | | | | | WebEngineScript docs were missing after moving classes to core. Moreover we changed WebEngineScript to be a qml value type and we introduced WebEngineScriptCollection to mirror C++ class. Add the documentation for WebEngineScript, WebEngineScriptCollection and WebEngine.script() method. Task-number: QTBUG-100404 Pick-to: 6.2 6.3 Change-Id: Ifed1bd1fa398a8634df0dc1bd44111e1a09ded04 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* multipage PDF viewer example: simplify, and fix more qmllint warningsShawn Rutledge2022-03-102-16/+14
| | | | | | | | | | - no need for the document.onStatusChanged handler - no need for empty-argument function() { ... } in onSignal handlers - unqualified access and so on - scale the search field margins and erase-button a bit better Change-Id: Ice8a41e4cc1fb0385046aa1867fdb4b1400234b6 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Remove dead ResourceContextQt codeAllan Sandfeld Jensen2022-03-097-123/+2
| | | | | | | We no longer needed this transitional code. Change-Id: I1d0c9a4577a15b29e4275579f27b2d664ddba336 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* Add static builds for qtpdfMichal Klocek2022-03-098-23/+135
| | | | | | | | | | | | | | | | | | 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>
* QtQuick.Pdf: automatically close the error dialog if the error disappearsShawn Rutledge2022-03-082-2/+2
| | | | | | | | | | | When the user has not yet entered a password, document.status == Error; but we pop up the password prompt dialog on top of the error dialog. After the user has entered it, either it's correct and the error goes away, or we need to tell the user that it's incorrect, so the dialog should stay open. Change-Id: Ib3332f543b23fdf50ccd0df0c7e79cdc95f2e8da Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Update dependencies on 'dev' in qt/qtwebengineQt Submodule Update Bot2022-03-081-4/+4
| | | | | Change-Id: Idd9959ac0b5d973a4ec7a91e3d8962aa2a10a4ca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QPdfDocument: avoid setStatus(error) before certainty of which errorShawn Rutledge2022-03-071-2/+5
| | | | | | | | | | | When a document requires a password, we will first see PDF_DATA_NOTAVAIL, but we should not call setStatus(QPdfDocument::Error) yet, because updateLastError() will discover that it requires a password immediately afterwards. This avoids showing the user an incorrect error dialog. Amends 9968e2578f96081d2a242340620fcb2b96d9a1d3 Change-Id: I2216017d417bb0bad707900ce8c745363a396d7d Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Update PDF manual testsShawn Rutledge2022-03-074-28/+26
| | | | | | | | | | | - remove import versions - use Qt Quick Dialogs - use PdfPageImage in the more complex ones The BusyIndicator seems to work better while pages are rendering. Change-Id: Ie9588cff897f969d679199f2fdb113079bf8685d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* PDF viewer and manual test: support password-protected documentsShawn Rutledge2022-03-073-9/+49
| | | | | | | | | | | | | | | The multipage example was OK already; this adds the same password-prompt dialog to the single-page-at-a-time pdfviewer example and to the withdoc.qml manual test. Also, the dialogs seem to size themselves better if we explicitly set the contentItem properties. And an error dialog should not have an OK button but a Close button: the error is not OK, but the example does not provide a way to try to fix it either. Fixes: QTBUG-83988 Fixes: QTBUG-96574 Change-Id: I9d8c3cbe1f955cea4319982869ec9180d7c8666c Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* QtQuick.Pdf: fix rendering on high-dpi screensShawn Rutledge2022-03-073-3/+4
| | | | | | | | | | Default scale is 1 point = 1 pixel, but that means logical pixels, since we have that facade everywhere else in Qt. We use image.sourceSize to make it render more pixels than it otherwise would, according to devicePixelRatio. Change-Id: I3ff05f050c9b60c14b8208d61717e796ddd56220 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Multipage PDF viewer: use TableView.columnWidthProviderShawn Rutledge2022-03-071-3/+2
| | | | | | | This doesn't actually fix anything AFAICT. Change-Id: Id5a20a409ae1f6d2e992221dd22bef2c3ddf9200 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Multipage PDF viewer: fix horizontal scrollingShawn Rutledge2022-03-071-1/+1
| | | | | | | | The ?? operator has lower precedence than *, apparently, so we need parens. Amends 170fc1c2cb43318817552f1a1bed42b5cdc6eb36 Change-Id: I0ff2c7ce408043e7a1d3f862dd3e591c9bea5336 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Expand documentation on the chromium versionsAllan Sandfeld Jensen2022-03-051-1/+4
| | | | | | | | Mention runtime calls, and the file in sources. Pick-to: 6.3 Change-Id: I30fd5581272caec4e24ecc9a3ced82b99803eae2 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Update dependencies on 'dev' in qt/qtwebengineQt Submodule Update Bot2022-03-051-4/+4
| | | | | Change-Id: I14112316f2b0d4caa38918cda58d669ba31f6d72 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Fail gracefully when using an unsupported CMake versionAlexandru Croitor2022-03-044-2/+18
| | | | | | | | | | | | | | | | | | Previously if qtwebengine was configured with a CMake version lower than 3.19, CMake would exit with a fatal error saying the version is too low. Now the CMake version check is delayed to the configure summary which changes the hard error into a build time warning instead, just like with all the other repo requirements. An additional cmake_minimum_required call is used to require all 3.19 behaviors (upgraded policies) once configure establishes that the CMake version is new enough. Pick-to: 6.2 6.3 Change-Id: I03a20ae62ce2dcee23e5615241c6c97a86df4d2f Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Update build documentationAllan Sandfeld Jensen2022-03-041-13/+8
| | | | | | Pick-to: 6.3 Change-Id: I2c6dffbd8683ed909ff985f672de1914be83422a Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Split accessibility object between Chromium and Qt interfacesAllan Sandfeld Jensen2022-03-034-282/+332
| | | | | | | | | | They have different life-times and needs to be able to be deleted independently. Pick-to: 6.3 Fixes: QTBUG-100996 Change-Id: I812381c22699f9408e0c5d3edc489e51040a6491 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Add QQuickPdfPageImage and use in the PDF viewer componentsShawn Rutledge2022-03-0315-21/+446
| | | | | | | | | | | | | | | | | | | | | | | Image works fine, except that if QPdfIOHandler is not given an already-allocated QPdfDocument instance, it needs to construct its own. So we now have QPdfFile: a subclass of QFile acting as a wrapper, to carry the document instance (that the user has most likely declared) down into QPdfIOHandler::load(QIODevice *). Thus, in nontrivial PDF-viewing use cases, there is now usually only one multi-purpose document instance. And this takes care of viewing password-protected PDFs in the multipage example, because we already prompt for it and set the document.password property. In trivial use cases, it's OK to continue using Image, and QPdfIOHandler will still construct its own QPdfDocument instance if the QIODevice cannot be cast to a QPdfFile. Task-number: QTBUG-77506 Task-number: QTBUG-83988 Task-number: QTBUG-96574 Change-Id: I3adfa54c30b0baa5dedebcf3bc759758f136b757 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Add qml user script collection unit testMichal Klocek2022-03-022-0/+153
| | | | | | | | | | | | Adds overlooked unit test to test collection API. Note this test throws bunch of warnings "Can't open user script ..." and it would require dummy js files just to suppress those. Pick-to: 6.3 6.2 Change-Id: Iddf8150c5fee7a29b3dba75066fa51070053d69b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update dependencies on 'dev' in qt/qtwebengineQt Submodule Update Bot2022-03-011-4/+4
| | | | | Change-Id: I391580adb57bb1fd98111ae3094944dbb69242d8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Check for loaded opengl library in case-insensitive mannerMichal Klocek2022-02-281-1/+1
| | | | | | | | | | | | | | After a14f2d59141e in qtbase library returned by GetModuleFileName can be "opengl32sw.dll" or as in ci "opengl32sw.DLL" as file extension is filled now by the winapi function. Make comparison case insensitive. Fixes: QTBUG-101084 Change-Id: I0816bbef21be40a786246ae9d43f031c5487a4f9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 1a50992c2bb56825ab085b8d8343e1effc8a3e8d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Blacklist CertificateError::test_errorMichal Klocek2022-02-281-0/+3
| | | | | | | | | | | This test started to fail in ci, however c++ counterpart works fine. Task-number: QTBUG-101215 Change-Id: Ic94409b6db06f285d11ab10295d5ebaa831c0fa5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 123394142c887e049131b823933de88f258152b0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update documented Chromium versionsAllan Sandfeld Jensen2022-02-281-1/+1
| | | | | | | Pick-to: 6.3 Fixes: QTBUG-100911 Change-Id: If669b46634bf31f419a1cf41e24c0ddfdae5aab6 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Update ChromiumMichael Brüning2022-02-283-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty 2aad1f40..7dba564e: > Revert "[Backport] CVE-2022-0297: Use after free in Vulkan" > [Backport] CVE-2022-0297: Use after free in Vulkan > [Backport] Security bug 1292537 > [Backport] Security bug 1289394 > [Backport] Security bug 1289384 > [Backport] CVE-2022-0610: Inappropriate implementation in Gamepad API > [Backport] CVE-2022-0609: Use after free in Animation > [Backport] CVE-2022-0608: Integer overflow in Mojo > [Backport] CVE-2022-0607: Use after free in GPU > [Backport] CVE-2022-0606: Use after free in ANGLE > [Backport] CVE-2022-0303: Race in GPU Watchdog > [Backport] CVE-2021-4056: Type Confusion in loader > [Backport] CVE-2022-0466: Inappropriate implementation in Extensions Platform (4/4) > [Backport] CVE-2022-0466: Inappropriate implementation in Extensions Platform (3/4) > [Backport] CVE-2022-0466: Inappropriate implementation in Extensions Platform (2/4) > [Backport] CVE-2022-0466: Inappropriate implementation in Extensions Platform (1/4) > [Backport] CVE-2021-4066: Integer underflow in ANGLE > [Backport] Security bug 1268448 > [Backport] Security bug 1265570 > [Backport] Security bug 1252562 > [Backport] Security bug 1274113 > [Backport] CVE-2022-0470: Out of bounds memory access in V8 > [Backport] CVE-2022-0457: Type Confusion in V8 > [Backport] CVE-2022-0456: Use after free in Web Search > [Backport] CVE-2022-0453: Use after free in Reader Mode > [Backport] CVE-2022-0464: Use after free in Accessibility > [Backport] Security bug 1261415 > [Backport] CVE-2021-4053: Use after free in UI > [Backport] Security bug 1271747 > [Backport] CVE-2022-0468: Use after free in Payments (2/2) > [Backport] CVE-2022-0468: Use after free in Payments (1/2) > [Backport] CVE-2022-0461: Policy bypass in COOP > [Backport] CVE-2022-0460: Use after free in Window Dialog > [Backport] CVE-2022-0459: Use after free in Screen Capture > [Backport] CVE-2022-0306: Heap buffer overflow in PDFium > FIXUP: Keep the close button when "undocked", as we can dock differently > Fix more windows build errors on build without jumbo > FIXUP: Add missing include for Supplement Change-Id: I82671c60c00c940c4943a0df4234ac7286e9c0dd Pick-to: 6.3 Task-number: QTBUG-101051 Task-number: QTBUG-99099 Task-number: QTBUG-99720 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Improve examples CMakeLists.txtKai Köhne2022-02-2522-195/+110
| | | | | | | | | | | | | | | | | - Remove "# generated from xyz.pro" comment from pro2cmake - Remove automatic use of CMAKE_AUTORCC - Only opt into CMAKE_AUTOUIC if .ui files are involved - Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR - Combine multiple find_package(Qt6 ... calls) - use REQUIRED COMPONENTS - sort components alphabetically - Fix wrong indentations - Use (only) one empty line after multi-line commands Pick-to: 6.3 Change-Id: I09083474432ce171e8ee1e28120b062f2ef3c052 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* QtPdf: fix qml issuesShawn Rutledge2022-02-225-32/+46
| | | | | | | | | | | | | - required properties - unused imports - nullish coalescing - issues found by qmllint (despite all the noise) Reverts 99db09404787901647213abceda74befc7efa8f1 Task-number: QTBUG-82873 Change-Id: I0042d2eaeacba58adcf280c37b9668f8d76d0f93 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QtPDF QML: replace var with const where possibleShawn Rutledge2022-02-223-52/+50
| | | | | Change-Id: I63b0602bb3bb7161b87da2d8378b17b47dd872c5 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
* Make QtPdf a proper generated moduleShawn Rutledge2022-02-228-62/+7
| | | | | | | | | | | | | | | | | | | | - remove plugins.qmltypes, because it's generated automatically since d32563a3365fd9432993590e6ac9817fe6f6bd41 - plugin code is also generated, so we don't need plugin-related CMake commands - QtQuick is a dependency; auto means forward the import version to the dependency. - QtQuick.Controls is only needed in bundled qml files, and we expect tooling to find it from import statements. It's not declared as a cmake dependency because we don't use it from C++. - move qml files into the source directory so that the implicit import matches the module directory - move style-specific PdfStyle.qml files into directories beginning with capital letters, since we are moving them anyway, and the styles now have capitalized names Change-Id: If517ce30d0e22fb0354272cd2002841fd2783cfc Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QQuickPdfLinkModel::setDocument: avoid crash if document is nullShawn Rutledge2022-02-221-1/+2
| | | | | | Change-Id: I477e822bf2a64c5b6adde50cbe84a58d8299a9cd Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Doc: Use a specific \ingroup name for qt_add_webengine_dictionaryTopi Reinio2022-02-211-2/+2
| | | | | | | | | | | | CMake manual uses module-specific group names when listing CMake commands. Also, change a \target to a \keyword as it fits this purpose better. Pick-to: 6.3 Task-number: QTBUG-100210 Change-Id: If9d075356c616ff5528f9a04e2d66bfb72e7a51a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add QML test for basic profiles and fix the docs accordinglyKirill Burtsev2022-02-173-10/+127
| | | | | | | | | Amends d0ff107c00. Ensure default values for profile settings match the docs. Also fix doc's issues after off-the-record toggle to off by default. Pick-to: 6.2 6.3 Change-Id: I558a77dbec82d7f2b335b1a2ceca74ab66a1a6e9 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add testing of default constructed profile backKirill Burtsev2022-02-171-24/+17
| | | | | | | | | Amends d0ff107c00. Re-add test of default user created profile without storage name. Also remove duplicated test for profile with storage name. Pick-to: 6.2 6.3 Change-Id: I5d404e06a8ea9a349d5122c7bf138cde768e8391 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Introduce "--webEngineArgs" to prevent unexpected sub-process argsMichal Klocek2022-02-174-2/+12
| | | | | | | | | | | | | | | | | If there is no QTWEBENGINE_CHROMIUM_FLAGS env export we pass all args to Chromium as "command line". However passing "-type=1" to qt application with webenigne ends will crash since this arg is used for sub-process type handling. Prevent any accidental user args which can affect chromium switches and from now on pass only args explicitly stated after "--webEngineArgs" option. [ChangeLog] Command line arguments meant for webengine has to be now stated after "--webEngineArgs" option. Fixes: QTBUG-68820 Change-Id: I57b3921d2250f75d445ee7173566dadc41e4ca93 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Fix required harfbuzz versionMichal Klocek2022-02-171-1/+1
| | | | | | | | | We need at least harfbuzz 2.9. In ci qemu has outdated harfbuzz, so use bundled one. Pick-to: 6.3 Change-Id: Ie6bcde1fba54d5f213741df02e1542d388d3ded0 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Minor. Fix context logMichal Klocek2022-02-171-2/+2
| | | | | | | | | Log context before initialization as it can fail/crash and we do not see what failed. Pick-to: 6.3 6.2 Change-Id: Ib47906c25bf8fb55c6c043ba5fadce9b354a87fc Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add charset parsing to custom scheme handler's content typeAllan Sandfeld Jensen2022-02-162-13/+17
| | | | | | | | | | This was already assumed by test in tst_qwebengineprofile. [ChangeLog][QWebEngineUrlRequestJob] Charset is now explicitly parsed from provided contentType Pick-to: 6.3 Change-Id: I9bfb1f94cf523fbe0f9796654b4114e61e904c92 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Update dependencies on 'dev' in qt/qtwebengineQt Submodule Update Bot2022-02-161-4/+4
| | | | | Change-Id: Ibcdc39ebe2867c394b3adc89f94a820469f20310 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add test for blocking of remote contentAllan Sandfeld Jensen2022-02-143-2/+49
| | | | | | | Pick-to: 6.3 6.2 Task-number: QTBUG-50686 Change-Id: Ie176bece1a44a6df608646e91171d02ceeea7e8f Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add html5lib to platform notesMichal Klocek2022-02-141-1/+1
| | | | | | Pick-to: 6.3 Change-Id: If414e4e8669032ebc8b7a11c8f7db2e67f269503 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update dependencies on 'dev' in qt/qtwebengineQt Submodule Update Bot2022-02-121-4/+4
| | | | | Change-Id: Ic4b2680b65ff956d1fe00bfcc9c7968073727056 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Adjust qt_add_webengine_dictionary APIAlexandru Croitor2022-02-112-9/+11
| | | | | | | | | | | | | | | | | Rename the webengine_dictionaries custom target to qtwebengine_dictionaries. We don't name it qt_webengine_dictionaries for it to be consistent with the name of the directory where WebEngine looks up the binary dictionaries. Also fix the docs to mention the correct location of the dictionary output directory. Pick-to: 6.3 Task-number: QTBUG-100210 Change-Id: I0232fa17d904ff602a09a70d21ad3d94c145b4c7 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix icon linkAllan Sandfeld Jensen2022-02-111-1/+1
| | | | | | | | Was looking in resources/resources. Pick-to: 6.3 Change-Id: Id393da93cecf0510cb284957ff87cdb33ac5855c Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>