summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Remove AppKit dependency from iOSv5.11.0-beta2v5.11.0-beta1Jason Erb2018-02-231-1/+2
| | | | | | Task-number: QTBUG-66552 Change-Id: Ic5f4947a6da425e229e66b293f0c156b1049ef3f Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Remove obsolete code pathsJake Petroules2018-02-121-8/+4
| | | | | Change-Id: I0608503fd0db30bf409893cab754b66952210eff Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* winrt: Launch default program if unviewable content is loadedOliver Wolff2018-02-012-0/+23
| | | | | | | | | | | If a file type that cannot be shown in a webview, is passed via setUrl, the user should be asked what to do/the default program should be opened. This behavior matches what is done, when an unknown URL scheme is passed. Change-Id: Ia318f14d9dcdeb8f3bbb734b342eb38a02fb3dc4 Reviewed-by: Miguel Costa <miguel.costa@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Make QtWebView plugin basedChristian Stromme2018-01-2632-225/+727
| | | | | | | | | | | | | | | | This removes the hard build dependency to QtWebEngine, which opens up the possibility for QtWebEngine, or others, to provide their own plugin. Another benefit of having the backends loaded at run-time, is that we can provide an alternative for developers that wants to publish their application in the App Store, where shipping QtWebEngine isn't an option, due to store policies, and where we already have an alternative/experimental backend that can be used. [ChangeLog][WebView] QtWebView will now load its backends at run-time. Task-number: QTBUG-63137 Change-Id: I581940fe4c3b5e6bb41896367d3163ac8bc7b6b9 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-203-7/+58
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1b0ab1fd69048c03f67da20e0c6e079ef07adf8b
| * WKWebView: try to pass URLs with unrecognized schemes down to the OSJake Petroules2018-01-022-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | This more closely matches the behavior of the Android implementation, which attempts to launch an Intent to handle URLs with schemes not directly handled by the web view itself. The QtWebEngine implementation similarly passes URLs with unhandled schemes down to QDesktopServices. For the native web view API we'll go directly to the system URL handling APIs instead of through QDesktopServices again in order to match the Android implementation which uses the native API (Intents). Change-Id: Ie2881bf17f3b057cc053c9a4faa8cd81d6f6faca Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * WKWebView: provide better diagnostics on navigation failureJake Petroules2018-01-021-1/+5
| | | | | | | | | | | | | | | | | | | | Instead of the current page URL, provide the URL that actually had a navigation failure, in the url property of the loadRequest parameter of the loadingChanged signal. This does not hide any information as the current page URL is still available via the WebView's url property. Change-Id: Ie6350722b9b3529131c51d53144af24cf1ac722d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| * Fix the build with Xcode 9 and unguarded availability errors turned onJake Petroules2017-12-132-6/+12
| | | | | | | | | | | | | | | | | | This fixes a regression introduced in e4016a67bbffefed71a407494e249e978d212b3d. Task-number: QTBUG-65075 Change-Id: I5723ba04ce02842c10aaa4b2ae5dd042f8beabf0 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | winrt: Remove callback registrations on webview destructionOliver Wolff2018-01-101-0/+4
| | | | | | | | | | Change-Id: Ie730be9fa46e5ab2a236c5e7c4a2533789e06a5e Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | winrt: Handle setting of URL with unsupported schemeOliver Wolff2018-01-101-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | While the webview handles clicks on links with unsupported schemes (like mailto or sms) internally and opens the default program/asks the user what to do, calling the url directly resulted in an assert. We try to mimic the webview's behavior as closely as possible by launching the default program for the given URI. If no default program is set, the user is asked, what to do. Change-Id: I4b5220f3de76ebecb50643110944056a60c3b3b6 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | winrt: Add missing hr assignmentOliver Wolff2018-01-101-1/+1
| | | | | | | | | | Change-Id: Iaf067396ac7d9ed6d920b0b033fcf61353756342 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-207-27/+25
|\| | | | | | | Change-Id: Ic55966368182eec8ac9712ef6c69926a65d17e94
| * Fix outdated FDL license headerKai Koehne2017-10-184-20/+20
| | | | | | | | | | Change-Id: Idfcfe81e949d9e284c6029bfd3a8a7f66b06e331 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Use printf style qDebugKai Koehne2017-09-283-7/+5
| | | | | | | | | | | | | | | | | | | | This generates more compact code. It also fixes a build issue with some disabled features on macOS. Task-number: QTBUG-63440 Change-Id: Ice800bdfef09dd83310d40cadd37c15c846ca3e1 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-262-2/+2
| | | | | | | | | | Change-Id: I2e31a93fb192ecb972069f6760e3c5bb9a5fcb98 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 10:00:33 +0000