summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Introduce http status code domain for loading infoKirill Burtsev2022-04-187-5/+18
| | | | | | | | | | | | | | | | Fix inconsistency in reporting load info error category for http status codes, which across versions was reported either as internal error category or just no error domain. Add new separate domain for http status codes. [ChangeLog][QWebEngineLoadingInfo] Added HttpStatusCodeDomain for http status code range of errors Fixes: QTBUG-94963 Change-Id: I9fd496248c6fa33c424d758e9a0be99758aaf061 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Benjamin Terrier <b.terrier@gmail.com> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* doc: Add more docs to PdfPageImage and PdfSelectionShawn Rutledge2022-04-172-0/+23
| | | | | Change-Id: I939c6988436b2168b5df5a7b662eb09364832823 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* doc: Add Qt Quick details to the Qt PDF module page; clarify examplesShawn Rutledge2022-04-171-0/+22
| | | | | | | | | The module is more about Qt Quick than about widgets nowadays. Also clarify on the Qt PDF Examples page that one example uses widgets and the other uses Qt Quick. Change-Id: I38a77a4290f9489ef17bf66fe3a0f69be9bd0e88 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix granted file access after local/remote access cleanupAllan Sandfeld Jensen2022-04-141-3/+16
| | | | | | | | | | | We forgot to check for files specifically granted access to. This blocked a number of features including dropping local files. Pick-to: 6.3 6.2 Task-number: QTBUG-102192 Change-Id: I5d34d9ba5351ec179df5896e64cc95c5481c7dc2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* Fix fatal error in getCurrentKeyboardLayout()Martin Negyokru2022-04-131-19/+6
| | | | | | | | | | | | | | | FATAL:xkb_keyboard_layout_engine.cc(640)] Keymap file failed to load: dk(polytonic) Remove unnecessary tokenization of XKB layout. Parsing of layout configuration is already handled by XkbKeyboardLayoutEngine::ParseLayoutName(). Fixes: QTBUG-101201 Task-number: QTBUG-92971 Pick-to: 6.2 6.3 Change-Id: Ia4f09ed99eb82064a3b12e14eda69a6e0e12b0dd Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add manual tests for PdfPageViewShawn Rutledge2022-04-121-24/+7
| | | | | | | | | | | | | | | | | | | | Before ff13e6532975b5372280c02061cb1b7227cf6699 the pdfviewer example used PdfPageView; but from then until now, it was not used anywhere. Now there's a manual test, slightly more refined than it was then. PdfPageView no longer takes care of its own positioning (scrolling or panning by whatever means): the user has the responsibility for that (as in the pdfPageView manual test). But it still does its own pinch zoom and text selection, so it's not completely devoid of event handlers. This also makes it suitable for the the multipleDocuments manual test, which creates a fullscreen transparent MDI window with fake windows inside, one per document opened. Worked around some issues by having PdfPageView as the top-level item in the Component. Fixes: QTBUG-102295 Change-Id: Iedb9ed7d15fa3461c07bd5d6ea54a30c20f747da Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* PdfQuick: deal with loading a different documentShawn Rutledge2022-04-126-1/+40
| | | | | | | | | When loading a new document, clear the navigation stack, reset the view to the upper-left corner, and clear the special device in PdfPageImage. Task-number: QTBUG-102294 Change-Id: I275b46f8958d4e8abe3814c1f358df5969c36d4d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* QPdfDocument: qCDebug time for FPDF_InitLibrary and FPDF_DestroyLibraryShawn Rutledge2022-04-121-2/+8
| | | | | | | | FPDF_InitLibrary seems to take too long. Task-number: QTBUG-102394 Change-Id: Ia5b629885a5a8a50dfd787f370d85878ad043046 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Improve namespaces in browser_accessibilityAllan Sandfeld Jensen2022-04-121-49/+40
| | | | | Change-Id: Icea80d63689d64bbfb70390898b30f760bbe5fdf Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Do not store CF_HTML header in QMimeDataPeter Varga2022-04-081-1/+10
| | | | | | | | | | | | | | | | | QMimeData doesn't handle it. Keep "<html>\r\n<body>\r\n<!--StartFragment-->" and "<!--EndFragment-->\r\n</body>\r\n</html>" tags because they are required for proper pasting of an HTML fragment on Windows. Fixes: QTBUG-100806 Task-number: QTBUG-92539 Pick-to: 6.2 6.3 Change-Id: I9e8a2f9592e56b9acc011b7640e589c43b558543 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* doc: fix QtPDF doc warnings and mistakesShawn Rutledge2022-04-086-8/+9
| | | | | Change-Id: Id2ce2bd8852c4051edd29bf474bac216ba14f2b5 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Move QQuickPdfNavStack core into QPdfNavigationStack; use in QPdfViewShawn Rutledge2022-04-0813-529/+406
| | | | | | | | | | | | | | | QQuickPdfNavigationStack was implemented independently until now, but users will need the same functionality in widget-based PDF viewers. QPdfPageNavigation on the other hand may have eventually had the same aspiration, but was just a glorified up/down counter thus far, with questionable API; so we get rid of it, and make the API for page navigation as much the same as possible between Quick and Widgets. We rename push() to jump() along with removing the emitJumped argument. Now jump() always emits (so we have to be more careful when to call it). Change-Id: Icb07158a351e29b81e58ec037cd323bc0f54a1a1 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Resolve status code for http response with failureKirill Burtsev2022-04-073-13/+28
| | | | | | | | | | | | | | All non-default https status codes are hidden under net::ERR_HTTP_RESPONSE_CODE_FAILURE error of network stack. Handle successful load case and set the real http status code for error. Also set localized load error description only for http codes. Pick-to: 6.2 6.3 Fixes: QTBUG-46860 Fixes: QTBUG-61100 Task-number: QTBUG-94963 Change-Id: I81e083441d1814fb530f39ea3da1c4ef52b7da59 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix location of WebEngineProcess on build machines for framework buildsMichal Klocek2022-04-072-6/+17
| | | | | | | | | | | | | | | | | | | | | For some unknown reason we had built qtwebengine process in 'libexecdir' and installed later into 'libdir' for module frameworks builds. Unfortunately this can not work if you run tests on same build machines as bundle for webenginecore will be loaded form build dir and not form installation dir resulting in load of webengineprocess form incorrect 'libdir'. Set simply correct build paths, so they match install ones: framework build uses 'libdir' and non framework one 'libdirexec'. Remove bogus copy line as it is no longer needed for super builds. Copy resources locally to build tree so local build tree test can use them during execution. Pick-to: 6.3 6.2 Change-Id: Ib61ac5659330386ca43c9e403d5fe4d5e214158f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix build with libc++Qt Submodule Update Bot2022-04-071-0/+19
| | | | | | | | | | | | Fix build with libc++ on linux by adding missing use_libcxx parameter. Check if re2 and poppler can be used as they use std::string in their api. Add compiler test to check that. Pick-to: 6.3 6.2 Change-Id: I74bf79b8443ad470621c1a2e0c9dc768d4cca1f1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* doc: begin adding docs for MultiPageView component and exampleShawn Rutledge2022-04-075-8/+232
| | | | | | | Pick-to: 6.3 Task-number: QTBUG-81560 Change-Id: I062e022a97c146e9a746b6d6358868bfe0c0a7d7 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix build on Mac M1Szabolcs David2022-04-063-0/+3
| | | | | Change-Id: I27bc0a6dcd91d3c7059479ea464b24c47bb76420 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Expose PdfBookmarkModel to QML; use with TreeView in manual testShawn Rutledge2022-04-067-5/+186
| | | | | | | | | | | | | | | | | | | | | | | | | - TreeViewDelegate uses Qt::DisplayRole by default, so we need it to map to the text we want to display, in the roleNames() hash. But asking explicitly for the TitleRole is OK too (as before). - In QML, the document property must be a QQuickPdfDocument, whereas in C++ QPdfDocument is used directly; so we shadow the document property for QML. Therefore QML_EXTENDED(QPdfBookmarkModel) does not work: we need real inheritance to get real property shadowing. - Added tests/manual/quick/pdf/bookmarks.qml with a TreeView - Clicking the TreeViewDelegate expands the subtree if there is one; but it also goes to the destination in the PDF, whether there is a subtree or not. But this can be fixed in TreeViewDelegate. - Added tests/manual/quick/pdf/bookmarks-list.qml to test the case with structureMode: PdfBookmarkModel.ListMode (using ListView) test.pdf is uninteresting for this purpose: there is only one bookmark; but you can run these tests with an optional argument like this: qml bookmarks.qml -style Material -- ~/path/to/some.pdf qml bookmarks-list.qml -- ~/path/to/some.pdf Change-Id: I65d12a3d9b8ef0f0fa2bc99003430324fd759dcb Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* QPdfBookmarkModelPrivate: stop inheriting QAbstractItemModelPrivateShawn Rutledge2022-04-062-25/+10
| | | | | | | | | | We try to avoid private API from other modules, for portability between different Qt versions. Task-number: QTBUG-102156 Change-Id: Ia95a026fbae946eba53ad6835c7615214d93ec62 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Advertise correct security levelAllan Sandfeld Jensen2022-04-061-1/+1
| | | | | | | | | | Otherwise it will look like we are still vulnerable to the critical CVEs Change-Id: I205e4b5cb72021f56621772d36a27f9fa5dc340c Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 00e4a2ac3f694b5ec1999af3518f1c550b662057) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use QML_EXTENDED to "inherit" QPdfDocument props, enums and signalsShawn Rutledge2022-04-066-85/+77
| | | | | | | | | | | | | | | | | | | | | In QML we want to treat the status values like Error and Ready as if the enum were declared in QQuickPdfDocument, even though it's really from the non-QML type QPdfDocument. This is needed because QQuickPdfDocument doesn't inherit QPdfDocument (9968e2578f96081d2a242340620fcb2b96d9a1d3 could've done direct inheritance, but we sometimes value separation of QML API from C++ API). So we now de-duplicate other properties and signals too. It's as if from QML's perspective, PdfDocument inherits everything from QPdfDocument (including the properties pageCount, password and status), although in C++ it's not like that. Make all properties FINAL because we don't expect anybody to subclass QQuickPdfDocument. Fixes: QTBUG-100839 Change-Id: Idbb0d620443020d7168cba8f090d1f344a9b3296 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* doc: Document the QPdfSearchModel C++ classShawn Rutledge2022-03-312-0/+62
| | | | | | | | | | | PdfSearchModel already has QML docs since b6dd845ec4a6bfb6b620686681e20d38a2f24101; but QPdfSearchModel could also be used in widget applications (although we haven't added it to the widget example yet). Task-number: QTBUG-81560 Change-Id: I23adf4ef777542a7aea6ecade74ca583a0933d43 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Enable use of system ICU in QtPDFAllan Sandfeld Jensen2022-03-301-4/+8
| | | | | Change-Id: I88b402d3da4ec079a72ff6882e68f09b2d507446 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix a few code checker warningsAllan Sandfeld Jensen2022-03-303-4/+4
| | | | | Change-Id: I0eb2cb362759e9a02a61993574906fc1e4b8ffeb Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* Update ChromiumAllan Sandfeld Jensen2022-03-291-0/+0
| | | | | | | Pulling in 98-based changes. Change-Id: Ia6dd4b5596f63fa1fd1f38d480867f8769d97336 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Adaptations for Chrome 98Allan Sandfeld Jensen2022-03-29119-927/+400
| | | | | Change-Id: I607604f85a111a69da77ca949dddf3399b9721b3 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Adaptations for Chrome 96Allan Sandfeld Jensen2022-03-2943-211/+256
| | | | | Change-Id: I40039658762b8788a0be57bd186efab71f3e4448 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* QPdfDocument: replace QScopedPointer with std::unique_ptrShawn Rutledge2022-03-291-2/+2
| | | | | | | As suggested by the warning, because take() is deprecated. Change-Id: Ib7372ee6119cc0bb07380e49f94b16e2993f353a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Remove dead ozone codeAllan Sandfeld Jensen2022-03-262-12/+1
| | | | | | | | This code does nothing now Pick-to: 6.3 Change-Id: Ic4fca6c89a8ae42a5bb2264eb8d946f878449556 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Find GIO with QtBase 6.2Allan Sandfeld Jensen2022-03-251-1/+4
| | | | | | | | | GLIB2 doesn't find GIO with Qt 6.2, so try adding a fallback. Pick-to: 6.3 Task-number: QTBUG-100435 Change-Id: Ic98a7aea07b726dc4f6e76a65669ca92b1916b5c Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* Avoid crashing on context free web actionsAllan Sandfeld Jensen2022-03-241-15/+15
| | | | | | | | | | If a web action that depends on a context is called, do nothing instead of crashing. Pick-to: 6.3 6.2 Fixes: QTBUG-101724 Change-Id: I7a0040a58e9dc7fa14f0cae71cf1bcd086b61c54 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* Clean up includes in profile_adapterMartin Negyokru2022-03-242-8/+5
| | | | | Change-Id: If345d774651b801362da67ff9d3f80867662b29d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix include guardAllan Sandfeld Jensen2022-03-241-2/+2
| | | | | | Pick-to: 6.3 6.2 Change-Id: Iedb95f6c7128834a701e4c5549dd0fec44b0ee8f Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* QPdfDocumentRenderOptions: pass by cref where still possibleMarc Mutz2022-03-241-3/+3
| | | | | | | | | | | | | The object is quite large (16 for QRect + 8 for QSize + 4+4 for flags = 32 bytes), and Clazy complains about passing it by value. Fix at least for the relational operators, where, granted, it makes least sense (them being inline). The other users are behind the ABI wall, though. Change-Id: I9a70d007cc1f90e3ee71d3522c02fd7efcbee6ba Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* QPdfDocumentRenderOptions: fix compilation with QT_TYPESAFE_FLAGSMarc Mutz2022-03-241-1/+1
| | | | | | | | ... which is now enabled in headerscheck. Pick-to: 6.3 Change-Id: Ifee53c6ab0cff5d25928cdd4e569ce740d7a2362 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Combine QPdfDestination and QPdfSearchResult into QPdfLinkShawn Rutledge2022-03-2414-425/+251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inheritance was a decent way to model this, conceptually. A hyperlink is modeled like the HTML kind: a region covering the source material that the user will click on, and a destination where we will jump when they click it; whereas a search result has the same information plus the text before and after the search text, so that we can show some context in a ListView with search results. By going this way, we need to document which fields we use which way under which conditions. But, we have a rule that value types cannot use inheritance, just in case the user would ever try to use them polymorphically (in spite of the other rule that we never pass value types by pointer, and thus there is no actual polymorphism), or just in case the destructor of the base class would not be called when a subclass value goes out of scope. Anyway, perhaps an upside is that this resembles a link in Xanadu, or in a fully-normalized database schema: an object that fully describes both ends of a connection, and thus is able to traverse either direction, in theory. (Although we don't really use it that way. The link-following behavior in a PDF viewer tends to be one-way, as in a web browser.) When using QAbstractItemModel (as in QPdfSearchModel and QPdfLinkModel), the cells in the "database" are accessed separately via the data() function, so there is no need for a transport object to hold a whole "row". That's OK for item views; but we need this link object for the purpose of less-clumsy C++ API, as a return value from a few functions. For example when implementing a viewer in QML, we use Repeater to instantiate Items for each hyperlink (decorations and a TapHandler), and Repeater uses the QAIM interface. But when implementing a widget-based viewer, it's better to call a hit-testing function like QPdfLinkModel::linkAt(pos) to find out whether a link exists at a particular mouse location; and that function can return a QPdfLink. In this case, the link will not contain contextBefore and contextAfter, because the viewer doesn't need them, and it's difficult to find this text in the PDF model. But QPdfSearchModel::resultsOnPage() and reultAtIndex() return link objects that do contain the context strings. We don't expect users to have made much use of these classes in C++ so far, because we prioritized QML API (which this change does not affect), and did not yet document how to use QPdfSearchModel and QPdfLinkModel in widget-based viewers. Fixes: QTBUG-98886 Change-Id: Ie68f9b893a342d145abac0b143e9254827c70bd7 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix transitive includesShawn Rutledge2022-03-212-3/+5
| | | | | Change-Id: I6c7dfe29305548c3d68f8d26f46c9bea277d101d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Replace outdated license headerKai Köhne2022-03-212-20/+26
| | | | | | | | | Replace outdated header.LGPL3 with header.LGPL. Amends 7b8832ca2 Change-Id: I6a7b4406413febe7cfaca7f5698e4c93692526b7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* doc: Document the rest of the public API in QPdfDocumentShawn Rutledge2022-03-191-4/+49
| | | | | | | | Pick-to: 6.3 Task-number: QTBUG-81560 Change-Id: I145ff595e07c9e60139eb169832be86741698799 Reviewed-by: Luca Di Sera <luca.disera@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix wrong assumption about focus in/out event deliveryMichal Klocek2022-03-182-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 2947d79d assumption was made that we never get focus in event for popup reason. Unfortunately this is not true as simply creating window menu and switching between webengineview will trigger the issue. Moreover, focus in and out events with popup reason do not mean change of focus, as in qtbase: if (QWidget *fw = active_window->focusWidget()) { if (fw != QApplication::focusWidget()) { fw->setFocus(Qt::PopupFocusReason) } else { QFocusEvent e(QEvent::FocusIn, Qt::PopupFocusReason); QCoreApplication::sendEvent(fw, &e); } } Therefore it is safe to ignore focus in/out events with popup reason. Note that the fact that ASSERT got not triggered for context menu is due to another race condition issue in qquick event stack delivery. This commit amends 2947d79d8210a7ae4ce2bc02e058628e66011be3. Fixes: QTBUG-101706 Change-Id: I3e761fe5d8054aed72461eba7981c69755877d1b Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> (cherry picked from commit 0625a1e16b8698d9c344548e4e929fb385b6a542) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PDF C++ classes: mark destructors with override keywordShawn Rutledge2022-03-185-5/+5
| | | | | | Fixes: QTBUG-98890 Change-Id: I30ceaeb978e430cf6dbad659023d012688c77b21 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* QPdfView: scale page rendering according to devicePixelRatioShawn Rutledge2022-03-181-2/+2
| | | | | | | | | On high-dpi screens we want the rendered pixels to match device pixels. Fixes: QTBUG-86948 Pick-to: 6.2 6.3 5.15 Change-Id: I4879adc0aeb001750d42abc1e7d50ca3f11a5fe8 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Handle qtpdf compilation with static runtimeMichal Klocek2022-03-172-1/+10
| | | | | | | | | Add feature to enable compilation with static runtime. Fixes: QTBUG-94046 Pick-to: 6.3 Change-Id: I6e150cfaad020dfd942c45111139556b7e50dce5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add bitcode support for qtpdf on iosMichal Klocek2022-03-172-1/+14
| | | | | | | | | | Adds -fembed-bitcode-marker for debug or -fembed-bitcode in case of release. Fixes: QTBUG-94368 Pick-to: 6.3 Change-Id: I65031a545517799245e8d08d79e78141d26e9c58 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update ChromiumMichal Klocek2022-03-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | Pulls in following patches: * 748d325bb6a [Backport] sandbox: build if glibc 2.34+ dynamic stack size is enabled * b5afc89ed07 FIXUP: Fix building with system ffmpeg < 5.0 * a205c506e73 [Backport] CVE-2022-23852 * a12fe545281 Add switch for static and dynamic crt * d89c7b12b91 [Backport] CVE-2022-0796: Use after free in Media * 00a0b8138d2 [Backport] CVE-2022-0789: Heap buffer overflow in ANGLE * 1e4dd159ca4 [Backport] CVE-2022-0797: Out of bounds memory access in Mojo * 2ca738dcf79 [Backport] CVE-2022-0803: Inappropriate implementation in Permissions * 5288c457bdb [Backport] Security bug 1269999 * bedf281d7c2 Do not add glType to command line again Pick-to: 6.3 Change-Id: I6f8c59aebd3400dd0aba71e54c8710c4fa35ede6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix qrc sources for QWebEngineScriptAllan Sandfeld Jensen2022-03-171-4/+3
| | | | | | | | 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>