summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Add license headers to cmake filesLucie Gérard2022-07-079-0/+27
| | | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: Iff8b50e402d070ba5fa2562fef50b7d7d3743cb4 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Jörg Bornemann <[email protected]>
* Fix CMake warning about using PUBLIC_LIBRARIES for pluginsChristian Strømme2022-06-174-4/+1
| | | | | | Pick-to: 6.4 6.3 Change-Id: I1832215bb1c0904aa21b511db79803f2d6570324 Reviewed-by: Alexandru Croitor <[email protected]>
* Use SPDX license identifiersLucie Gérard2022-06-1039-1422/+78
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I0f719de9e6e1fd4a7c50a247831e5a768e08df14 Reviewed-by: Jörg Bornemann <[email protected]>
* Add QtQuick dependency to QtWebViewMarco Bubke2022-06-071-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: I5cbf13290d6a1a026c0fe3bb085d39474964d700 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Maximilian Goldstein <[email protected]>
* Fix crash due to missing native functions for the cookie APIsChristian Strømme2022-05-092-22/+109
| | | | | | | | | | | The cookie API that was added in 317e13cb2d97 missed the registration and implementation for the native java functions needed for notifying when a cookie got added/removed. Fixes: QTBUG-102801 Pick-to: 6.3 Change-Id: I7594f75abba17b6ff1843d5349af085f90aae9b1 Reviewed-by: Assam Boudjelthia <[email protected]>
* Doc: Revise Qt WebView module landing pageAndreas Eliasson2022-04-061-40/+25
| | | | | | | | | | Use global CMake and qmake snippets and reorganize some of the sections structure. Also, make minor grammar and syntax changes. Task-number: QTBUG-100369 Pick-to: 6.3 6.3.0 Change-Id: Icd8b9555aac957ec60c475fe46f5aebbfe513004 Reviewed-by: Topi Reiniö <[email protected]>
* Android: Enable local storage by defaultChristian Strømme2022-03-161-0/+5
| | | | | | | | | | Enable local storage by default, same as QtWebEngine and iOS. Fixes: QTBUG-75723 Pick-to: 6.3 6.2 5.15 Change-Id: I42f04e53b5014ef107dec61535f8c102f2d5dd27 Reviewed-by: Assam Boudjelthia <[email protected]> Reviewed-by: Tero Alamäki <[email protected]>
* Make sure all private headers include at least one otherThiago Macieira2022-03-093-1/+3
| | | | | | | | | | See script in qtbase/util/includeprivate for the rules. Since these files are being touched anyway, I also ran the updatecopyright.pl script too. Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6 Reviewed-by: Lars Knoll <[email protected]>
* Use up-to date LGPL license headerKai Köhne2022-02-1433-363/+462
| | | | | | | | | | | | | Remove usages of outdated LGPL3 header that references LICENSES.LGPLv3 instead of LICENSES.LGPL3. Use BSD instead in the examples, updated LGPL otherwise. Also remove the now unreferenced LICENSE.LGPLv3, LICENSE.GPLv2 files, and instead the newly referenced files instead. Pick-to: 6.2 6.3 Change-Id: I01e1325ee2c7a147e095c08b370b88ded9a8daff Reviewed-by: Jani Heikkinen <[email protected]>
* Don't include a qml header in library with no qml usageAlexandru Croitor2022-02-011-1/+0
| | | | | | | | | | | Including the header causes issues when building Qt with Conan which installs each repo into its own install directory. The issue likely doesn't surface with a regular all-in-one install, because the header is found via some indirect means. Pick-to: 6.2 6.3 Change-Id: I5640c1cb9aa34207d619362000c135d8e4e5d1ac Reviewed-by: Christian Strømme <[email protected]>
* Add libraries that supposed to be in rpath to PUBLIC_LIBRARIESAlexey Edelev2022-01-191-1/+8
| | | | | | | Fixes: QTBUG-99372 Task-number: QTBUG-86533 Change-Id: I24b3d6a02374972536bac6bb6fc6af6167cc8c6d Reviewed-by: Alexandru Croitor <[email protected]>
* Add support functions to manage cookiesAgnieszka Jaworska2021-12-1414-2/+314
| | | | | | | | | Setting and deleting cookies, changes for android, darwin and webengine plugins Pick-to: 6.3 Task-number: QTBUG-96204 Change-Id: I4f79d34384e490b70a1e9f89196dd113733d5fe1 Reviewed-by: Christian Strømme <[email protected]>
* Disconnect signals form base class of qquickviewcontrollerMichal Klocek2021-12-081-3/+7
| | | | | | | | | Prevent calling signals on derived class on destruction form base class. This is not safe and we guard for that now in qtcore. Pick-to: 6.2 Change-Id: I7147023ac2f5a3542403d3aa549588b22db58da5 Reviewed-by: Allan Sandfeld Jensen <[email protected]>
* QWebViewFactory: second step in porting to QFactoryLoader's CBOR supportThiago Macieira2021-11-041-9/+4
| | | | | | | | | | | This removes the string values for the common keys, in favor of QtPluginMetaDataKeys. It also fixes a bug in comparing an iterator from metaDataObject to pluginMetaData's end. Change-Id: I3eb1bd30e0124f89a052fffd16a6f2d82ad568af Reviewed-by: Lars Knoll <[email protected]>
* Add missing "We mean it" disclaimerKai Köhne2021-11-011-0/+11
| | | | | | | | Amends ecc5e01135c Pick-to: 6.2 Change-Id: I0e35c72b26e15b141b4efe7057eadd22a96289a8 Reviewed-by: Michal Klocek <[email protected]>
* QWebViewFactory: Preliminary adaptation to QFactoryLoader using CBORThiago Macieira2021-09-241-1/+1
| | | | | | | Qt uses "Almost Never Auto" Change-Id: I42eb903a916645db9900fffd16a57ae4eab59515 Reviewed-by: Lars Knoll <[email protected]>
* Doc: Fix documentation warnings for Qt WebViewTopi Reinio2021-09-174-3/+3
| | | | | | | | | | | | | * Comment out \instantiates link to a private class as we cannot link to it. * Move \qtcmakepackage to the correct place under \module. * Add missing documentation dependencies. Pick-to: 6.2 6.2.0 Fixes: QTBUG-96294 Change-Id: Ib114b6891e050559914049fd944397d34a70f5fa Reviewed-by: Venugopal Shivashankar <[email protected]> Reviewed-by: Paul Wicking <[email protected]>
* Clean up Qt WebView documentation for 6.2Christian Strømme2021-09-105-19/+40
| | | | | | | | | | | | | - Added "Using The Module" section that documents how to include the module in CMake. - Removed version numbers from documentation. - Added CMake import section in the QtWebView namespace documentation. - Removed references to UWP. Pick-to: 6.2 6.2.0 Fixes: QTBUG-94935 Change-Id: If5c1f63179506b03653fcbbcbb3bdce5951cce3a Reviewed-by: Michal Klocek <[email protected]>
* Doc: Remove unsupported customFiltersKai Köhne2021-08-251-3/+0
| | | | | | Task-number: QTBUG-95987 Change-Id: Idc54d8b51fb77ca3cf9a2179bad594b41754c657 Reviewed-by: Paul Wicking <[email protected]>
* Doc: Fix qdoc warnings for 6.2Venugopal Shivashankar2021-08-233-6/+6
| | | | | | | | | | | | | | | These warnings were fixed: qt5/qtwebview/src/webview/doc/qtwebview.qdocconf:33: (qdoc) warning: Cannot find file or directory: ../../imports qt5/qtwebview/src/webview/doc/qtwebview.qdocconf:34: (qdoc) warning: Cannot find file or directory: ../../imports qt5/qtwebview/src/webview/doc/src/qtwebview-module.qdoc:28: (qdoc) warning: Can't link to 'WebView' qt5/qtwebview/src/webview/doc/src/qtwebview-overview.qdoc:29: (qdoc) warning: Can't link to 'Qt for UWP' qt5/qtwebview/src/webview/doc/src/qtwebview-overview.qdoc:29: (qdoc) warning: Can't link to 'WebView' Task-number: QTBUG-95860 Pick-to: 6.2 Change-Id: I86df9f911d75e936d7c38f4c1accfe0b8c96eb9d Reviewed-by: Paul Wicking <[email protected]>
* No API changes have been madeAllan Sandfeld Jensen2021-08-211-2/+1
| | | | | | | Pick-to: 6.2 Fixes: QTBUG-94934 Change-Id: I41561751ae716706aa7492249c5123138e94c44d Reviewed-by: Michal Klocek <[email protected]>
* CMake: Use renamed qt6_add_plugin PLUGIN_TYPE optionAlexandru Croitor2021-08-124-4/+4
| | | | | | | Task-number: QTBUG-95170 Pick-to: 6.2 Change-Id: Id3a2ece3a3d2fa2eadb78fa5dc558466654c42a6 Reviewed-by: Kai Koehne <[email protected]>
* Doc: Add Changes Qt 5 to Qt 6 page to Qt WebViewPaul Wicking2021-08-041-0/+44
| | | | | | | | | Add a basic changes page for consistency with other modules. Task-number: QTBUG-94934 Pick-to: 6.2 Change-Id: If3f8d2815b0d88a3c8e715b8e8c69b5d4e8bffa7 Reviewed-by: Topi Reiniö <[email protected]>
* Use new qml cmake apis and new qml registrationMichal Klocek2021-07-1918-289/+157
| | | | | | | | | | | Move quick sources to sepatrate qml module so new qml registration system can be used. This drops dependency of QWebView module on Quick. Pick-to: 6.2 Change-Id: I10adb5e898ae2ffe4a46f37d759983047ea89483 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Allan Sandfeld Jensen <[email protected]>
* Switch to new public QJni APIsAllan Sandfeld Jensen2021-07-092-22/+21
| | | | | | | Pick-to: 6.2 Change-Id: I4cd3c9384014d698f160fe57d81c7d9d8aa83a4c Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Fabian Kosmale <[email protected]>
* Try fixing failure to find qjni_p.hAllan Sandfeld Jensen2021-07-081-0/+1
| | | | | | | | | Depend on CorePrivate Pick-to: 6.2 Change-Id: I078fee4b95907a8ad17d918244b56a6969a4dd0e Reviewed-by: Fabian Kosmale <[email protected]> Reviewed-by: Qt CI Bot <[email protected]>
* CMake: Update to latest qml CMake APIAlexandru Croitor2021-06-221-3/+7
| | | | | | | | Task-number: QTBUG-91621 Change-Id: I6059f52b2f0ae8cf84f08dffaba357362602c1c8 Reviewed-by: Joerg Bornemann <[email protected]> (cherry picked from commit 25d08b6123f6bfa990544a4f34c3fb5eb388df78) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
* Update namespace for webengineMichal Klocek2021-06-221-1/+1
| | | | | | | Change-Id: I376ba7f2b32afb5e668e92be7a38a59164ec956b Reviewed-by: Allan Sandfeld Jensen <[email protected]> (cherry picked from commit e81774fc6bbf39ba9e186a1220d1f57dcdb51ad2) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
* Update for API renameAllan Sandfeld Jensen2021-06-222-4/+4
| | | | | | | Change-Id: I72f893a07c9d48e0b1db9f0c9422710020038bcd Reviewed-by: Jani Heikkinen <[email protected]> (cherry picked from commit e6e02a173f147176d42fa685cde62558cd7a4d1c) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
* Remove qmake filesMichal Klocek2021-06-179-200/+0
| | | | | | Pick-to: 6.2 Change-Id: I04c6f3f6bdfadcddac6d79440d6e292241bc50cd Reviewed-by: Christian Strømme <[email protected]>
* Fix the macOS information with regard to the use of the system web viewSamuel Gaist2021-06-171-2/+4
| | | | | | | | | macOS provides a system web view so the module does not use webengine on that platform. Change-Id: I980e9d8af9c8adfb8307ac52a6a34847c00d8217 Pick-to: 5.15 6.2 Reviewed-by: Paul Wicking <[email protected]>
* Add cmake buildMichal Klocek2021-06-0213-14/+217
| | | | | | | | | Update dependencies to latest shas. Fix compilation issues. Task-number: QTBUG-88620 Change-Id: I0c82431e6ffd142302cce12e6ee74d2139e1e42f Reviewed-by: Christian Strømme <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]>
* Fix running tests with webengine pluginMichal Klocek2021-06-022-4/+10
| | | | | | | | | | | | | | | | | Adopt test to run also with webengine plugin, so webview can be tested also on dektop. * use QUrl::fromLocalFile for file urls * QWebEngineWebView expects QQuickWebView as parent in case of webenigne plugin, adjust tests and QWebView accessor to qquickwebview * disable error page for webenigne plugin, so tests have same results as for other plugins This patch is a part of cmake port effort. Change-Id: I502bfdc5b6bce8950176d3b20ac35b1e10269393 Reviewed-by: Christian Strømme <[email protected]>
* Android: rename Android's package name for Qt 6Assam Boudjelthia2021-02-124-5/+5
| | | | | | | | | | Rename Android package name org.qtproject.qt5.android to org.qtproject.qt.android to avoid inconsistency with Qt 6 name. Also, we include the major version number in the jar target. Task-number: QTBUG-86969 Change-Id: If887ac62ff480986f70434e5ab898d0bb9f19606 Reviewed-by: Alex Blasche <[email protected]>
* Update dependencies.yamlAllan Sandfeld Jensen2021-02-041-0/+2
| | | | | Change-Id: Ie4ac89ec6d2ec2c10ff89cd11a46a1271b837170 Reviewed-by: Andy Shaw <[email protected]>
* Replace 0 with nullptrAllan Sandfeld Jensen2021-02-029-9/+9
| | | | | Change-Id: I9d225accdf7d7f91efd189588453d2a39f2a11e7 Reviewed-by: Volker Hilsheimer <[email protected]>
* Replace Q_DECL_OVERRIDE with overrideAllan Sandfeld Jensen2021-02-028-137/+137
| | | | | Change-Id: I3ebce12c9b14cd413f06eb36b836b1e10adbbed6 Reviewed-by: Volker Hilsheimer <[email protected]>
* Sync with window visibilty due to offscreen windows in useAndy Shaw2021-01-141-1/+3
| | | | | | | | | | | When there is an offscreen window used then this is always not visible, but visiblityChanged is still emitted in this case and can be relied upon. So we check if this is set to QWindow::Hidden and make the webview visible/hidden accordingly. Pick-to: 5.15 Change-Id: I95892ef5df8b03feb282b49c8979ae6c93e18a87 Reviewed-by: Christian Strømme <[email protected]>
* Do the pre-initialization steps after the plugin paths are setAndy Shaw2021-01-121-9/+25
| | | | | | | | | | | | | Since initialize() is called before the creation of the application then we need to delay the actual implementation until the paths are set. Therefore a prehook is used for the application object so that these can be done before the application finishes initalizing. For static builds we call this function right away, thus requiring the need for the QtWebView::initialize() function to still exist. Pick-to: 5.15 Change-Id: Ic4633cd1e96c39bc12f475fdd22c56646ea7ca10 Reviewed-by: Christian Strømme <[email protected]>
* Only generate the qrc file and add qmldir to it if we are staticAndy Shaw2021-01-061-2/+4
| | | | | | | Fixes: QTBUG-89638 Pick-to: 5.15 Change-Id: Icf8bc9cdb7653952120a8b46f0c77c455688984e Reviewed-by: Christian Strømme <[email protected]>
* Update dependencies.yamlAllan Sandfeld Jensen2020-11-051-0/+1
| | | | | Change-Id: I2f2b05c2714d33c5d3aee22bec7a7decb0384b13 Reviewed-by: Alexandru Croitor <[email protected]>
* Use QList instead of QVectorJarek Kobus2020-07-311-1/+1
| | | | | | Task-number: QTBUG-84469 Change-Id: I0a6313fb76d99e8424574880527157c0b13ecea6 Reviewed-by: Sona Kurazyan <[email protected]>
* Add ; to Q_UNUSEDLars Schmertmann2020-07-313-20/+20
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: Iba7f98e41459f95a4fb6dffd9e6d1996722d92e8 Reviewed-by: Paul Wicking <[email protected]>
* Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2020-07-316-20/+48
|\
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-05-146-20/+48
| |\ | | | | | | | | | Change-Id: Ie4fbfdf42b70933c9ab58d4cc9f5ad4935e0227a
| | * Dynamically create the qrc file so it has the right aliasAndy Shaw2020-05-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the qrc file is created via the qml_module.prf then it takes the path to the file as part of the alias and therefore this is in the wrong place when it is loaded statically. So we need to create the qrc file dynamically as well so that it correctly locates the qmldir at the right location. Change-Id: I620febf818a335319dafd6e5d53329b856369d68 Reviewed-by: Christian Strømme <[email protected]>
| | * Fix WebView::initialize() call orderMichal Klocek2020-04-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWebEngine should be initialized before QGuiApplication. The other way around is deprecated. Update docs and example. Initialize call is also used by darwin plugin but it should not matter in this case. Fixes: QTBUG-80912 Task-number: QTBUG-76391 Change-Id: I1037346707a3f4e24286ccaba25f8e5c3301ef36 Reviewed-by: Christian Strømme <[email protected]> Reviewed-by: Leena Miettinen <[email protected]>
| | * Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3Qt Forward Merge Bot2020-03-211-3/+11
| | |\ | | | | | | | | | | | | Change-Id: Idd780566c6614f1aa0ac22e39379d0384e04f2d3
| | | * Set the httpUserAgent after the component has been completedAndy Shaw2020-03-201-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since httpUserAgent can be set as a property then it should account for the fact that init() has not yet been called. So ensure that the httpUserAgent is set on the profile created when init() is called. Fixes: QTBUG-82778 Change-Id: I072676e719eedcb0fbc8024f3e902fd1b7073a3e Reviewed-by: Christian Strømme <[email protected]>
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta2Qt Forward Merge Bot2020-03-071-2/+0
| | |\| | | | | | | | | | | | | Change-Id: Ibe76e0b0724b5b82dce495dff8e91d9c91c9bbbe
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-21 06:42:12 +0000