summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Adjust install and copy path for locales and resourcesMichal Klocek2021-09-011-11/+19
| | | | | | | | | | | | | In case of top level build with prefix, make sure we also copy resources and locales to build dir, so tests can be executed without installing. Task-number: QTBUG-95590 Change-Id: Ie64e650259b2c38a6eda8d15a94f7101ad8380a8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit f2153965c8f8459af4edcf30d69b4f1e81085cb4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use generator expression to get moc pathMichal Klocek2021-09-012-11/+2
| | | | | | | | | | | | | | | | | | | We used IMPORTED_LOCATION for getting moc path, however this will not work in case of top level builds, since moc is not "imported", we can not use LOCATION due to https://cmake.org/cmake/help/latest/policy/CMP0026.html Use generator expression to set the moc path for gn. Clean up RSP_PREFIX leftover from previous gn version. Note QtPdf does not even need moc setup since we just need pdfium library. Task-number: QTBUG-95590 Change-Id: Ief3dca96f65e198e9693293316b1a90007c56355 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 53e99bd479f74c5399664d26e35e392875da8fb5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Restore enums for QQuickWebEngineView from old-new API classesKirill Burtsev2021-08-312-2/+51
| | | | | | | | | | Restore SC, but at least deprecate these enums in view Change-Id: Ic2a263b0ec175c56b8bf450fae9576bfefca2928 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 97eb62fe8ff83ae77103f5d8ae10debb1a5ff16b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Set right RUNPATH for QtWebEngineProcessAllan Sandfeld Jensen2021-08-301-3/+5
| | | | | | | | | | Call qt_apply_rpath like for Qt tools or apps. Fixes: QTBUG-96093 Change-Id: I22c670ede70ba52d1255bb362519d152a227f5f3 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 9b47a27441a3a80e2c45bd69334c4236f90865bc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update ChromiumMichal Klocek2021-08-301-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pulls in the following changes: * 291982fed7c Use Chrome HSTS * a0947f39232 FIXUP: Fix printing sources for Qt and add them to the build. * dfacfba809d FIXUP: Stop sending ViewMsg_SetBackgroundOpaque to renderer * 4febbcfdaaa FIXUP: Add cookie filter to URL requests cookie headers * b814ac9c9b1 FIXUP: Fix building on macOS with Xcode * 27e9e7673eb FIXUP: Fix for our tests * 3c230af9b21 [Backport] Remove a local frame root usage in RenderFrameImpl * 7b06ec91336 [Backport] Remove unused variable in SourceBufferStream * fd1f81a69a3 Fix some compiler warnings * 62a8a367d4e FIXUP: Silence most warnings * 3f518b2824d Revert "Fix not working video in debug builds" * 43426393a42 [Backport] Gate breaking FreeType change in COLRv1 struct names * 190b2c47a54 Workaround debug iterator issues with MSVC * 9104847e516 Revert "Fix build with MSVC standard library" * 0a09f2e87b6 FIXUP: Forward cleared selections * c96e352f979 Revert "Protect against nullptr dereference in GetSelectedText" * 8535c9a306e Revert "Prepare net-internals for QtWebEngine usage" * b0b96e3c0ef [Backport] Remove unneeded includes from net_internals_ui.cc * 709aa60c812 Revert "Silence assert on MessageWindow::WindowClass destruction" * 7d02d54400d Fix navigation when clicking on links in a PDF * 556edad682b Add rsp target writer * 0fd1fa101f3 Remove obsolete cmake link writer Change-Id: If65fe84ffb7e5eaa2d43a545bb5f4c8ba1fec6d6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 5c44bd7e516b7d34f98fd5981d73f8444161af80)
* Add workaround for not working linking with bfd linkerMichal Klocek2021-08-301-0/+3
| | | | | | | | | | | | | | | | | Removal of external project removed also workaround for coin bug, which is still not fixed. Add linker launcher in case maximum number of open files is below 4096 on linux for WebEngineCore target. This launches bash script wrapper which sets ulimit. This is poor man workaround and requires cmake 3.21 to work. Task-number: COIN-699 Task-number: QTBUG-95590 Change-Id: Ib9d0c4ced988d4692746e51f3abbe63ff5085836 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit c18a4d6f354838ea3edfb18d31007237dad08aa6)
* Fix installation paths of resources and localesMichal Klocek2021-08-301-2/+2
| | | | | | | Fixes: QTBUG-95231 Change-Id: I9aa2c42f97b903d17a709767f26b0b4dde4db8b5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 146b1537a6c0f781cdd2673515eaf784f9d02db5)
* Rewrite gn-cmake integrationMichal Klocek2021-08-3012-309/+393
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous gn-cmake integration was driven towards having the complete cmake build tree which included gn build artifacts. These were marked as IMPORTED in cmake build files, this way cmake "knew" all object files and static libs coming from gn. To achieve that we needed to run the cmake configure twice. First to feed gn with the build information from cmake and then the second run to import all the build information to cmake based on gn run. As a side effect of this the first run cmake was creating incomplete targets, so we could use generator expressions to gather all the data needed for gn run. The second run of cmake was able to create fully initialized targets. We used 'external project' to run cmake the second time. This approach worked well when doing "module" builds and having two targets, one in the main project and one in external was not an issue. Moreover, this approach could be integrated nicely since CI does only "module" builds. Unfortunately "top level" builds are implemented to import all qt targets into one build tree. This created issue for qtwebengine since fully initialized targets were 'hidden' by 'external project' and including half baked (dummy) targets from the main project resulted in bunch of issues related to the dependency tracking and build race conditions. Also using 'external project' complicated installation rules and in the end installation worked differently than in other modules. With current approach we use response files, so we hide all build artifacts coming from gn and feed cmake with those response files. This way we run the cmake configure once and we create all the targets once. Using rsp files hacks linker options in cmake, so this approach is sub-optimal, however allows to have working "top level" builds. It is worth mentioning here that the final module linking has to take place with cmake's part of build since doing one static lib in gn is not possible due to the toolchain limitation (msvc is not able to process static libs over 4Gb and has no support for thin archives, so only a shared lib is doable at time of writing) Following changes are made: * remove 'external project' for qtwebengine target, we keep it however for ninja ,gn and a host project * call gn from cmake in a scripting mode during build and not configure run, this way BUILD.gn is assembled as a build step so after generator expressions are executed * BUILD.gn is assembled now from 4 files: - root template BUILD.root.gn.in - compiler data gn_config_c.cmake, gn_config_cxx.cmake - sources data gn_cofnig_target.cmake * since we use gn wrapper script use gn.args file to pass arguments instead of a command line, so this file can be now easily modified when running gn and ninja 'manually' * since a script mode does not support handling of properties with TARGET as such, use the DIRECTORY scope in some of our functions which handle GN_TARGET * use qt_build_repo() in main CMakeFile and remove all coin and top level build hacks * remove 'external project' for examples and tests, this is no longer required as all qt targets are not hidden by external project * remove leftovers from gn feedback call used for GN_TARGET * improve installation rules, WebEgineCore target is not by default installed during build, therefore we need to copy resources and translations to root so tests and examples still can be built without a module being installed first * adjust GN lookup paths, we look for gn in main configure and during scripting mode when gn is executed Fixes: QTBUG-94349 Fixes: QTBUG-94709 Fixes: QTBUG-94922 Fixes: QTBUG-94997 Fixes: QTBUG-95051 Fixes: QTBUG-95152 Fixes: QTBUG-95158 Fixes: QTBUG-95972 Task-number: QTBUG-95231 Task-number: QTBUG-95590 Change-Id: I5e7a34287ee59d904103fe310fc7c6a36a8dfbc9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit bd75c51f2a7f7384d3303e86764211cb3e32f03d)
* Add 'amazing' windows linker workaround for rsp filesMichal Klocek2021-08-302-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should be part of previous patch, however it deserved separate commit message with explanation. On windows cmake generates ninja rules with cmake wrapper for linker in form of: cmake.exe -E vs_link_dll vs_link_dll internal command unfortunately expands all rsp files passed to liker before calling it (it looks for '@') and also swaps the order. This ends in bogus linker call. Make a workaround based on: https://github.com/Kitware/CMake/blob/master/Source/cmcmd.cxx#L2102 Use response files prefixed with 'CMakeFiles' so internal command of cmake will skip the processing. Since rsp files must now start with filename and not with filepath we also need to copy them to directory where we call the linker. Task-number: QTBUG-95590 Change-Id: I8e96ebf3a9ac7c7d751db6682ce37f38880be793 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 9f4914248a2bf447d4728bc6bc8361dbbfc8709f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use rsp files directly from gnMichal Klocek2021-08-305-16/+16
| | | | | | | | | | | | | | | | | | | Do not use gn created cmake files since this requires cmake configuration step, which currently ends up in duplicated targets in main and qtwebengine external project. Use response files instead, so we can remove duplicated targets in follow up patches. This approach unfortunately has downside of cmake not being aware of gn build artifacts and hacks directly linker command. For universal builds remove not needed rsp template, since we can now use rsp files directly generated by gn. Task-number: QTBUG-95590 Change-Id: I83282ba68fa171cada7236d0587be27122315dec Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 96e47e1c9b6ce5c71e2560bb95f6e59ce062c8ba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Enable touch events in webenginequick by defaultBalazs Egedi2021-08-261-0/+1
| | | | | | | | Task-number: QTBUG-95924 Change-Id: If6905e8c98c0468c74bb96f9a22267cb9ce4ed16 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 56d9a9c96d2f73140b03c248992d8f20ce1fefa6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing touch-related delegates to CMakeBalazs Egedi2021-08-261-0/+2
| | | | | | | | Task-number: QTBUG-93666 Change-Id: Id959077f4aeb8f6e4d619d88a683b8f5f7447775 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 6f2c42f42cb83fcef8c25b4c3b24e48e0efe7a66) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove unneeded extension -> file access privilegeAllan Sandfeld Jensen2021-08-261-5/+1
| | | | | | | | | | | It was hacked in before we got guest views working for the pdf viewer, but should no longer be needed. Change-Id: I3085c1ba591c600942e488751ada12473c6454d0 Reviewed-by: Szabolcs David <davidsz@inf.u-szeged.hu> Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 5309b594a9939023ce3161e1713b534c90ef3605) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update documented versionAllan Sandfeld Jensen2021-08-261-1/+1
| | | | | | | | Fixes: QTBUG-94408 Change-Id: I0aab0377878b7ba75e43ec329e7a9d1b02ab2021 Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 047edac0938b80a76827748c5ec850af396d26db) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix remaining documentation warningsTopi Reinio2021-08-262-7/+6
| | | | | | | | | | | | * WebEngineCertificateError::ignoreCertificateError() was renamed to acceptCertificate(). * Use correct \instantiates class for WebEngineNewWindowRequest. Task-number: QTBUG-95860 Change-Id: I42cc4a8939625b432cb4c6f68b26423b6dc3fa7d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 421958b15df316cac15235173b5202533c766b0d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix devtools internal reattachAllan Sandfeld Jensen2021-08-241-1/+3
| | | | | | | | | | We were replacing the devtools with a new one instead of reattaching. Change-Id: I7729b2e1fcc2946d8d5d67acbf026a06e8cbdc06 Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Balazs Egedi <egedib@inf.u-szeged.hu> (cherry picked from commit e283b265257969acb97d9e7c928c9949e860282f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix documentation warnings for Qt WebEngineTopi Reinio2021-08-232-7/+3
| | | | | | | | Task-number: QTBUG-95860 Change-Id: I5b1fd6a6e5f172724fcfbde1a791b342a7e1ff92 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 30237ec607a70964a7bfeaf875afb79f741214a7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix rendering and crash with popupsAllan Sandfeld Jensen2021-08-201-4/+4
| | | | | | | | | | | Were not rendering right after the "Move scenegraph handling out of core" change. Task-number: QTBUG-95924 Change-Id: I30e206084573a64aeb8a93ca54b46f8a23aa81b3 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> (cherry picked from commit 976a3c1811512ad251da45fb2d9d723a6057bf48) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove TODO commentAllan Sandfeld Jensen2021-08-201-2/+0
| | | | | | | | | | The default settings make less sense now that we do not have the old default profile. Change-Id: I9022bbe905eb06944646cd1b9813b48970c62ad7 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 76f05bb5c053f5eab6e3b104f116d433e82f0405) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Apparently we build fine with node.js 10.19 on UbuntuAllan Sandfeld Jensen2021-08-201-1/+1
| | | | | | | | | Fixes confusing configure output Change-Id: I17812524e3452d3b271a677d3877d1365ccfc38f Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 900c5d96a5c85b24eafddef78546423259898259) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Move the rest of the super module documentation to core moduleAllan Sandfeld Jensen2021-08-209-0/+0
| | | | | | | | | Previously parts were moved, but these were left behind in the quick module. Change-Id: Icef469e14d073170ec5b2296048874d2b7439385 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> (cherry picked from commit dbc4a6f5a74c6903a24f3cc377887fd47d67b5e1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Rename quick's 'newViewRequested' to 'newWindowRequested'Kirill Burtsev2021-08-198-52/+52
| | | | | | | | | Match new api within the page API. Change-Id: Ib2af2f5270f368813cecab8f1c6b7366d3b7172f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 339017523ed418a9dc48d9343e5dc63eb1f29ec1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add QtWebEngine Qt6 migration guide to list of migration guidesAndreas Buhr2021-08-191-0/+1
| | | | | | | | | Task-number: QTBUG-94933 Change-Id: I92690535f839ef92e7464fa09f994fcd4f53d7e5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> (cherry picked from commit 46502028596321d72147fd81a5131c5bbf7991c1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Clean up coding style in API header filesAllan Sandfeld Jensen2021-08-1933-73/+110
| | | | | | | Change-Id: Ifa5892415a1e0b8ce9b6bfa10719aba618e3b799 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit c9795481c6162f4e7800aa573c37e8a200b46782) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Document changes in qt6Allan Sandfeld Jensen2021-08-192-0/+153
| | | | | | | | | Fixes: QTBUG-94933 Change-Id: I8777b8136afad0e93c0762433471476840802ba6 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> (cherry picked from commit 7f4b0409eb5ce95b1cdb5d952c2996dfd9a14bd8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update documentation notes for build with WebEngine modulesKirill Burtsev2021-08-1813-23/+72
| | | | | | | | | | | Add cmake usage snippets for module's libraries. Remove quick version from code snippets. Fix minor documentation warnings. Fixes: QTBUG-94937 Change-Id: I2e5c8616ceeab495f604e135bb2aa2261c50c68d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit e3cc8e0283daa989ca6957a7100c2c11669f5d1f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Hide unneeded Quick C++ APIsKirill Burtsev2021-08-186-7/+7
| | | | | | | | | They are not supposed to be a part of public Quick API Change-Id: Ib04ea022192d0eec559c28a48bc87fabda932564 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit e264ac67505312a352d55a35b11192d60375f63a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add QtPdf to cmake buildMichal Klocek2021-08-1855-77/+432
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port QtPdf to Qt6: * QtPdf,QtPdfWidgets,QtPdfQuick libs * QtPdfQuickPlugin, QtPdfPlugin (imageformat) plugins * widget and quick examples * qtpdf tests To fit gn cmake integration and new repo layout code is a bit reshuffled. Compared to qmke build following features are not ported yet: * ios fat libs * qtbase 3rdparty static dependencies WebEngine build can be skipped with setting QT_FEATURE_qtwebengine_build=OFF Note this patch needs follow up for 6.2 branch to disable qtpdf builds by default, since this should not part of qt 6.2 release. Task-number: QTBUG-95353 Change-Id: I4dd9f3934bdd478fb6d2fa686074a24d91f09953 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 79d04aa9e3e9aa84d7378260519f9e9a6759dc41) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Refactor gn targetMichal Klocek2021-08-182-110/+54
| | | | | | | | | | | | | | | | | | | | | Currently we get hangs on ci, to investigate the issue go through current cmake code and: * remove all dummy ninja targets * remove implicit dependencies * build dir in form of buildDir/config/arch * separate ninja call for sandbox * separate ninja call for covert_dict * clean up universal build * change handling of rsp files, so they are generated during build and not configure time * refactor functions so universal build can be easily used by follow up qtpdf patch Change-Id: Id4a6c61b87fe76832232035fddf212b57051d0ec Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 58b787cbad581914367aea4604993cce30a65d06) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Replace discouraged Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPEv6.2.0-beta3Andreas Buhr2021-08-123-3/+3
| | | | | | | | | | | | | | | Q_MOVABLE_TYPE was conceived before C++ had move semantics. Now, with move semantics, its name is misleading. Q_RELOCATABLE_TYPE was introduced as a synonym to Q_MOVABLE_TYPE. Usage of Q_MOVABLE_TYPE is discouraged now. This patch replaces all usages of Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPE in qtwebengine. As the two are synonymous, this patch should have no impact on users. Task-number: QTBUG-86829 Change-Id: I6cf26bb24c4d68cc3da85193cf6f8e63daeaa9d7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit b5a5042f582bd3849d89a1284650df0f5c5834c9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove local-access-allowed from qrcAllan Sandfeld Jensen2021-08-121-1/+0
| | | | | | | Change-Id: I120f4e4e167d621efb6c13f5d16cc13134540352 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit a3a330a9ae031bd19796d62f5e91bc25f5f97769) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Ensure certificate error callback call for all typesKirill Burtsev2021-08-101-2/+4
| | | | | | | | | | | | | Amends a2a9ea11f9. Actually reject certificate when it's considered to be fatal. Adapt tests for possible regression but checking if load really failed (due to missing internet access) or was just halted by missing callback call internaly. Change-Id: I656525c353ce410f7bda8c55227a29fcd617bfdd Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 3acfd3b1cd39e89fb6bc2f0da3412f07d68de7b6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove QWebEngineCallbackAllan Sandfeld Jensen2021-08-109-465/+37
| | | | | | | | | | Was no longer used in exposed APIs Fixes: QTBUG-74588 Change-Id: Iaf4943983655fc79e67df28f5cd4c4961b360579 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit c4d794898394d7d0f79001a04c8cff50dbc4fba7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix missing xkbcommon include on openSUSEMichal Klocek2021-08-101-0/+8
| | | | | | | | | | | | We include xkb_key_code_converter.h when compiling ozone_platform_qt.cpp Fixes: QTBUG-95473 Change-Id: I45f8dbdd3bcd7934d376256ec08560a8327a8e70 Reviewed-by: Christophe Giboudeaux <christophe@krop.fr> Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 0d79f35e48fddc3c3c294c0da2555130cbcd084a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Return printToPdf to QWebEnginePageAllan Sandfeld Jensen2021-08-105-57/+123
| | | | | | | | | | It doesn't use QPrinter and can be done using QtGui classes only. Change-Id: I0e14563c1bb5e93d9803bb1a807f702b1a2a5315 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> (cherry picked from commit b405ed26336a44ad4f359cdb4e1909e31c113cd4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Reintroduce File Picker controlBalazs Egedi2021-08-103-11/+12
| | | | | | | | | | | - Using FileDialog from QuickDialogs2 - Enabled the UIDelegates test Task-number: QTBUG-93666 Change-Id: I8438a2498e864bc93abf26f2527d7883ac26ca9b Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 47d57eaa2756a108ae28d9e6226577fe66868cee) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add QWebEnginePage::view() replacementAllan Sandfeld Jensen2021-08-092-0/+16
| | | | | | | | | | Make it a static getter in QWebEngineView Fixes: QTBUG-95331 Change-Id: I552f0047343abd909c5cd521a7a7a01d62896b00 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 3fd9d08bc24bc5f769677b411750d73801adc2d2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix wrong CHROMIUM_VERSION with cmakePeter Varga2021-08-061-1/+4
| | | | | | | | Fixes: QTBUG-95614 Change-Id: I78b011400c10c28c5de15ea12f684b7e1766af37 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit e87e25b32f98420fa527276ea6a73d1a76e4e64c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Suppress console window for subprocess on windowsKirill Burtsev2021-08-061-0/+1
| | | | | | | | Fixes: QTBUG-95571 Change-Id: If1a14f5cd5b9428e4c6265c5464b071fd8320562 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> (cherry picked from commit 16a4b10877ca7cdcd733bdf902e58f362ddb6e95) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Implement QML Color DialogBalazs Egedi2021-08-051-12/+274
| | | | | | | | | | | Quick Controls 2 does not contain Color Dialog, the Labs version does not run on every OS. Task-number: QTBUG-93666 Change-Id: Idfb1fd017a7f7b74c4ad135575a9727607dacac4 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 27bd65913943f589b6c94d85f9d96a73de94a24c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QtWebEngineProcess: fix installationLi Xinwei2021-07-292-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 09e5da6ac44c01ae0de34b789c42da515e82f07c, we pass "NO_INSTALL" to qt_internal_add_executable(), so we have to handle some installation issues manually. Use qt_get_cmake_configurations() instead of get_install_config(). Because get_install_config() only returns the first config in a multi-config build, this causes the debug executable not installed. We can install the debug executable to ${INSTALL_LIBEXECDIR}/Debug, like other executables, to avoid conflict with the release executable. But this will make installation codes very complex. So I propose to restore Qt5's behavior for it , add a "d" suffix to the debug executable and install both executables to ${INSTALL_LIBEXECDIR}. This can also avoid breaking windeployqt's logic of finding the debug executable of QtWebEngineProcess. Also adjust the output directory property to place executables under the correct directory. The release executable should be placed under ${QT_BUILD_DIR}/bin rather than ${QT_BUILD_DIR}/bin/Release. Given that the debug executable now has a "d" suffix, it can also be placed under the same directory. And install PDB files manually because QtWebEngineProcessd.pdb should be installed to ${INSTALL_LIBEXECDIR}, but qt_internal_install_pdb_files() will install it to ${INSTALL_LIBEXECDIR}/Debug. Change-Id: I38b5e8d9ed939b88de86ab5722dd56777442ed03 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 7846457b067491ffb289e625282b1e89074253ee) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QWebEngineNavigationRequest: Prospective fix for clang parsersFriedemann Kleint2021-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | The clang parser in Qt for Python and likely qdoc choke at QT_DEPREQT_DEPRECATEDCATED Q_ENUM: QtWebEngineCore/qwebenginenavigationrequest.h:85:19: error: expected member name or ';' after declaration specifiers Properly deprecating the enum would be done by specifying QT_DEPRECATED behind the enum keyword, but that causes deprecation warnings for the setter and getters ( action()/setAction()). Since they are deprecated, too, just remove the deprecation from the enumeration. Amends 13254e7950a032ebbeb11b1cf54b850c8326fb30, Change-Id: I3ecf9b52abc0b5a6e503097b7a1d20c69a1c5f93 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 6117b0ffb9a8dab550486dbfa362f7a398ff8f5b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Disable kAllowContentInitiatedDataUrlNavigationsAllan Sandfeld Jensen2021-07-231-5/+0
| | | | | | | | | | | | | | | | It is bound to disappear from Chromium sooner or later, and is more secure turned off. [ChangeLog] Page content may no longer navigate to data-urls, if this is needed we recommend using custom-url schemes instead or force old behavior using --enable-features=AllowContentInitiatedDataUrlNavigations, though the feature switch may be removed in any later update. Change-Id: I9398f54bcb49dce90afa049b2a2f4acf6f9810f7 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit b7634f470a7d515957d0c65c1aaef0a54280a2b2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump copyrightsAllan Sandfeld Jensen2021-07-2315-15/+15
| | | | | | | Change-Id: I8eb8bfba45abb340816b8c2072cca4486c1f37ab Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit 802eb3afed55faf390fc8ed9dd78ff073e366267) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add support for macOS universal buildsAllan Sandfeld Jensen2021-07-232-395/+436
| | | | | | Change-Id: I416036a925167204cf5121108922911bce854352 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 35144cbc3a285029574ea3ef45e4a6790f9607e4)
* Remove IPC message loggingPeter Varga2021-07-2310-62/+3
| | | | | | | | | | Doesn't seem to be useful, chromium community doesn't maintain it anymore. Change-Id: I24071d6319c258f2d88f3bde5c38dd9fddeec9a8 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit b6c57f4eeeca503e643cf8b3ddc1ec70bfe75886) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add QWebEngineNewWindowRequest::openIn(QWebEnginePage *)Allan Sandfeld Jensen2021-07-233-5/+22
| | | | | | | | | Makes for a nicer API Change-Id: I15e72d526e9cf6cf9ca8bd3e24f5dd7e7b2e9fa5 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> (cherry picked from commit 9285872b0dd4da8c0ba1dd8ef6c6822f85622f4e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve toolchain generationAllan Sandfeld Jensen2021-07-222-3/+3
| | | | | | | | | | Set is_clang and calculate v8-host arch for other hosts than x64. Change-Id: I5622839840141ed60328c8bd736e4cada3e0ecee Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 9196f743cec64840c711d00a8e906b480ba1451e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix crash in UI thread after deletion of profile io data on IO threadKirill Burtsev2021-07-221-5/+7
| | | | | | | | | | | | | | Access happen if io data was removed in io thread by posted task earlier than shutdown call. Ammends a5e627160c ==853575==ERROR: AddressSanitizer: heap-use-after-free on address ... READ of size 1 at 0x6120001946c0 thread T0 #0 QtWebEngineCore::ProfileIODataQt::shutdownOnUIThread() profile_io_data_qt.cpp:109:9 #1 QtWebEngineCore::ProfileQt::~ProfileQt() profile_qt.cpp:117:22 Change-Id: Ia5b7710553e80cbb95bde0855093d31a60781c2b Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 95a166e60bf8a23001adc3cdbd90a3b10340b11f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Refactor cmake buildMichal Klocek2021-07-224-244/+45
| | | | | | | | | | Add macros to share common cmake code blocks with QtPdf. Reconsider later to do proper scoping and change those to functions if make sense. Change-Id: I500acdba1415feab373a012dcf9a9ddedf33cfac (cherry picked from commit b3031066d17ef01802a4c9752f87675d6a4a1df5) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 02:12:35 +0000