summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Conan: Update recipe optionsIikka Eklund2022-05-191-0/+19
| | | | | | | | | Add missing 'qt-configure-module' features into recipe which should be available for consumers. Pick-to: 6.3 Change-Id: Icdea7cfb4450a9170207177372cc0f96214f540f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Un-blacklist QtPdf password testsShawn Rutledge2022-05-191-6/+0
| | | | | Change-Id: Ife034dc0578268c1bed660bbacc163f393a50c29 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Conan: Enable recipe exclude options passed to qt-configure-moduleIikka Eklund2022-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | Current implementation allows only to enable a leaf module feature and when setting the option/feature to 'no' it gets translated to not being passed at all to qt-configure-module. This change calls 'convert_qt_features_to_conan_options()' from qt-conan-common module which can correctly translate the given recipe options so that: -o option1=True -> qt-configure-module -feature-option1 -o option1=False -> qt-configure-module -no-feature-option1 Task-number: QTBUG-100073 Pick-to: 6.3 Change-Id: Ie7e58666c750e398523ced01ebd6d64d9929561c Reviewed-by: Toni Saario <toni.saario@qt.io>
* Doc: Use find_package(Qt6 REQUIRED COMPONENTS ...) idiomKai Köhne2022-05-163-3/+3
| | | | | | | | | | | Using REQUIRED as a prefix instead of suffix works better with OPTIONAL_COMPONENTS, and is also the order in the CMake manual. Pick-to: 6.3 Task-number: QTBUG-98867 Change-Id: I57928fb56e2a154d91873dc869f6d314a7ea5fce Reviewed-by: Rui Oliveira Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qtwebengineQt Submodule Update Bot2022-05-161-4/+4
| | | | | Change-Id: I30ad3b73acb739312cbc216afb985e5bdb6888f8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Refactor custom handlersAllan Sandfeld Jensen2022-05-1512-14/+360
| | | | | | | | Reimplement the chrome specific classes, as we use very little of them, and move everything to a subdir. Change-Id: I93873399b1bea46c08ed171b7dc75ad252f20108 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* Keep page's zoom level on loading new urlsKirill Burtsev2022-05-158-27/+97
| | | | | | | | | | | | Ammends d236c5a8a3. Zoom level was set as a temporal one, which is invalidated each time when a renderer process or widget are changed (on new navigation, for example), so it needs to be reapplied. Pick-to: 6.3 6.2 5.15 Fixes: QTBUG-101030 Change-Id: Iecff9686fbe2b79e99b46f67cab92f66127be085 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix software backend detectionAllan Sandfeld Jensen2022-05-141-1/+21
| | | | | | | | | | | QSG hasn't parsed and set the backend yet, so we do need to duplicate the logic it will use later to make a proper detection. Pick-to: 6.3 Fixes: QTBUG-103372 Change-Id: I542ef9f52dd2725d3ff6e17f9142786e43425ebd Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add NavigateOnDrop settingsAllan Sandfeld Jensen2022-05-138-9/+74
| | | | | | | | | | Some applications want this to avoid users navigating away from their app content. [ChangeLog][Settings] NavigateOnDropEnabled added, enabled by default. Change-Id: I2cc370f60ef42c708042cbc2503207f8254cf932 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* Update dependencies on 'dev' in qt/qtwebengineQt Submodule Update Bot2022-05-121-4/+4
| | | | | Change-Id: I3795a9a0feb08550cde18008584bec3e463e6fd9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix touch input for widget's delegate for html popupKirill Burtsev2022-05-122-6/+20
| | | | | | | | | | | | | | | | | | | | | Earlier fix cf8bc1899a introduced the logic, where all system synthesized mouse events are ignored. But after c56169f7a1 this is undesired since for widget with Qt::Popup flag touch input is ignored by QWidgetWindow, and input is expected to be delivered to popup as synthesized mouse event (either synthesized by Qt or for capabable devices by system). So allow system synthesized mouse events to let through for popup. Synthesis by Qt is suppress automatically for accepted touch event, it's only system event are still delivered unconditionally, so still ignore them for widgets impl. Global ignore in core is not needed, since QQuickWidget ignores system synthesized events unconditionally. Fixes: QTBUG-79254 Pick-to: 5.15 6.2 6.3 Change-Id: Ie8f55eb8b9c2677d8a98381effb3cb31d9388ac7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Martin Negyokru <negyokru@inf.u-szeged.hu>
* Fix touch input for html's popup in quick implKirill Burtsev2022-05-125-45/+140
| | | | | | | | | | | | | | Ammends 292f573f4e. Now that touch events are forwarded to popup delegate also instead of synthesized mouse events, the bug with touch event being ignored became present. Also extend testing of touch events for html popups. Task-number: QTBUG-79254 Fixes: QTBUG-103217 Pick-to: 6.2 6.3 Change-Id: I097a6617493355c7603fef8eb41025e299a6e809 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Update ChromiumAllan Sandfeld Jensen2022-05-121-0/+0
| | | | | | | | | Submodule src/3rdparty 3443c0d61..72d76568f: > FIXUP: Disable alternate window station of Windows sandbox > Find fontconfig using pkg-config Change-Id: I85def9b7f22623d31072a9e2ee2bf9b4ebfc3044 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* QtWebEngine: replace qSwap with member-swap where possibleMarc Mutz2022-05-113-3/+3
| | | | | | | | | | | | | | | qSwap() is a monster that looks for ADL overloads of swap() and also detects the noexcept of the wrapped swap() function, so it should only be used when the argument type is unknown. In the vast majority of cases, the type is known to be efficiently std::swap()able or to have a member-swap. Call either of these. As a drive-by, unify all member-swap()s to be noexcept. Task-number: QTBUG-97601 Pick-to: 6.3 6.2 5.15 Change-Id: I9184cab0ed74a1b32d62cf7c83dc1f1b7814c784 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Doc: Update Platform NotesKai Köhne2022-05-111-4/+3
| | | | | | | | | Remove references to Qt 5, qmake (as build tool for Qt), and Visual Studio 2017 only. Pick-to: 6.2 6.3 Change-Id: Ied2de9de91693f167c5fb22f007c203bce18b543 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Cleanup custom touch handles implementationMichal Klocek2022-05-108-150/+62
| | | | | | | | Do not introduce extra class nor dummy QML element. Fix docs. Change-Id: I9848f6865cd585779d89fe387ad97c27e7450eb9 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* Add QtQuick dependency to QtWebEngineMarco Bubke2022-05-091-0/+2
| | | | | | | | | | QQuickItem is referenced as prototype but there is no dependency declared to QtQuick where it is defined. Pick-to: 6.3 6.2 Change-Id: Ib024123b032fdadf3fe24a5a420b2c122d6594b7 Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Use qualified imports to avoid prototype loopsMarco Bubke2022-05-093-7/+6
| | | | | | | | | | In the designer model we don't use import order to simplify the meta type system. There are only very few places where we get a prototype chain loop. In most cases qualified imports are used. Pick-to: 6.3 6.2 Change-Id: If4baac38cabb7773f58c0d326806fd6fd5612a99 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add convenience constructors to QWebEngineViewAllan Sandfeld Jensen2022-05-093-11/+43
| | | | | | | | Make it easier to use alternative profiles without having to use QWebEnginePage directly. Change-Id: I8406c9ee3b453f7ff45e64bb05d0f5ad57e389c4 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix sandbox on framework buildsMichal Klocek2022-05-093-10/+22
| | | | | | | | | | | | On framework build we use bundle to get qt path. If build time bundle is picked than build path should be allowed file access. Moreover we really should be able only to access bundle path and not prefix path as resources and locales are in the webenginecore bundle. Pick-to: 6.3 6.2 Change-Id: Ic7d49ddf9c31dce52f59b38a75d558c875f15dae Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update ChromiumMichal Klocek2022-05-091-0/+0
| | | | | | | | | | | | | Pulls in following patches: * f0151b67cfa Fix mac toolchain python linker script call * 8c647adb6ad FIXUP: Fixes for building with MSVC * 599a6221a4b Minor. Use FilePath directly for qt sandbox path * 3443c0d6144 Minor. Add defined to checks Change-Id: I452e2bc801117bc261dd39c8fdf3cc7b7d5dfb06 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Find CUPS for printing on LinuxAllan Sandfeld Jensen2022-05-061-1/+2
| | | | | | | | | Just verify it is there. Pick-to: 6.3 6.2 Fixes: QTBUG-100300 Change-Id: If7d13afd788086cab13bab471a4dc415fa470ece Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Update dependencies on 'dev' in qt/qtwebengineQt Submodule Update Bot2022-05-051-4/+4
| | | | | Change-Id: I2b670fcc632fae7b25edd1389e00084aa426d05a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Quick: Add support for replacing touch handles with delegatesBalazs Egedi2022-05-0431-82/+735
| | | | | | Task-number: QTBUG-85043 Change-Id: I1c87aff352e07eb309d5ba8747b9e50a191d478e Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Clean up documentationAllan Sandfeld Jensen2022-05-036-13/+14
| | | | | | | | Make naming consistent, and fix a few links Pick-to: 6.3 Change-Id: I5b42ba92f8747d6bd86b1e84f74f6b15c80f444c Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* Fix leak if loader error is seen firstAllan Sandfeld Jensen2022-05-031-1/+6
| | | | | | | | | For some reason the proxied_loader_receiver can still be bound in this case. Pick-to: 6.3 6.2 5.15 Change-Id: If0bbe181eca5de41e82eebaced412361fe12fb40 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add workaround for unstable gn on macOS in ciMichal Klocek2022-05-033-0/+12
| | | | | | | | | | | | | | | | | | | | | | | In ci 'gn' can crash making it hard to integrate, if there is high load crashes occur more frequently sometimes even blocking integrations for few days. Limit number of worker threads for gn as this improves situation however increases time for generating ninja files from 2s to 7s. Note this will not prevent crashes however significantly reduces the issue (when running in loop from 1 per ~10min to 1 per ~3days) Compilation with address or thread sanitizer does not lead to meaningful traces. Moreover running gn with sanitizer creates deadlocks for unknown reason every few runs. Current assumptions is that macos vms are unstable as crashes also occur for sscache calls (compiler) and python calls. Pick-to: 6.3 6.2 Change-Id: I1c488796eb0547eedd20101606f18ed55718e9c2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix read-after-free on EGL extensionsAllan Sandfeld Jensen2022-05-024-16/+16
| | | | | | | | | Cache the read extensions as an std::string, since the returned C string may be not be permanent. Pick-to: 6.3 6.2 5.15 Change-Id: I856b2b784ab4027da25996b2bf741b30cda10e05 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Update forgotten version_resolved changeAllan Sandfeld Jensen2022-05-021-2/+2
| | | | | | | For Chromium 98 update Change-Id: Iba8aafcf627bd8339b6015e1c57d56de82254453 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Check for stdlib_libcpp feature as it might not existMichal Klocek2022-05-011-3/+7
| | | | | | | | Fixes undefined feature when compiling against 6.2. Pick-to: 6.3 Change-Id: I186d0a0905bfb7d03cff07c2dd6316172efebc04 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix missing dictionaries in case of user bundlesMichal Klocek2022-04-301-0/+7
| | | | | | | | | | | | If user creates bundle dictionaries should be copied to Resources in the bundle. Note our spellchecker unit test only covers non bundle case. Fixes: QTBUG-100799 Pick-to: 6.3 Change-Id: I5d4c0f7c1c21d35601a6e01dec1ecdb43202469f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Support cross-compilation on macOSMichal Klocek2022-04-307-23/+27
| | | | | | | | | | | | | | | | | | | | | | So far we only supported a cross-compiling with universal builds, however qmake also supports 'regular' cross compilation (by setting '-device-option'). This is semi-supported with qt-cmake as we need to provide additional configure defines like: * CMAKE_OSX_ARCHITECTURES=arm64 * CMAKE_SYSTEM_NAME=Darwin * CMAKE_OSX_DEPLOYMENT_TARGET=10.14 It might seem to be a far fetched issue, however in case of webengine doing the cross compilation for only one architecture allows to save compile times when testing only arm64 builds. Note we do not need to create gn toolchains for that case, however unlike universal builds it requires host qt build for tools. Pick-to: 6.3 6.2 Change-Id: Ica8470fdd4cad4866c1470e0403ffd019eaf39a6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* PDF multipage example: add footer button to hide/show the sidebarShawn Rutledge2022-04-305-0/+42
| | | | | | | | | | | | | When the sidebar only held search results, it was enough to show it when pressing enter on the search field; but now it holds two other views that the user will want to easily look at. It's a Drawer, and those are tricky to open and close by mouse-dragging. The button is more obvious, like the one at the bottom of Creator. Its checked state shows whether the sidebar is open, and clicking it opens the sidebar if it wasn't already open. Clicking outside the sidebar closes it. Change-Id: Ib4e403aa6f06d5e4dbad08a80c99496ab6c5fa0f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* PDF multipage example: add sidebar metadata paneShawn Rutledge2022-04-301-1/+30
| | | | | Change-Id: I33a365a1591565bc2a95c6ae62382c71c7e1850b Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Fix build with Qt 6.2Allan Sandfeld Jensen2022-04-291-1/+2
| | | | | | | QtPdfQuick now requires 6.4.0 Change-Id: If5743d897ec50e759aff635693512e10bde32fdf Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* PDF example and manual test: add GridView for thumbnailsShawn Rutledge2022-04-292-13/+166
| | | | | | | | | Change the PdfDocument's id to doc, because in the GridView delegate, PdfPageImage { document: document } causes trouble (even though the same sort of binding was ok elsewhere). Change-Id: I9eafd818c25a31bef50b0b7fba36449c1dcf884a Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* doc: Add docs for PdfScrollablePageView and PdfPageViewShawn Rutledge2022-04-292-2/+438
| | | | | | | | Pick-to: 6.3 Task-number: QTBUG-81560 Change-Id: Ib91da92942311f65e3a2a40eb08c5a7f053419b4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Update dependencies on 'dev' in qt/qtwebengineQt Submodule Update Bot2022-04-281-4/+4
| | | | | Change-Id: I6922c6ec59706868448675ab28b2dbf733eeccc7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update take_snapshot.py to include dependencies for Push MessagingSzabolcs David2022-04-271-1/+4
| | | | | Change-Id: Idb0ecba3dd42b9afa931cd9dd64f3a416def7af9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix navigation to non-local URLsAllan Sandfeld Jensen2022-04-263-3/+18
| | | | | | | | | They are passed in another part of the DropItem object. Task-number: QTBUG-102192 Pick-to: 6.3 6.2 5.15 Change-Id: If52a88ce2688c25ea0edcc0d1e8f962f2cdd29dd Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* PDF MultiPageView example: add bookmarks tree to sidebarShawn Rutledge2022-04-241-44/+85
| | | | | | | | | | | | | | | The Drawer is now not only for search results, but has a sideways TabBar just like the widget example has; and now it can show search results and bookmarks (table of contents) on different tabs. (Perhaps TabBar was not meant to be rotated, but it seems to work in the styles I've tried so far.) Clicking a bookmark takes you to that page, location and zoom. Followup to 303c25e79ab12d5d48523aa890f2091e98d3b560 which added this feature to a manual test. Task-number: QTBUG-77510 Change-Id: I235ff14c9f6597eb8282ef1d73112b023a61ef8a Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* QPdfBookmarkModel: add location and zoom rolesShawn Rutledge2022-04-243-4/+84
| | | | | | | | | | | We need them for more accurate navigation. Switch to initializing BookmarkNode's variables where declared, while we're at it. Task-number: QTBUG-77510 Change-Id: Ia6762c9b6336c9148a85ad782e71e5b59feab754 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* doc: Add docs for QPdfViewShawn Rutledge2022-04-234-12/+99
| | | | | | | | Wrap some long lines in qpdfview.cpp, as a drive-by. Task-number: QTBUG-81560 Change-Id: Ia9865c42e48c81ac2c99b5cbe9d5a10beff40847 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Support setting page to nullptr to unsetAllan Sandfeld Jensen2022-04-221-0/+3
| | | | | | | | Worked in 5.15, and now crashed. This patch returns 5.15 behavior. Pick-to: 6.3 6.2 Change-Id: Ib50dca96d9e90312cd2ee55aaf3205f5b848dd15 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Fix documentation of getter functionsAllan Sandfeld Jensen2022-04-222-24/+66
| | | | | | | | | | Add documentation file in doc dir, and add a related header as a documented header file. Pick-to: 6.3 Fixes: QTBUG-102743 Change-Id: Ibcbc39affe1915b0606e879a9ec5a1189f2d5aea Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Turn QPdfBookmarkModel::Role into an enum classShawn Rutledge2022-04-224-56/+57
| | | | | | | | | - link, search and bookmark models have similar role names now - being an enum class allows the role name to be shorter - the Role enum name is the same as the name in roleNames(), lowercased Change-Id: I2e710d7acb8479995d82ef2d324807b6cd4e10e5 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* PdfMultiPageView: fix PdfNavigationStack.onJumped horizontal scrollingShawn Rutledge2022-04-221-3/+1
| | | | | | | | | | | | | | | xOffsetLimit should not be divided by 2: it's meant to be the farthest that we can scroll to the right without going beyond the page edge. Since we still have the tableView.rebuild() workaround function, remove some calls to forceLayout() that seem not to help with anything, but just caused a warning: Cannot do an immediate re-layout during an ongoing layout! Pick-to: 6.3 Fixes: QTBUG-102742 Change-Id: I57f419467e01fc92c12e5d74262d8fa878ce1c79 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* PdfMultiPageView: re-layout when size changesShawn Rutledge2022-04-221-0/+2
| | | | | | Fixes: QTBUG-102746 Change-Id: I75528f86a2c8b3d61f73929ea64a1ce2f5e54167 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* CMake: Add a dependency on Gn.cmakeAlexandru Croitor2022-04-201-2/+5
| | | | | | | | Previously if Gn.cmake was touched, GN was not reran. Pick-to: 6.2 6.3 Change-Id: I39a070319c5af2a78a8f4e75f2f56ed87cdcb7da Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* CMake: Don't show gn output as it runs, show it after it finishedAlexandru Croitor2022-04-201-1/+0
| | | | | | | | | | | | | | | | | | Using USES_TERMINAL causes ninja to print the stdout of running GN as it comes in, rather than once GN has finished running. This causes extremely confusing logs in the CI when the GN run fails. The output becomes interleaved with execution of other parallel commands and the Ninja 'FAILED:' message is nowhere near the actual failure GN failure message. Remove USES_TERMINAL so that the GN failure message appears immediately after ninja's "FAILED:" message. Recursive ninja output is not affected. Pick-to: 6.2 6.3 Change-Id: Ibbfe5527cf291d9295ae19d988ee1fa83224b38b Reviewed-by: Michal Klocek <michal.klocek@qt.io>