summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.14' into ↵v5.15.14-lts-lgpl5.15Tarja Sundqvist2024-05-082-5/+31
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I6a0402cd1c4df0733479e52a381526f0b5e75837
| * Android: Fix for possible thread deadlockBartlomiej Moskal2023-03-082-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtAndroidWebViewController constructor blocks a qGuiThread until the WebView is created and configured in UI thread. Such an implementation can easily lead to the deadlock (For example in the case of handling InputConnection - it is exactly the opposite. UI thread is blocked and waits for handling event by qGuiThread). That's why we need to avoid blocking qGuiThread forever. This implementation resolves potential deadlock. In case when UI Thread is blocked for long time, qGuiThread will handle events to try to escape from endless blocking. Fixes: QTBUG-82810 Change-Id: I71aaea9ceb7c41b818ed533ce41c70b5c0e8d7de Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 26c2569b73d884e3130705c77b8f2920f5645029)
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-092-0/+18
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I2046d8851ce24cfa70e7750d7ba6f2f0ae8f49cc
| * Android: Make is possible to change setAllowFileAccess()Christian Strømme2022-08-082-0/+18
| | | | | | | | | | | | | | | | | | | | | | Before API level 30 the WebView on Android allowed file access, but that has since been turned off by default. As a bare minimum we can allow the user that has been depending on local file access to revert that by setting an environment variable. Fixes: QTBUG-97487 Change-Id: Id1d3d6e04d93c487117ed3285ff52dd03a7dbe8a Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgplTarja Sundqvist2023-03-231-0/+5
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Idac001b3cfec8671318602652d05396a7c7384bc
| * Android: Enable local storage by defaultChristian Strømme2022-03-171-0/+5
| | | | | | | | | | | | | | | | | | | | Enable local storage by default, same as QtWebEngine and iOS. Fixes: QTBUG-75723 Change-Id: I42f04e53b5014ef107dec61535f8c102f2d5dd27 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Tero Alamäki <tero.alamaki@qt.io> (cherry picked from commit dd303ae2e7d86949e22f60ad999b90bb3d34b1d9)
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-161-2/+4
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I7208a764c866adee24c0a669d94cb80fc6469eec
| * 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 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit e0a99a8cc05cea5e4643ca9824ad7f1ebba3f445) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-2334-707/+707
|/ | | | | | | | | | | This reverts commit 074c6c068a80687f756314cecc092a48436c4712. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I67035a710c1d432756050ed590dba672004fddc0 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Do the pre-initialization steps after the plugin paths are setAndy Shaw2021-01-271-9/+26
| | | | | | | | | | | | | 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. Change-Id: Ic4633cd1e96c39bc12f475fdd22c56646ea7ca10 Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit 8e82991875c82916785823ba01a02614b04369de)
* Update commercial license headersTarja Sundqvist2021-01-2534-707/+707
| | | | | | | | | | | | | | | | | Updated header.COMM to files in tqtc-qtwebview. Examples, documentation or tests are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4208 Change-Id: Ib8f88a3637217a98e85116f01f2a6a8b4d8b8562 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* 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. Change-Id: I95892ef5df8b03feb282b49c8979ae6c93e18a87 Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit c4cd14a0e8d199669554824ce917ad0db31373ce) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Only generate the qrc file and add qmldir to it if we are staticAndy Shaw2021-01-061-2/+4
| | | | | | | | Fixes: QTBUG-89638 Change-Id: Icf8bc9cdb7653952120a8b46f0c77c455688984e Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit 566737c2e452d6873288f4ee4dddffdda79be565) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* winrt: Fix threading issue when initializing webview pluginsOliver Wolff2020-07-031-0/+4
| | | | | | | | | | | | | | | | Accessing the factory loader before the application's main entry point has been passed will mess up winrt's threading. This can lead to undefined behavior or even crashes. Even though this might not be the ideal solution, the workaround works and winrt will be removed for Qt6. Spending even more time on these threading problems are not worth the effort. Task-number: QTBUG-66418 Change-Id: Ia371f36fc8161b1734156b1492bd87f369532452 Reviewed-by: Miguel Costa <miguel.costa@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* 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 <christian.stromme@qt.io>
* 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 <christian.stromme@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* 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 <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta2Qt Forward Merge Bot2020-03-071-2/+0
|\| | | | | | | Change-Id: Ibe76e0b0724b5b82dce495dff8e91d9c91c9bbbe
| * Fix import snippetKai Koehne2020-03-051-2/+0
| | | | | | | | | | | | | | | | | | | | The \badcode ... \endcode scope around it meant that the \qml .. \endqml were printed literally. This amends c40add66f77afe18fe952013fd9503ab4c568efc Change-Id: I859c60a3e47689f30c813768860f58ce22b0e538 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | Fix visibility regression when using offscreen window in qquickwidgetMichal Klocek2020-01-301-11/+25
|/ | | | | | | | | | | | | | Since s 7ded77d in declarative we keep offscreen window in QQuickWidget as not visible to make input delivery system happy and due to fact that window is really not visible. However, this breaks some behavior in case that "emulated" visibility is required. Switch to track qwindow in case of rendercontrol instead of internal offscreen window. Task-number: QTBUG-79213 Change-Id: If98deb8c56c3ae3c053f4e4d21e6b3b69211a9c3 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* Android: JNI_OnLoad return JNI_VERSION_1_6 instead of JNI_VERSION_1_4Assam Boudjelthia2020-01-201-2/+2
| | | | | | | | Update instance of old code using JNI_VERSION_1_4 to make the code consistent. Change-Id: I7f6d074411b3ab5093e45333279b3bd47492ff61 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Implement QtAndroidWebViewController.getUserAgentPaolo Angelelli2019-10-311-6/+31
| | | | | | | | | | | | | | | | Commit 0a8a69d51042b95649dbdf471acb3c96228f372e introduced the httpUserAgent property, with implementations for apple, winrt, webengine and android. However, the android implementation is missing a piece of implementation. Additionally, use semaphores to make sure that, on return, the setter has completed setting the user agent, and therefore the emitted signal is fired with the correct value. Task-number: QTBUG-68746 Change-Id: Ic8f2a398297c8cd7d87ef4946ef26399167aeba9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* Fix library namev5.14.0-beta2v5.14.0-beta1BogDan Vatra2019-10-011-1/+1
| | | | | | Fixes: QTBUG-78616 Change-Id: I68b6f87ca2c962e032abdd9a3338d8b7abfa29b5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Update plugins.qmltypes for 5.14Kai Koehne2019-09-271-4/+9
| | | | | | | Task-number: QTBUG-78690 Change-Id: I77c3c0037818d41f7e9bb47d1beb9ad315c4bdd6 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-241-1/+1
|\ | | | | | | Change-Id: If58d051b036e31d8bdfa56e0b79eca5903a804d5
| * Doc: Fix link to Qt for UWP docsLeena Miettinen2019-09-201-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-61884 Change-Id: I20a381d07198dfe273a27763323fb78228767638 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-161-0/+1
|\| | | | | | | Change-Id: I4860fe730934bc48250539018f6d00241253f43a
| * Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I0d3fa04426e78de5fec50403cddb65b3ad7a9807 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Add QtWebView::WebView::httpUserAgent propertyArmin Felder2019-05-1519-2/+194
|/ | | | | | | | | The httpUserAgent property allows to get and set the User Agent. Task-number: QTBUG-68746 Change-Id: I12fb5da00b14ecba53e71c532f2c8401f8f2a009 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3Qt Forward Merge Bot2019-04-131-5/+2
|\ | | | | | | Change-Id: I353a75f3576218e3ef1599f0b8aec4425815d2b0
| * Don't generate the qmldir in the source folder when doing shadow buildsChristian Strømme2019-04-091-5/+2
| | | | | | | | | | | | Task-number: QTBUG-65092 Change-Id: I8260e3175857e67231f20807464091b76e47f00d Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-03-021-2/+5
|\| | | | | | | Change-Id: I5b939f76cbaee409e493430f18aa9eb157de74ff
| * Make sure that we have a valid plugin before using itChristian Strømme2019-02-261-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | The code assumed that loading the plugin would succeed if we could read its meta-data, this is of course not always the case, as a plugin might not have its dependencies met and fail to load, e.g., this is the case if trying to use the QtWebEngine plugin when QtWebEngine isn't installed. Fixes: QTBUG-71380 Change-Id: Ib88281b2b291213891cfbb77b0728c1bdd6dd1fd Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-02-282-1/+8
| | | | | | | | | | | | | | | | | | Make sure that the file can be dumped by just running make qmltypes Change-Id: I4687d187753399b5f4e12b0ef49aef0f32812e66 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | Make QWebView import available under x.QT_MINOR_VERSIONChristian Strømme2019-02-263-3/+8
|/ | | | | | Fixes: QTBUG-74039 Change-Id: I18dcfc4b8aeac987b4e55a62b39c7c81de582659 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Doc: Add info about using Qt WebView on the desktopLeena Miettinen2019-01-172-5/+8
| | | | | | Fixes: QTBUG-72977 Change-Id: Ibc274cbcc5f5aa1e71673caff156627bf04b12ea Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* iOS: Check if the external browser can open the url firstAndy Shaw2019-01-081-1/+7
| | | | | | | | | | | | | If the external browser cannot open the url (as can be the case with file schemes) then it should fall back to using the same webview instead so that the link is not ignored. [ChangeLog][Platform Specific Changes][iOS] Now opens links with _blank target in the current WebView if the external browser cannot open them. Fixes: QTBUG-63963 Change-Id: Ibd77c82a084d130e034c4d98ba9b08bb5cdf5743 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* iOS: Keep the navigation object passed into didStart for finishingAndy Shaw2018-11-292-26/+26
| | | | | | | | | | Instead of relying on the different frames to fail or finish as this is not reliable in iOS 12 we check if the navigation object passed into didFinish is the last one we got in didStart. At that point we can assume that the page has in fact finished loading. Change-Id: I06c20863b27a384d3532c06a18723ad5d3347363 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Add missing .gitattributes fileJani Heikkinen2018-08-101-0/+2
| | | | | | | Task-number: QTBUG-69754 Change-Id: I7fd52e2013a2b2fcbcc8c405ea3ac266f2011027 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Avoid boring git status messages after buildsEdward Welbourne2018-07-061-0/+2
| | | | | | Change-Id: I12d66b6bb6284adf22fceab1166c5a7667970e42 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-1/+1
|\ | | | | | | Change-Id: Ie947397c531d594f1774b2fc5a931a3b560e1c4b
| * Doc: Add missing dots (qtwebview)Paul Wicking2018-06-191-1/+1
| | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: I396217ea3f2c752c82491de90665ecb24a399ef9 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Fix missing dependency for webenginecoreMichal Klocek2018-06-181-1/+1
| | | | | | | | | | | | | | | | WebEngine plugin has also private dependency to webenginecore. Task-number: QTBUG-68945 Change-Id: I96f317bc4d2ba54c56c0d8a875b6e4045de0d8e1 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-041-0/+8
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3fff6d7e8e1579d099765b9750f848a666ffb644
| * Doc: Add license details to index pageKai Koehne2018-05-301-0/+8
| | | | | | | | | | Change-Id: I46c58eabfbdda0413d4f7fbe12c1b57dd7c902bf Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+1
|/ | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: I8507b0b9bf36371bd1e5c004e792bee3177432fd Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Darwin: open links with target="_blank" externallyv5.11.0-beta4Jason Erb2018-04-051-0/+4
| | | | | | | | | Without this change, such links do not open at all. Task-number: QTBUG-67293 Change-Id: I15e7944dc75271948c6356ac9f949333039b9671 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Darwin: Implement didFailNavigation to handle when an error occursv5.11.0-beta3Andy Shaw2018-03-211-12/+27
| | | | | | | | | | | When an error occurs during navigation then didFailNavigation will be called. As didFailProvisionalNavigation is not called in this case then we need to handle it in the same way to ensure the request count is correctly decremented. Change-Id: Ib0bab408c4d8a54a1f1e7e0b1c3832f05cd10f65 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Fix visibilty changes of the WebView when it's inside a widget sceneChristian Strømme2018-03-121-0/+1
| | | | | | | | | This fixes the issue when the the WebView is inside a QQuick scene in a widget application, and the owning widget is hidden. Task-number: QTBUG-66927 Change-Id: I7efdc2ff5c7f0361be7cd10eb33b7307d5f50d95 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 08:49:41 +0000