summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix indentationAllan Sandfeld Jensen2021-09-011-17/+17
| | | | | | | Change-Id: I70375cabda3282e9dc1aa1a8e0513522abbcd383 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit c23cc454e67ea0fa52e56c82d51f67a1dcf282de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix target name collision for top level buildMichal Klocek2021-09-013-7/+7
| | | | | | | | | | | When doing top level build we have tests and examples which have same target name as in other modules. Task-number: QTBUG-95590 Change-Id: I94662b3b8f71583213dea664df35b86e24dc7579 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit eb06977c7a8d4afb4b15e02f818dd658c04d1cc8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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>
* Simplify test examples target includesMichal Klocek2021-09-013-16/+12
| | | | | | | | | | | | | | | Fix condition to include examples and tests based on targets. We are no longer behind external project so we can simply check for targets. Fix issue for including automoc call when running qt configure when doing top level build. Task-number: QTBUG-95590 Change-Id: I0cd2d8016e14ddf296455277e968b43a923a7217 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit faa74f9b402f6b5d78acdb71b05ca340684b3591) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use generator expression to get moc pathMichal Klocek2021-09-013-12/+4
| | | | | | | | | | | | | | | | | | | 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>
* Nuke all qmake files from testsMichal Klocek2021-09-0173-737/+0
| | | | | | | Change-Id: Ibad2e50d840a2eb0ccb9ac65158e512249a2bc79 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 24a695b4b7fda581c15600b111d6b6c3459ca1d9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2021-09-011-4/+4
| | | | | Change-Id: I5b09f72a944b7f4b205ae9cc67cd6b4863be16cf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2021-08-311-4/+4
| | | | | Change-Id: I43415616301a8434407eac1f3d1c832208b75ced Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Restore enums for QQuickWebEngineView from old-new API classesKirill Burtsev2021-08-313-2/+64
| | | | | | | | | | 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>
* Update dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2021-08-311-4/+4
| | | | | Change-Id: I200fda44ce26268f263322ddc2dc59d9ac58dd07 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_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>
* Fix crash in PrintMe exampleSzabolcs David2021-08-303-23/+32
| | | | | | | | | | | Connecting the same lambda slot multiple times to QWebEngineView::printFinished causes crash. Fix this by a minor refactoration and adjust documentation. Task-number: QTBUG-95339 Change-Id: I03b6a1ff6244c80073248182a905d8d664fdd326 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit e3679c1a8316b70fb6b8a0f85fdd06443de8b409) 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)
* Disable examples compilation on qemuMichal Klocek2021-08-301-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cmake builds when cross compiling have 3 different sets of qt libs: * sysroot * host * staging ones (target) However unlike qmake cmake does not support rpath-link therefore libs during the linking can be resolved to the sysroot instead of staging (target) ones, meaning we compile against newer headers and link with older sysroot's lib. Luckily this only happens when cmake is not able to set full absolute path to the library in staging dir, which in turn depends on rpath of the library. If rpath start with ORIGIN cmake will make absolute path and all implicit dependency libs are pulled from that lib location. However, during examples builds libs for given module are not installed yet, meaning there is no ORIGIN in rpath libraries so no absolute path meaning that all implicit dependencies in result are pulled from sysroot. This leads to linker errors in best scenario or to faulty linked application. The workaround introduced in QTBUG-86533 is to add all implicit dependencies as explicit, but in case of webengine it means adding log list of implicit dependencies to every single example. Simply disable build of examples as workaround. Note tests are not currently affected by that issue on coin, since they are built after installing module libs, which is not the case for examples. Note this issue is affecting us now, since external project is gone and we do not install libs implicitly during module build stage. Task-number: QTBUG-86533 Change-Id: Ica29cffcfbfcf66912af60ba4f8e88eca3af6f78 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 7d2a2bf1b022419872b9eac813afed112240631c
* Add workaround for not working linking with bfd linkerMichal Klocek2021-08-303-0/+33
| | | | | | | | | | | | | | | | | 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)
* Fix issue of not working dictionary conversionMichal Klocek2021-08-304-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test and examples are no longer included as external projects, this created and issue that convert_dict tool does not work during build time due to not installed resources. Before we supported converting dictionaries in a prefix build, by supplying the path to the ICU data file located in the Qt build path. The tool had wrapper script generated which set QT_WEBENGINE_ICU_DATA_DIR. This was done using QT_TOOL_ENV: icu_data_dir.name = QT_WEBENGINE_ICU_DATA_DIR icu_data_dir.value = $$OUT_PWD/../../../src/core/$$getConfigDir() QT_TOOL_ENV = icu_data_dir load(qt_tool) Add workaround for that issue with cmake by setting env variable with relative path to resources in build tree. Make example more exciting for new comers and add generator expression which guards the setting based on module build. Note this is temporary solution and webengine cmake api should be introduced to wrap the conversion tasks in some nice look public api based on qt_internal_wrap_tool_command. Disable example on windows, since on one of coin winodws machines we get error "Exit code 0xc0000135". Task-number: QTBUG-95590 Change-Id: I44664cbcc85b00ec66657e583929a0fba7bde65b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit b4915805b9527864e2475acfb29f7a029f3325ca) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Rewrite gn-cmake integrationMichal Klocek2021-08-3019-757/+672
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-303-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-306-88/+87
| | | | | | | | | | | | | | | | | | | 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>
* Support builds with ConanIikka Eklund2021-08-262-0/+79
| | | | | | | | | | | | | | | | | | | Provide conanfile.py recipe to support building this module with Conan. The conanfile.py recipe inherits the main functionality from base class located in qt-conan-common.git. 'qt-configure-module(.bat)' and cmake is used for the builds. Dependencies (Conan requirements) are defined by the base class implementation which reads those from the 'dependencies.yaml' which is also used by the Coin/CI. Task-number: QTBUG-94909 Change-Id: Ibe186eba4c3177c6f0cc7e397c395df0c8cb6d20 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit a68e93ade8ae39e2b11904d2c3115c9d69e87932) 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-235-25/+25
| | | | | | | | 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>
* Update dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2021-08-201-4/+4
| | | | | Change-Id: I7e6e4284d57281eab2f4ef62f7539a1de9a4cf3e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Apparently we build fine with node.js 10.19 on UbuntuAllan Sandfeld Jensen2021-08-202-3/+3
| | | | | | | | | 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>
* Update dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2021-08-201-4/+4
| | | | | Change-Id: I259ce7289a60118f65f11ad3b3b0562cea29c4e4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Rename quick's 'newViewRequested' to 'newWindowRequested'Kirill Burtsev2021-08-1914-82/+82
| | | | | | | | | 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>
* Remove import versions from Quick auto testsBalazs Egedi2021-08-1943-126/+126
| | | | | | | | Task-number: QTBUG-93666 Change-Id: I502c240ba541c1c13505f0e78a4098e2aa229af8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit fc18c6b42fab945b7bca044511a23eab7726e8fa) 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>
* Currently we require ICU >= 68Allan Sandfeld Jensen2021-08-191-1/+1
| | | | | | | | Fixes: QTBUG-95564 Change-Id: Ic3d018b9f3be245a382baf169ba4231663aa0b3d Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> (cherry picked from commit 4e7267773b8b2f7b6e0bdf01c06d77967e299b9f) 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 dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2021-08-191-4/+4
| | | | | Change-Id: I44ff8f1602c4264cdacd0ffe689ca94f40f22357 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Disable qtpdf build for 6.2Michal Klocek2021-08-181-0/+1
| | | | | | | | QtPdf it is not relased with qt 6.2. Task-number: QTBUG-95353 Change-Id: If31b6e5f37afdb59cb8d721b33b00eda9fd9e1ff Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* 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-187-9/+9
| | | | | | | | | 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-1875-225/+853
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-183-240/+201
| | | | | | | | | | | | | | | | | | | | | 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>
* Update dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2021-08-181-4/+4
| | | | | Change-Id: I42edea7f41ca86d0d0d1f251a352426f66d4949e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2021-08-171-4/+4
| | | | | Change-Id: I2c19c8074b56574aea747decb0e8d0a7ae31f25b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwebengineQt Submodule Update Bot2021-08-171-4/+4
| | | | | Change-Id: I202320f939146278e8085ccb8706309da4de5f95 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 14:32:46 +0000